From cbc3dfa01846e836a18face51e329fa600f5e3d0 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 17 六月 2024 22:04:50 +0800
Subject: [PATCH] update
---
src/views/mdc/station-live.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index c45a40a..bd67df9 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-17 13:47:17
+ * @LastEditTime: 2024-06-17 16:57:30
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -644,7 +644,6 @@
}
},
getdmp(lastLevelId,machineId) {
- console.log(lastLevelId,machineId)
this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = [];
@@ -660,10 +659,12 @@
this.$TOOL.socket.sendDataToWebSocket(obj); //鍙戦��
this.$TOOL.socket.websocket.onmessage = function(event) {
if(res.data.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
- res.data.forEach(item=> { //绗竴姝ユ妸v鏀惧埌code閲�
+ res.data.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
var eventData = JSON.parse(event.data);
if(item.name == "DeviceStatus") { //鏈哄櫒鐘舵��
- item.code = eventData.data[item.name].v;
+ if(eventData.data[item.name]) {
+ item.code = eventData.data[item.name].v;
+ }
that.allwcs.forEach(item1=> {
if(item.code == item1.code) {
item.codeName = item1.name; //绗簩姝ユ妸v鐨刢ode鍜岃繍琛屽搴�
@@ -676,10 +677,22 @@
})
}else {
if(item.name == 'Alarm') { //鎶ヨ
- var v = JSON.parse(eventData.data[item.name].v);
- item.description = v.code;
- item.codeName = v.msg;
- item.color = "#370C0D";
+ if(eventData.data[item.name]) {
+ var v = JSON.parse(eventData.data[item.name].v);
+ if(Array.isArray(v)) { //濡傛灉鏄暟缁勶紝涓嶈祴鍊�
+ if(v.length == 0) {
+ res.data.splice(index,1);
+ }else {
+ item.description = v[0].code;
+ item.codeName = v[0].msg;
+ item.color = "#370C0D";
+ }
+ }else {
+ item.description = v.code;
+ item.codeName = v.msg;
+ item.color = "#370C0D";
+ }
+ }
}else {
if(eventData.data[item.name]) {
item.codeName = eventData.data[item.name].v;
--
Gitblit v1.9.3