From b71ae6310a48763ca79216db617e36c99d7b9ef7 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 31 十二月 2024 17:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowslicecage.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 1de0aaa..7254d00 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -295,24 +295,21 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
- console.log(data);
-
if (data.inkageEntity != null) {
- inkageEntity.value = data.inkageEntity == 1 ? '#911005' : 'green';
+ inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
}
if (data.requestEntity != null) {
- requestEntity.value = data.requestEntity == 1 ? '#911005' : 'green';
+ requestEntity.value = data.requestEntity == 1 ? 'green' : '#911005';
}
if (data.mesReplyEntity != null) {
- mesReplyEntity.value = data.mesReplyEntity == 1 ? '#911005' : 'green';
+ mesReplyEntity.value = data.mesReplyEntity == 1 ? 'green' : '#911005';
}
if (data.outInkageEntity != null) {
- outInkageEntity.value = data.outInkageEntity == 1 ? '#911005' : 'green';
+ outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
}
if (data.outRequestEntity != null) {
- outRequestEntity.value = data.outRequestEntity == 1 ? '#911005' : 'green';
+ outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
}
-
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
console.log(data.bigStorageCageDetailsOutTask[0])
--
Gitblit v1.8.0