From 721b20aeb58c9f3450ff5ac4a7ba4f1891afc752 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 18 六月 2024 17:49:01 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index b2140af..439c2ea 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 14:19:22
+ * @LastEditTime: 2024-06-18 16:45:04
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -115,7 +115,7 @@
mounted() {
this.getstationlabelList(); //鑾峰彇鏍囩瑙嗗浘涓嬬殑list
this.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
- this.getSetting(); //璁剧疆鍑犺鍑犲垪
+ this.getSetting(); //璁剧疆鍑犺鍑犲垪 ==銆嬭幏鍙栭《閮╰itle=銆嬭幏鍙栭鑹诧紝鑾峰彇鏈哄櫒=銆媤s
},
methods: {
getSetting() {
@@ -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; // 灏忔椂杞崲涓烘绉�
@@ -264,6 +264,7 @@
this.timestatus = [];
this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
+ this.timestatus = res.data.records;
var ids = [];
res.data.records.forEach(item=> {
item.statusName = "鏈煡";
@@ -301,21 +302,22 @@
this.$TOOL.socket.websocket.onmessage = function(event) {
num ++;
var eventData = JSON.parse(event.data);
+ console.log(eventData,1234)
if(eventData.data.DeviceStatus != undefined) {
var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
var diffTime = that.changeTime(time); //杞崲鎴愬樊鍊硷紙鏃跺垎绉掞級
}else {
var diffTime = "--";
}
- if(res.data.records.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
- res.data.records.forEach(item=> { //绗竴姝ユ妸v鏀惧埌code閲�
+ if(that.timestatus.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
+ that.timestatus.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") {
@@ -328,9 +330,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.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]) {
@@ -343,13 +355,13 @@
}
});
};
- var len = res.data.records.length;
- intervalId = setInterval(function() {
- if (num === len) {
- clearInterval(intervalId);
- that.timestatus = res.data.records; //绛夋墍鏈塻ocket鍥炴潵浠ュ悗璧嬪��
- }
- }, 500);
+ // var len = res.data.records.length;
+ // intervalId = setInterval(function() {
+ // if (num === len) {
+ // clearInterval(intervalId);
+ // that.timestatus = res.data.records; //绛夋墍鏈塻ocket鍥炴潵浠ュ悗璧嬪��
+ // }
+ // }, 500);
}
})
},
--
Gitblit v1.9.3