From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/mdc/realtime-status/index.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index dba5641..22b38f8 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -212,6 +212,7 @@
this.gettimestatus();
},
next() {
+
if ((this.current * this.line) < this.total / this.column) {
this.current = Number(this.current) + 1;
this.gettimestatus();
@@ -292,6 +293,7 @@
if (eventData.data.DeviceStatus) {
var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
var preT = moment(eventData.data.DeviceStatus.preT).format('YYYY-MM-DD HH:mm:ss');
+ //console.log('time='+time+",preT="+preT);
var diffTime = that.changeTime(time,preT); //杞崲鎴愬樊鍊硷紙鏃跺垎绉掞級
var diffTime = diffTime;
item.time = diffTime;
@@ -324,8 +326,12 @@
} else {
if(eventData.data[item1.key]) {
if(item1.key == "Alarm") {
- var vJson = JSON.parse(eventData.data[item1.key].v);
- item1.code = JSON.stringify(vJson[0]);
+ try {
+ var vJson = JSON.parse(eventData.data[item1.key].v);
+ item1.code = JSON.stringify(vJson[0]);
+ } catch (e) {
+ item1.code = eventData.data[item1.key].v;
+ }
}else {
item1.code = eventData.data[item1.key].v;
}
@@ -372,9 +378,12 @@
item.active = true;
}
deviceNumAll += item.deviceNum;
+ /*
+ //璋冭瘯 鍚庣鏁版嵁宸茬粡鍙栨秷
if(item.statusName != '璋冭瘯') {
- newResData.push(item);
- }
+
+ }*/
+ newResData.push(item);
if(item.statusName == '鎶ヨ') {
item.icon = "Position";
}else if(item.statusName == '寰呮満') {
--
Gitblit v1.9.3