From afa7e2465eccb040b89962641fe16677aea350ea Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 17:28:14 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 504c737..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 13:46:52
+ * @LastEditTime: 2024-06-17 17:26:45
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -134,7 +134,7 @@
function addTime(timeStr) {
var increaseByMilliseconds = 10 * 1000; // 10绉掕浆鎹负姣
// 瑙ｆ瀽鏃堕棿瀛楃涓蹭负澶╂暟銆佸皬鏃躲�佸垎閽熷拰绉�
- if(timeStr != undefined) {
+ if(timeStr != undefined && timeStr != "--") {
var parts = timeStr.match(/(\d+)澶�(\d+)鏃�(\d+)鍒�(\d+)绉�/);
var days = parseInt(parts[1], 10) * 24 * 60 * 60 * 1000; // 澶╂暟杞崲涓烘绉�
var hours = parseInt(parts[2], 10) * 60 * 60 * 1000; // 灏忔椂杞崲涓烘绉�
@@ -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") {
@@ -326,10 +326,22 @@
}
}else {
if(item1.key == 'Alarm') { //鎶ヨ
- var v = JSON.parse(eventData.data[item1.key].v);
- item1.name = v.code;
- item1.code = v.msg;
- item1.color = "#370C0D";
+ if(eventData.data[item1.key]) {
+ var v = JSON.parse(eventData.data[item1.key].v);
+ 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]) {
item1.code = eventData.data[item1.key].v;
--
Gitblit v1.9.3