From 9516d95bdcc481b71d4b090bbdcfff39a84b26d6 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:23 +0800
Subject: [PATCH] 1
---
src/views/mdc/realtime-status/index.vue | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 4110859..aaa191b 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: gaosp
- * @LastEditTime: 2024-09-07 14:16:10
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-10-07 21:48:45
* @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -127,7 +127,7 @@
}
},
mounted() {
- this.deviceStatus = [...this.$route.query.currentTag];
+ this.deviceStatus = this.$route.query.currentTag?[...this.$route.query.currentTag]:[];
this.getstationlabelList(); //鑾峰彇鏍囩瑙嗗浘涓嬬殑list
this.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
this.getprocess(); //鑾峰彇棰滆壊==銆嬭幏鍙栭《閮╰itle==銆嬭缃嚑琛屽嚑鍒�==銆媤s
@@ -194,11 +194,18 @@
this.$HTTP.get("/api/blade-cps/group/get-mdc-group").then(res => {
if (res.code == 200) {
this.stationlabelList = res.data;
- this.stationlabel = res.data[0].groupName;
+ if(res.data.length != 0) {
+ this.stationlabel = res.data[0].groupName;
+ }
}
})
},
changestatus(name) {
+ if(this.stationlabelList.length == 0) {
+ this.station = "鐘舵�佽鍥�";
+ //this.$message.error("涓嶈兘鐐瑰嚮");
+ return;
+ }
this.station = name;
if (this.station == '鐘舵�佽鍥�') {
this.workStationGroupIdList = [];
@@ -241,7 +248,8 @@
}
},
goSet() {
- this.$router.push('/mdc/configuration');
+ //console.log(this.$TOOL.data.get("MENU"));name == "閰嶇疆涓績"
+ this.$router.push('/mdc/configuration'); //鍒嗘瀽璁剧疆
},
gostatus(item) {
this.$router.push('/mdc/station-live?code=' + item.id);
@@ -281,7 +289,6 @@
this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current || 0}&size=${this.size || 6}`, obj).then(res => {
if (res.code == 200) {
var ids = [];
- console.log(this.allwcs, res.data)
res.data.records.forEach(item => {
ids.push(item.id);
if (item.properties != null && item.properties.length != 0) {
@@ -315,11 +322,12 @@
that.$TOOL.socket.sendDataToWebSocket(obj); //鍙戦��
}
}, 500);
- var num = 0;
+ //var num = 0;
var intervalId;
this.$TOOL.socket.websocket.onmessage = function (event) {
- num++;
+ //num++;
var eventData = JSON.parse(event.data);
+ if(Object.keys(eventData.data).length == 0) return;
if (that.timestatus.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
that.timestatus.forEach((item, index) => { //绗竴姝ユ妸v鏀惧埌code閲�
if (eventData.id == item.id) {
@@ -345,16 +353,12 @@
}
item.properties.forEach((item1, index1) => {
if (item1.key == "DeviceStatus") { //鏈哄櫒鐘舵��
- if (item1.value == "2") {
- that.allwcs.forEach(item2 => {
- if (item2.code == item1.value) {
- item1.color = item2.color;
- item1.code = item2.name;
- }
- })
- } else {
- item1.color = "#75C0C0";
- }
+ that.allwcs.forEach(item2 => {
+ if (item2.code == item1.value) {
+ item1.color = item2.color;
+ item1.code = item2.name;
+ }
+ })
} else {
if (item1.key == 'Alarm') { //鎶ヨ
if (eventData.data[item1.key]) {
@@ -365,28 +369,22 @@
} else {
item1.name = v[0].code;
item1.code = v[0].msg;
- that.allwcs.forEach(item2 => {
- if (item2.name == "鎶ヨ") {
- item1.color = item2.color;
- }
- })
}
} else {
item1.name = v.code;
item1.code = v.msg;
- that.allwcs.forEach(item2 => {
- if (item2.name == "鎶ヨ") {
- item1.color = item2.color;
- }
- })
}
}
} else {
if (eventData.data[item1.key]) {
item1.code = eventData.data[item1.key].v;
- item1.color = "#75C0C0";
}
}
+ that.allwcs.forEach(item2 => {
+ if (item2.name == "鎶ヨ") {
+ item1.color = item2.color;
+ }
+ })
}
})
}
@@ -534,7 +532,7 @@
font-weight: 700;
font-size: 16px;
color: #333;
- width: 33%;
+ width: 26%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
--
Gitblit v1.9.3