From 3cbdeaa5e8983ea5071ea446813ef5215b9822a0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 25 十二月 2023 14:39:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index c6d05d1..db2e352 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -900,9 +900,10 @@
this.alarm = obj.alarmmg[0];
if (this.alarm.length > 0&&this.alarm!=obj.alarmmg[0]) {
this.dialogFormVisible2 = true;
- } else {
- this.dialogFormVisible2 = false;
}
+ // else {
+ // this.dialogFormVisible2 = false;
+ // }
//鏄惁鎬ュ仠
if (obj.emergencystop != null) {
this.EmergencyStop = obj.emergencystop[0];
@@ -1449,7 +1450,6 @@
this.form5 = {};
this.$message.success(this.$t('Operation successful'));
} else {
- alert(1);
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
--
Gitblit v1.8.0