From e91ea94c5e06bd183c65999b49c7852205e1ac64 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 20 九月 2023 17:42:55 +0800
Subject: [PATCH] 1、工作日历管理页面增加表格单条数据删除功能 2、报警号管理页面与对比分析页面中的驱动类型数据不再使用数据字典，而采用调用接口获取数据方式 3、报警号管理页面的新增与编辑弹窗中的是否过滤选项切换器优化
---
src/views/mdc/base/modules/deviceLog/WorkChartModel.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
index 50aa166..686e4f6 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
@@ -55,7 +55,6 @@
<div class="checkboxgroup">
<p>缁熻鍙傛暟</p>
<div class="checkboxgroup_con">
-
<a-checkbox-group name="checkboxgroup" :value="option" :options="plainOptions" @change="checkboxOnChange"/>
</div>
</div>
@@ -129,13 +128,10 @@
return current && current > moment().endOf("day");
},
initPlainOptions(param) {
- console.log(param)
let that = this
let equipment = param.equipmentId
- console.log(equipment)
getAction(this.url.initPlainOptions,{equipmentId:equipment}).then((res) => {
if (res.success) {
-
let temp = []
// debugger
for (var item of res.result) {
@@ -145,7 +141,6 @@
if(temp.length>0){
that.option = [temp[0].value]
}
-
}
})
},
@@ -207,13 +202,19 @@
})
},
handleCancel() {
- this.visible = false
+ this.visible = false;
+ this.stratOpen = false;
+ this.endOpen = false;
},
checkboxOnChange(e) {
if (e.length <= 3) {
this.option = e
} else {
- this.$message.warn('鏈�澶氬彧鑳介�夋嫨3涓�')
+ // this.$message.warn('鏈�澶氬彧鑳介�夋嫨3涓�')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'鏈�澶氬彧鑳介�夋嫨涓変釜'
+ });
return false
}
},
@@ -337,7 +338,11 @@
}
getAction(this.url.workChart, param).then((res) => {
if(JSON.stringify(res.result) == '[]' || res.result == null){
- this.$message.warning('鏃犳暟鎹紒')
+ // this.$message.warning('鏃犳暟鎹紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'鏃犳暟鎹�!'
+ });
this.spinning = false;
_this.workChart.setOption(option,true)
}else{
--
Gitblit v1.9.3