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/deviceManager/DeviceList.vue | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceManager/DeviceList.vue b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
index d4db87f..15ba2dc 100644
--- a/src/views/mdc/base/modules/deviceManager/DeviceList.vue
+++ b/src/views/mdc/base/modules/deviceManager/DeviceList.vue
@@ -244,7 +244,11 @@
}
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -256,7 +260,11 @@
return
}
if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
return;
} else {
var ids = "";
@@ -273,12 +281,20 @@
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
that.$emit('delectTree','')
} else {
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.loading = false;
@@ -322,21 +338,32 @@
// console.log(this.node);
if(this.node.entity.equipmentId != null){
// alert('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶�')
- this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒')
+ // this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒"
+ });
}else{
this.$refs.modalForm.add(this.node)
this.$refs.modalForm.title = '鏂板璁惧'
this.$refs.modalForm.disableSubmit = false
}
} else {
- this.$message.warning('璇烽�夋嫨鎵�灞炲眰绾э紒')
+ // this.$message.warning('璇烽�夋嫨鎵�灞炲眰绾э紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨鎵�灞炲眰绾э紒'
+ });
}
},
handleAddTier() {
if (this.node && JSON.stringify(this.node) != '{}') {
if(this.node.entity.equipmentId != null){
// alert('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犲眰绾�')
- this.$message.warning('涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犲眰绾э紒')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"涓嶅彲鍦ㄦ灞傜骇涓嬪鍔犺澶囷紒"
+ });
}else{
this.$refs.tierModalForm.add(this.node)
this.$refs.tierModalForm.title = '鏂板灞傜骇'
--
Gitblit v1.9.3