From f4199567d59f91709d3396f9cc98cdbb06610329 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 19 六月 2024 11:45:05 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index a13892a..797eef6 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-18 18:14:08
+ * @LastEditTime: 2024-06-19 11:44:55
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -273,13 +273,6 @@
ids.push(item.id);
if(item.properties != null) {
item.properties.forEach(item1=> {
- // this.devicestatus.forEach(item2=> {
- // if(item2.status == item1.value) {
- // item.statusName = item2.statusName;
- // item1.statusName = item2.statusName;
- // item.statusStyle = item2.color;
- // }
- // })
if(item1.value == 1) {
item.statusName = '鎶ヨ';
item1.statusName = '鎶ヨ';
@@ -328,12 +321,6 @@
this.$TOOL.socket.websocket.onmessage = function(event) {
num ++;
var eventData = JSON.parse(event.data);
- 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(that.timestatus.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
that.timestatus.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
if(eventData.id == item.id) {
@@ -341,10 +328,38 @@
item.properties = [];
return;
}
- item.time = diffTime;
+ if(eventData.data.DeviceStatus) {
+ var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
+ var diffTime = that.changeTime(time); //杞崲鎴愬樊鍊硷紙鏃跺垎绉掞級
+ item.time = diffTime;
+ if(eventData.data.DeviceStatus.v == 1) {
+ item.statusName = '鎶ヨ';
+ item.statusStyle = "#370C0D";
+ }
+ if(eventData.data.DeviceStatus.v == 2) {
+ item.statusName = '杩愯';
+ item.statusStyle = "#73D13D";
+ }
+ if(eventData.data.DeviceStatus.v == 3) {
+ item.statusName = "寰呮満";
+ item.statusStyle = "#FFC53D";
+ }
+ if(eventData.data.DeviceStatus.v == 4) {
+ item.statusName = "绂荤嚎";
+ item.statusStyle = "#595959";
+ }
+ if(eventData.data.DeviceStatus.v == 5) {
+ item.statusName = "璋冭瘯";
+ item.statusStyle = "#40A9FF";
+ }
+ }else{
+ if(item.time == undefined || item.time == "--") {
+ var diffTime = "--";
+ item.time = diffTime;
+ }
+ }
item.properties.forEach((item1,index1)=> {
if(item1.key == "DeviceStatus") { //鏈哄櫒鐘舵��
- //item1.code = eventData.data[item1.key].v;
if(item1.value == "2") {
item1.color = "#73D13D";
item1.code = "杩愯";
--
Gitblit v1.9.3