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

---
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue |   53 +++++++++++++++++++++--------------------------------
 1 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 659a95c..60ec592 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -3,7 +3,7 @@
 import {reactive} from "vue";
 import {useRouter} from "vue-router"
 import request from "@/utils/request"
-import { ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue';  
+import { ref, onMounted, onBeforeUnmount } from 'vue';  
 import { WebSocketHost ,host} from '@/utils/constants'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
@@ -22,7 +22,6 @@
 const adjustedRectsb = ref([]);
 const currentGlassId = ref(null);
 const currenttemperingFeedSequence = ref(null);
-let socket = null;
 const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
 const handleMessage = (data) => {
 // 杩涚倝涓�
@@ -39,17 +38,17 @@
         heighta = rect.height;
       }
       if (rect.angle === 0) {  
+    adjustedWidth = widtha * 0.12;
+    adjustedHeight = heighta * 0.1;
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;   
+    newX = 5087 - (rect.yCoordinate + widtha); 
+    } else {  
     adjustedWidth = heighta * 0.12;  
     adjustedHeight = widtha * 0.1;  
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + heighta);  
-    } else {  
-    adjustedWidth = widtha * 0.12;
-    adjustedHeight = heighta * 0.1;
-    // adjustedWidtha = widtha;  
-    // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + widtha); 
+    newX = 5087 - (rect.yCoordinate + heighta); 
   }  
   // if (rect.angle === 0) {  
   //         adjustedWidth = heighta * 0.12;  
@@ -90,17 +89,17 @@
         heighta = rect.height;
       }
       if (rect.angle === 0) {  
-    adjustedWidth = heighta * 0.12;  
-    adjustedHeight = widtha * 0.1;  
-    // adjustedWidtha = widtha;  
-    // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + heighta);  
-    } else {  
     adjustedWidth = widtha * 0.12;
     adjustedHeight = heighta * 0.1;
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + widtha); 
+    } else {  
+    adjustedWidth = heighta * 0.12;  
+    adjustedHeight = widtha * 0.1;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
+    newX = 5087 - (rect.yCoordinate + heighta);  
   }  
   //     if (rect.angle === 0) {  
   //         adjustedWidth = heighta * 0.12;  
@@ -206,24 +205,14 @@
       }
 };
 onMounted(() => {
-  socket = initializeWebSocket(socketUrl, handleMessage);
+  initializeWebSocket(socketUrl, handleMessage);
 });
-  onUnmounted(() => {
-    if (socket) {
-    closeWebSocket(socket);
-    }
-    });
 function updateRectColors() {  
   adjustedRectsa.value.forEach(rect => {  
     if (rect.glassId === glassId) {  
-      rect.state = 8;
+      rect.state = 5;
     }
   });  
-  adjustedRectsb.value.forEach(rect => {  
-    if (rect.glassId === glassId) {  
-      rect.state = 8;
-    }
-  });
 }  
 function getRectColora(state) {  
   switch (state) {  
@@ -233,7 +222,7 @@
       return '#95d475';
     case -1:  
       return '#CDAF95';  
-    case 8:  
+    case 5:  
       return '#911005';  
   }
 }
@@ -243,7 +232,7 @@
       return '#eebe77';  
     case 4:  
       return '#CD6090';
-    case 8:  
+    case 5:  
       return '#911005';  
   }  
 }
@@ -271,7 +260,7 @@
     glassId: currentGlassId.value,
     // temperingFeedSequence: currenttemperingFeedSequence.value,
     line: 4001,
-    status: 8,
+    status: 2,
     workingProcedure: '閽㈠寲',
     })
     if (response.code == 200) {
@@ -316,7 +305,7 @@
        left: `${rect.xcoordinate}px`,
         width: `${rect.width}px`, 
         height: `${rect.height}px`,
-        backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
+        backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
     >
      <div  class="centered-text">
     <div >{{ rect.glassId }}</div>  
@@ -344,7 +333,7 @@
        left: `${rect.xcoordinate}px`, 
        width: `${rect.width}px`, 
        height: `${rect.height}px`,
-       backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
+       backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
        >
      <div  class="centered-text">
     <div >{{ rect.glassId }}</div>  

--
Gitblit v1.8.0