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/LogInfo.vue | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 2b990c8..0321998 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -15,7 +15,7 @@
</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>
@@ -329,7 +329,11 @@
this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
this.queryChart()
}else{
- this.$message.warning("璇烽�夋嫨鏃堕棿")
+ // this.$message.warning("璇烽�夋嫨鏃堕棿")
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
// this.queryList()
@@ -345,7 +349,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 +363,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 +381,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 +405,18 @@
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
+ });
}
})
}
--
Gitblit v1.9.3