From b2d3717960d72bfd254a9e2f375f6f5a468486c3 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 07 十月 2024 09:47:36 +0800
Subject: [PATCH] update

---
 src/views/mdc/station-live.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index e9c0f18..51a59cf 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,14 +2,14 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-06 22:33:59
+ * @LastEditTime: 2024-10-07 00:49:07
  * @FilePath: /smart-web/src/views/master/person/main/index.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
 	<div class="aposcope-main">
 		<div class="aposcope-left">
-			<div class="left-title">鏌ヨ鏉′欢1</div>
+			<div class="left-title">鏌ヨ鏉′欢</div>
 			<el-tree :data="tableData" node-key="id" default-expand-all :expand-on-click-node="false" :props="defalutProps" @node-click="handleNodeClick" ref="treeRef" highlight-current />
 		</div>
 		<div class="aposcope-right">
@@ -660,8 +660,9 @@
 						this.$TOOL.socket.sendDataToWebSocket(obj);  //鍙戦��
 						this.$TOOL.socket.websocket.onmessage = function(event) {  
 							var JSONData = JSON.parse(res.data.dpConfig);
+							var eventData = JSON.parse(event.data);
+							if(Object.keys(eventData.data).length == 0) return;
 					        JSONData.forEach((item,index)=> {  //绗竴姝ユ妸v鏀惧埌code閲�
-					        	var eventData = JSON.parse(event.data);
 							    if(item.dpName == "DeviceStatus") {  //鏈哄櫒鐘舵��
 									if(eventData.data[item.dpName]) {
 										item.code = eventData.data[item.dpName].v;
@@ -669,13 +670,10 @@
 							        that.allwcs.forEach((item1)=> {
 							        	if(item.code == item1.code) {
 							        		item.codeName = item1.name;    //绗簩姝ユ妸v鐨刢ode鍜岃繍琛屽搴�
-							        		if(item.code == "2") {
-							        			item.color = "#73D13D";
-							        		}else {
-							        			item.color = "#75C0C0";
-							        		}
+							        		item.color = item1.color;
 							        	}
 							        })
+									item.description = item.dpLabel;
 							    }else {
 							    	if(item.dpName == 'Alarm') {  //鎶ヨ
 										if(eventData.data[item.dpName]) {
@@ -686,20 +684,23 @@
 												}else {
 													item.description = v[0].code;
 													item.codeName = v[0].msg;
-													item.color = "#370C0D";
 												}
 											}else {
 												item.description = v.code;
 												item.codeName = v.msg;
-												item.color = "#370C0D";
 											}
 										}
 							    	}else {
 										if(eventData.data[item.dpName]) {
+											item.description = item.dpLabel;
 											item.codeName = eventData.data[item.dpName].v;
 										}
-										item.color = "#75C0C0";
 							    	}
+									that.allwcs.forEach((item1)=> {
+							        	if(item.code == item1.code) {
+							        		item.color = item1.color;
+							        	}
+							        })
 							    }
 							});
 							that.dmpList = JSONData;

--
Gitblit v1.9.3