From 3553dbd4c84a6e3556c2553c1fd9c47dda2754a3 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 17:01:24 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 18 ++++++++++++++----
src/views/mdc/station-live.vue | 6 ++++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index a217d73..75a52f9 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:01:03
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -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[index1].splice(index,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]) {
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 1b83865..bd67df9 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-06-17 15:54:59
+ * @LastEditTime: 2024-06-17 16:57:30
* @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
-->
@@ -662,7 +662,9 @@
res.data.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
var eventData = JSON.parse(event.data);
if(item.name == "DeviceStatus") { //鏈哄櫒鐘舵��
- item.code = eventData.data[item.name].v;
+ if(eventData.data[item.name]) {
+ item.code = eventData.data[item.name].v;
+ }
that.allwcs.forEach(item1=> {
if(item.code == item1.code) {
item.codeName = item1.name; //绗簩姝ユ妸v鐨刢ode鍜岃繍琛屽搴�
--
Gitblit v1.9.3