From ce2791d2a730845a564ce0e16563b03fea0970db Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 15 五月 2024 16:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 91793a6..d4a17c1 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -9,6 +9,7 @@
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
import request from "@/utils/request";
+
const dialogFormVisiblea = ref(false)
@@ -29,7 +30,7 @@
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
- let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/api/talk/" + viewname;
+ let socketUrl = "ws://" + "localhost"+":88" + "/api/talk/" + viewname;
if (socket != null) {
socket.close();
socket = null;
@@ -49,8 +50,6 @@
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
-
-
let obj = JSON.parse(msg.data);
@@ -77,7 +76,7 @@
const workstationId = ref('');
const flowCardId = ref('');
const flowCardOptions = ref([]);
-
+const tableData = reactive([]);
// 鏂规硶
const handleSelectionChange = () => {
@@ -102,7 +101,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);
}
@@ -122,7 +122,9 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
console.log('缁戝畾鎴愬姛');
+
ElMessage.success(response.message);
+ updatePageData();
dialogFormVisiblea.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -132,6 +134,16 @@
// 澶勭悊閿欒
console.error(error);
}
+};
+
+
+const updatePageData = () => {
+ // 鍋囪浣犵殑椤甸潰涓婃湁涓�涓悕涓� tableData 鐨� Vue 缁勪欢
+ // 浣犲彲浠ョ洿鎺ユ洿鏂� tableData 鐨勬暟鎹�
+ fetchTableData()
+
+ // 浣跨敤 $forceUpdate() 寮哄埗鏇存柊缁勪欢
+
};
@@ -174,7 +186,7 @@
-const tableData = reactive([]);
+
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
@@ -200,9 +212,9 @@
-initWebSocket();
+// initWebSocket();
onMounted(fetchTableData);
-setInterval(fetchTableData, 2000)
+// setInterval(fetchTableData, 2000)
const open = () => {
ElMessageBox.confirm(
@@ -390,7 +402,7 @@
}
#main-body{
margin-top: -20px;
- margin-left: 300px;
+ margin-left: 200px;
}
#main-bodya{
margin-top: -10px;
--
Gitblit v1.8.0