From 92dab966727b26c69a8a1d5839b064f7942895e8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 09:20:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/layout/index.vue | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 6fcf6cd..c16840b 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -253,37 +253,40 @@
let obj = JSON.parse(msg.data);
if (obj.alarmmg) {
-
- if (obj.alarmmg[0].length > 0) {
- if (this.alarm.length > 0) {
- if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
- this.alarm = obj.alarmmg[0];
- this.dialogFormVisible2 = true;
- }
- } else {
- this.alarm = obj.alarmmg[0];
- this.dialogFormVisible2 = true;
- }
- } else {
+ if( obj.alarmmg!=null){
this.alarm = obj.alarmmg[0];
- this.dialogFormVisible2 = false;
}
- //鏄惁鎬ュ仠
- if (obj.emergencystop != null) {
- this.EmergencyStop = obj.emergencystop[0];
- }
+
+ // if (obj.alarmmg[0].length > 0) {
+ // if (this.alarm.length > 0) {
+ // if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
+ // this.alarm = obj.alarmmg[0];
+ // this.dialogFormVisible2 = true;
+ // }
+ // } else {
+ // this.alarm = obj.alarmmg[0];
+ // this.dialogFormVisible2 = true;
+ // }
+ // } else {
+ // this.alarm = obj.alarmmg[0];
+ // this.dialogFormVisible2 = false;
+ // }
+ // //鏄惁鎬ュ仠
+ // if (obj.emergencystop != null) {
+ // this.EmergencyStop = obj.emergencystop[0];
+ // }
- //澶嶄綅鍊掕鏃�
- if (obj.countdown != null) {
- if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
- this.CountDown();
- }
- }
+ // //澶嶄綅鍊掕鏃�
+ // if (obj.countdown != null) {
+ // if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {
+ // this.CountDown();
+ // }
+ // }
- //澶嶄綅瀹屾垚淇″彿
- if (obj.reset != null) {
- this.reset = obj.reset[0];
- }
+ // //澶嶄綅瀹屾垚淇″彿
+ // if (obj.reset != null) {
+ // this.reset = obj.reset[0];
+ // }
}
@@ -398,7 +401,7 @@
'鐢ㄦ埛鍒楄〃': 'UserList',
'璁惧绠＄悊': 'DeviceManagement',
'鎶ヨ淇℃伅': 'Alarm',
- '鍙傛暟涓嬪彂': 'Parameter',
+ '鎵嬪姩/鑷姩': 'Manual/Automatic',
'寮�鍏虫帶鍒�': 'Action',
'IO鐘舵��': 'Sign',
'鏉冮檺绠＄悊': 'PermissionManagement',
--
Gitblit v1.8.0