From 1c4833bb2e8c1bccd96038c339d114393f82e97c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 16:50:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 717290e..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)
@@ -388,7 +389,7 @@
}
#main-body{
margin-top: -20px;
- margin-left: 300px;
+ margin-left: 200px;
}
#main-bodya{
margin-top: -10px;
--
Gitblit v1.8.0