From fe9f8c2f1c21a2db600d9563aa7baa7ccc42715e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 16 八月 2023 09:38:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
index bca1e3b..c118060 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentLayout.vue
@@ -12,7 +12,6 @@
</div>
</div>
<p style="margin-top: 5px;">
- <!--<span ref="message">{{item.equipmentName}}</span>-->
<span ref="message">{{item.equipmentName}}({{item.equipmentId}})</span>
</p>
</div>
@@ -60,7 +59,11 @@
},
openDetail(item) {
if(item.oporation == 0){
- this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ // this.$message.warn("璁惧澶勪簬鍏虫満鐘舵�侊紒");
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璁惧澶勪簬鍏虫満鐘舵�侊紒"
+ });
return false;
}
console.log(item);
--
Gitblit v1.9.3