From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/deviceLog/WorkChartModel.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
index 50aa166..dbc2ee2 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkChartModel.vue
@@ -129,10 +129,8 @@
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) {
@@ -207,13 +205,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 +341,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