From ddbb2bd2691629336faa4491a59fdc3dc3c5934e Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 17 六月 2024 23:44:23 +0800
Subject: [PATCH] update

---
 src/views/mdc/realtime-status/index.vue |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 2a1f17a..12c1fd1 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2024-04-09 22:11:21
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-17 16:34:25
+ * @LastEditTime: 2024-06-17 17:26:45
  * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
  瀹炴椂鐪嬫澘
 -->
@@ -308,14 +308,14 @@
 								var diffTime = "--";
 							}
 							if(res.data.records.length == 0) return;  //娌″�间笉鐢ㄥ惊鐜�
-					        res.data.records.forEach(item=> {  //绗竴姝ユ妸v鏀惧埌code閲�
+					        res.data.records.forEach((item,index)=> {  //绗竴姝ユ妸v鏀惧埌code閲�
 					        	if(eventData.id == item.id) {
 					        		if(item.properties == null) {
 					        			item.properties = [];
 					        			return;
 					        		}
 					        		item.time = diffTime;
-					        		item.properties.forEach(item1=> {
+					        		item.properties.forEach((item1,index1)=> {
 					        			if(item1.key == "DeviceStatus") {  //鏈哄櫒鐘舵��
 					        				//item1.code = eventData.data[item1.key].v;
 					        				if(item1.value == "2") {
@@ -328,9 +328,19 @@
 									    	if(item1.key == 'Alarm') {  //鎶ヨ
 												if(eventData.data[item1.key]) {
 													var v = JSON.parse(eventData.data[item1.key].v);
-													item1.name = v.code;
-													item1.code = v.msg;
-													item1.color = "#370C0D";
+													if(Array.isArray(v)) {  //濡傛灉鏄暟缁勶紝涓嶈祴鍊�
+														if(v.length == 0) {
+															res.data.records[index].properties.splice(index1,1);
+														}else {
+															item1.name = v[0].code;
+															item1.code = v[0].msg;
+															item1.color = "#370C0D";
+														}
+													}else {
+														item1.name = v.code;
+														item1.code = v.msg;
+														item1.color = "#370C0D";
+													}
 												}
 									    	}else {
 												if(eventData.data[item1.key]) {

--
Gitblit v1.9.3