From 827ed07c1e51630d9b8eebe446cd653637398901 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 21 十月 2024 13:46:34 +0800
Subject: [PATCH] 1

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

diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 00b55bb..9c99b9c 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-10-21 12:58:09
+ * @LastEditTime: 2024-10-21 13:45:54
  * @FilePath: /cps-web/src/views/mdc/realtime-status/index.vue
  瀹炴椂鐪嬫澘
 -->
@@ -359,10 +359,12 @@
 										item.time = diffTime;
 									}
 								}
+								console.log(eventData,111)
+								
 								item.properties.forEach((item1, index1) => {
 									if (item1.key == "DeviceStatus") {  //鏈哄櫒鐘舵��
 										that.allwcs.forEach(item2 => {
-											if (item2.code == eventData.data.DeviceStatus.v) {
+											if(eventData.data.DeviceStatus && item2.code == eventData.data.DeviceStatus.v) {
 												item1.value = item2.code;
 												item1.color = item2.color;
 												item1.code = item2.name;
@@ -371,6 +373,7 @@
 									} else {
 										if (item1.key == 'Alarm') {  //鎶ヨ
 											if (eventData.data[item1.key]) {
+												if(eventData.data[item1.key].v == "") return;
 												var v = JSON.parse(eventData.data[item1.key].v);
 												if (Array.isArray(v)) {  //濡傛灉鏄暟缁勶紝涓嶈祴鍊�
 													if (v.length == 0) {
@@ -383,6 +386,7 @@
 													item1.name = v.code;
 													item1.code = v.msg;
 												}
+												alert(1)
 											}
 										} else {
 											if (eventData.data[item1.key]) {

--
Gitblit v1.9.3