From 36e9c278ed5da5f4dd868657019542abe21c244e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 14:28:16 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 504c737..85a8c3e 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 14:27:14
* @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; // 灏忔椂杞崲涓烘绉�
@@ -326,10 +326,12 @@
}
}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);
+ 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