From 09be761e45c76c095ddbae1c401d780bae162fdd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 19:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 0d44280..6f605ad 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -100,7 +100,8 @@
     const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
     console.log(response)
     if (response.code === 200) {
-      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_id }));
+      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
+      console.log(flowCardOptions.value)
     } else {
       ElMessage.error(response.msg);
     }
@@ -198,7 +199,7 @@
 
 
 
-initWebSocket();
+// initWebSocket();
 onMounted(fetchTableData);
 // setInterval(fetchTableData, 2000)
 

--
Gitblit v1.8.0