From 976cee4892eec261f6c2927e788e476e5cc5028e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 10 三月 2025 08:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 6df2a38..d9a721f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -74,14 +74,21 @@
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
- ElMessage.error(response.message);
+ // ElMessage.error(response.message);
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
+ if (data.LoadOneState != null) {
+ cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
+ }
+ if (data.list!=null) {
tableDataa.value = data.list[0].slice(0, 2);
- if(data.loadTask1.length !=0){
+ }else {
+ tableDataa.value = ''
+ }
+ if(data.loadTask1!=null){
tableData.value = data.loadTask1[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
--
Gitblit v1.8.0