From 0810f5bb75f043dd7b8ffa024b415e9188677d35 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 01 二月 2024 09:51:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14792be..7622122 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1045,6 +1045,15 @@
}
}
+ //鏍规嵁杩涚墖鐘舵�佸嚭鍙戣繘鐗囦换鍔�
+ if (obj.FeedState != null) {
+ if (obj.FeedState[0] == true) {
+ this.InsertQueueGlass(1);
+ }
+ }
+
+
+
// 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) {
@@ -1104,6 +1113,7 @@
//鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
this.isConfirm = obj.isConfirm[0];
+
//鎵爜浣嶇幓鐠冧俊鎭�
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
--
Gitblit v1.8.0