From a8959c68af98c26e14888f946f40501b94fbc6e5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 五月 2024 10:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/UnLoadGlass/loadmachinerack.vue |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index a504e69..d4a17c1 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -8,7 +8,8 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import Landingindication from "./Landingindication.vue";
 import Landingindicationtwo from "./Landingindicationtwo.vue";
-import unloadrequest from "@/utils/unloadrequest";
+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 = () => {
@@ -99,10 +98,11 @@
 //鑾峰彇娴佺▼鍗″彿
 const fetchFlowCardId = async () => {
   try {
-    const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
+    const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
     console.log(response)
     if (response.code === 200) {
-      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
+      flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_Id }));
+      console.log(flowCardOptions.value)
     } else {
       ElMessage.error(response.msg);
     }
@@ -113,7 +113,7 @@
 //纭
 const handleConfirm = async () => {
   try {
-    const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
+    const response = await request.post('unLoadGlass/downWorkStation/updateFlowCardId', {
       workstationId: workstationId.value,
       flowCardId: flowCardId.value
     }); 
@@ -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() 寮哄埗鏇存柊缁勪欢
+ 
 };
 
 
@@ -147,7 +159,7 @@
 //娓呴櫎鍐呭
 const handleclear = async () => {
     try {
-        const response = await unloadrequest.post('/api/unLoadGlass/clear', {
+        const response = await request.post('unLoadGlass/downWorkStation/clear', {
             workstationId: workstationId.value,
         });
 
@@ -174,13 +186,13 @@
 
 
 
-const tableData = reactive([]);
+
 
 // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
 const fetchTableData = async () => {
   try {
     // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
-    const response = await unloadrequest.get('/api/unLoadGlass/getone');
+    const response = await request.get('unLoadGlass/downWorkStation/getone');
 
     // 妫�鏌ュ搷搴旂姸鎬�
     if (response.code === 200) {
@@ -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