From 6c8b80f51e45802fc65b5b2dc23da29354e65a2f Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 21 十月 2024 12:58:39 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 9b729ca..00b55bb 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: gaoshp
- * @LastEditTime: 2024-10-09 20:40:22
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-10-21 12:58:09
* @FilePath: /cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -149,10 +149,17 @@
// 瑙ｆ瀽鏃堕棿瀛楃涓蹭负澶╂暟銆佸皬鏃躲�佸垎閽熷拰绉�
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; // 灏忔椂杞崲涓烘绉�
- var minutes = parseInt(parts[3], 10) * 60 * 1000; // 鍒嗛挓杞崲涓烘绉�
- var seconds = parseInt(parts[4], 10) * 1000; // 绉掕浆鎹负姣
+ if(parts == null) {
+ var days = 0; // 澶╂暟杞崲涓烘绉�
+ var hours = 0; // 灏忔椂杞崲涓烘绉�
+ var minutes = 0; // 鍒嗛挓杞崲涓烘绉�
+ var seconds = 0; // 绉掕浆鎹负姣
+ }else {
+ var days = parseInt(parts[1], 10) * 24 * 60 * 60 * 1000; // 澶╂暟杞崲涓烘绉�
+ var hours = parseInt(parts[2], 10) * 60 * 60 * 1000; // 灏忔椂杞崲涓烘绉�
+ var minutes = parseInt(parts[3], 10) * 60 * 1000; // 鍒嗛挓杞崲涓烘绉�
+ var seconds = parseInt(parts[4], 10) * 1000; // 绉掕浆鎹负姣
+ }
// 鍒涘缓涓�涓狹oment.js鐨勬寔缁椂闂村璞�
var duration = moment.duration(days + hours + minutes + seconds);
// 澧炲姞鏃堕棿
@@ -338,7 +345,7 @@
if (eventData.data.DeviceStatus) {
var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
var diffTime = that.changeTime(time); //杞崲鎴愬樊鍊硷紙鏃跺垎绉掞級
- that.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
+ //that.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
item.time = diffTime;
that.allwcs.forEach(item1 => {
if (item1.code == eventData.data.DeviceStatus.v) {
@@ -369,8 +376,8 @@
if (v.length == 0) {
res.data.records[index].properties.splice(index1, 1);
} else {
- item1.name = v[0].code;
- item1.code = v[0].msg;
+ item1.name = v[0].alarmNo;
+ item1.code = v[0].alarmNo;
}
} else {
item1.name = v.code;
--
Gitblit v1.9.3