From 86903050702bb898277ed8f87202c0224867c47f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 16:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns2.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index ba13560..07a1c36 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -73,11 +73,17 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
- tableDataa.value = data.list[0].slice(2, 4);
if (data.list!=null) {
- tableDataa.value = data.list[0].slice(2, 4);
+ const processedData = [...data.list[0].slice(2, 4)];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
}else {
- tableDataa.value = ''
+ tableDataa.value = []
}
if (data.LoadTwoervice != null) {
cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
@@ -496,7 +502,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindbd" top="10vh" width="90%">
+ <el-dialog v-model="blindbd" top="10vh" width="95%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0