From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件
---
src/views/mdc/base/modules/deviceLog/LogInfo.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 8ee9ac7..3bdc973 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -6,16 +6,16 @@
<a-row :gutter="24">
<a-col :md="6" :sm="6">
<a-form-item label="璁惧缂栧彿">
- <a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
+ <a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
<a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
+ <a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
- <a-form-item label="閲囬泦鏃堕棿">
+ <a-form-item label="鏃ユ湡">
<a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" @change="dataChange" format='YYYY-MM-DD'/>
</a-form-item>
</a-col>
@@ -152,7 +152,6 @@
</div>
<work-chart-model ref="workChartModel"></work-chart-model>
<work-history-model ref="workHistoryModel"></work-history-model>
-
</div>
</template>
@@ -327,11 +326,22 @@
// console.log(this.queryParams.collectTime)
if(this.queryParams.collectTime != undefined){
this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
+ if(!this.queryParams.equipmentId||!this.queryParams.equipmentName){
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧"
+ });
+ return false
+ }
this.queryChart()
}else{
- this.$message.warning("璇烽�夋嫨鏃堕棿")
+ // this.$message.warning("璇烽�夋嫨鏃堕棿")
+ console.log('瑙﹀彂鎻愮ず')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
-
// this.queryList()
},
searchReset() {
@@ -345,7 +355,11 @@
},
openWorkChart() {
if(!this.equipment.equipmentId){
- this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ // this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧杩涜鏌ヨ"
+ });
}else{
this.$refs.workChartModel.add(this.equipment)
this.$refs.workChartModel.title = '宸ヤ綔鏇茬嚎'
@@ -355,7 +369,11 @@
openHistoryChart() {
// console.log(this.equipment);
if(!this.equipment.equipmentId){
- this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ // this.$message.warning("璇烽�夋嫨璁惧杩涜鏌ヨ")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧杩涜鏌ヨ"
+ });
// console.log(1111)
} else{
this.$refs.workHistoryModel.add(this.equipment)
@@ -369,7 +387,11 @@
},
dataAfter() {
if((this.queryParams.collectTime).format('YYYY-MM-DD') == moment().format('YYYY-MM-DD')){
- this.$message.warning("璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�")
+ // this.$message.warning("璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨浠婂ぉ浠ュ強浠婂ぉ涔嬪墠鐨勬棩鏈燂紒锛�'
+ });
}else{
this.queryParams.collectTime = moment(this.queryParams.collectTime.add(1, 'd'), 'YYYY-MM-DD')
this.searchQuery()
@@ -389,10 +411,19 @@
this.queryParams = {}
// this.queryList()
this.equipment = {}
- _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鍙戣澶囨潈闄愶紒')
+ // _this.$message.warning('璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ });
}
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+
}
})
}
@@ -403,11 +434,10 @@
this.initEquipment();
// this.queryTreeData();
},
- mounted() {
-
- },
watch: {
equement(val) {
+ console.log('閫氳繃watch瑙﹀彂')
+
if (val && val.equipmentId) {
this.$set(this.queryParams, 'equipmentName', val.equipmentName)
this.$set(this.queryParams, 'equipmentId', val.equipmentId)
--
Gitblit v1.9.3