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 | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 0321998..3bdc973 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -6,12 +6,12 @@
<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">
@@ -152,7 +152,6 @@
</div>
<work-chart-model ref="workChartModel"></work-chart-model>
<work-history-model ref="workHistoryModel"></work-history-model>
-
</div>
</template>
@@ -327,15 +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("璇烽�夋嫨鏃堕棿")
+ console.log('瑙﹀彂鎻愮ず')
this.$notification.warning({
message:'娑堟伅',
description:"璇烽�夋嫨鏃堕棿"
});
}
-
// this.queryList()
},
searchReset() {
@@ -417,6 +423,7 @@
message:'娑堟伅',
description:res.message
});
+
}
})
}
@@ -427,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