From 8b2a0199527fa2d2f0fd4c420dd374e42c496c48 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 09 十月 2024 11:32:28 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index c46d397..b262ed2 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-06 23:03:58
+ * @LastEditTime: 2024-10-08 18:03:09
* @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
-->
@@ -46,7 +46,7 @@
</div>
</div>
<div class="fact-analysis-card" v-for="item in dmpList" v-if="dmpList.length != 0">
- <div class="card-name" :style="{'background-color': item.color}">{{item.description}}</div>
+ <div class="card-name" :style="{'background-color': item.color}">{{item.dplabel}}</div>
<div :class="{'card-value': true,'card-value-bg1':item.name != 'Alarm','card-value-bg2':item.name == 'Alarm'}">{{item.codeName}}</div>
</div>
</div>
@@ -657,12 +657,12 @@
if(this.$TOOL.socket.websocket == null) { //娌℃湁寤虹珛鍏堝缓绔�
this.$TOOL.socket.connectToWebSocket(this.$TOOL.cookie.get("TOKEN"));
}
- console.log(obj,222333)
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;
@@ -670,11 +670,7 @@
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;
}
})
}else {
@@ -685,22 +681,24 @@
if(v.length == 0) {
JSONData.splice(index,1);
}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.codeName = eventData.data[item.dpName].v;
}
- item.color = "#75C0C0";
}
+ that.allwcs.forEach((item1)=> {
+ if(item.code == item1.code) {
+ item.color = item1.color;
+ }else {
+ item.color = "#7FC0C0";
+ }
+ })
}
});
that.dmpList = JSONData;
--
Gitblit v1.9.3