From 6d3bead888c6ba6537290bf56b8a092d7a1df4d8 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 31 五月 2024 16:58:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/Caching/cachingun.vue |   90 ++++++++++++++++++++++++---------------------
 1 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 31e3e8e..acd7647 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -1,10 +1,9 @@
 <script setup>
-import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
-import {useRouter} from "vue-router"
-const router = useRouter()
-const adda = ref(false)
 
+
+
+import { initializeWebSocket } from '@/utils/WebSocketService';
+ import { WebSocketHost } from '@/utils/constants';
 import request from "@/utils/request"
 import { ref, onMounted } from "vue";
 // import { ref } from 'vue'
@@ -13,28 +12,19 @@
 
 const tableData = ref([])
 const slot = ref('')
-const adjustedRects = ref([]);
   
-onMounted(async () => {  
-  try {  
-    const response = await request.get('/unLoadGlass/downStorage/selectStorageCage'); // 鏇挎崲涓轰綘鐨凙PI绔偣  
-    if (response.code === 200) {  
-      const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁  
-          tableData.value = response.data
-          console.log(response.data);
-          adjustedRects.value = rawRects.map(rect => ({  
-            ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�  
-            width: rect.width * 0.5 ,
-            id: rect.id * 10,
-          })); 
-          console.log(adjustedRects.value);
-    } else {  
-      ElMessage.warning(res.msg)
-    }  
-  } catch (error) {  
-    // console.error('Error fetching rects :', error);  
-  }  
-}); 
+
+request.get("/unLoadGlass/downStorage/selectStorageCage").then((res) => {
+          if (res.code == 200) {
+            
+          console.log(res.data);
+          tableData.value = res.data
+          console.log(res.data[0].slot);
+          } else {
+          ElMessage.warning(res.msg)
+        
+          }
+          });
 
 const open = async(row) => {  
   try {  
@@ -49,7 +39,7 @@
     );  
     if (confirmResult === 'confirm') {  
       // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛  
-      var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
+      var url="/unLoadGlass/downStorage/deleteDownStorageCage?downStorageCageId="+row.id;
       console.log(url);
       const response = await request.post(url, {
         esdId: row.esdId
@@ -67,6 +57,24 @@
     console.error('鍙戠敓閿欒:', error);  
   }  
 };   
+
+const socketUrl = `ws://${WebSocketHost}:88/api/unLoadGlass/api/talk/unloadglass`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+
+  // 鏇存柊 tableData 鐨勬暟鎹�
+
+  tableData.splice(0, tableData.length, ...data.params[0]);
+ // console.log("鏇存柊鍚庢暟鎹�", tableData);
+
+};
+
+
+onMounted(() => {
+  
+  initializeWebSocket(socketUrl, handleMessage);
+});
+
 </script>
 
 <template>
@@ -99,23 +107,22 @@
         </el-table>
       </div>
     </el-card>
+    <!-- <el-dialog v-model="adda" top="30vh" width="25%" title="鏄惁鍒犻櫎璇ユ潯淇℃伅?" >
+    <template #footer>
+      <div id="dialog-footer">
+        <el-button type="primary" @click="handleConfirma">
+          纭
+        </el-button>
+        <el-button @click="adda = false">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog> -->
   </div>
   <div id="awatch">
-    <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;position: relative;"> 
-    <div style="position: absolute; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
-    <div  
-      v-for="(rect, index) in adjustedRects"  
-      :key="rect"  
-      :style="{ position: 'absolute', 
-       top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
-      backgroundColor: '#409EFF'
-       }"  
-    >
-    </div>
-  </div>
-<!-- <div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -124px;margin-left: 480px;"></div>
+    <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;">
+<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -124px;margin-left: 480px;"></div>
 <div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -30px;margin-left: 850px;"></div>
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: 30px;margin-left: 695px;"></div> -->
+<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: 30px;margin-left: 695px;"></div>
 </div>
 </template>
 
@@ -138,7 +145,6 @@
 }
 #awatch{
   height: 460px;
-  width: 1500px;
   /* margin-top: -60px; */
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0