From c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 08:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue |   65 +++++++++++++-------------------
 1 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 5a991d4..a156421 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 = heighta;  
     adjustedHeighta = widtha;  
     newX = 5087 - (rect.yCoordinate + heighta);  
+    } else {  
+    adjustedWidth = widtha * 0.12;
+    adjustedHeight = heighta * 0.1;
+    adjustedWidtha = widtha;  
+    adjustedHeighta = heighta;  
+    newX = 5087 - (rect.yCoordinate + widtha); 
   }  
   // if (rect.angle === 0) {  
   //         adjustedWidth = heighta * 0.12;  
@@ -90,17 +89,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 = heighta;  
     adjustedHeighta = widtha;  
     newX = 5087 - (rect.yCoordinate + heighta);  
+    } else {  
+    adjustedWidth = widtha * 0.12;
+    adjustedHeight = heighta * 0.1;
+    adjustedWidtha = widtha;  
+    adjustedHeighta = heighta;  
+    newX = 5087 - (rect.yCoordinate + widtha); 
   }  
   //     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>  
@@ -413,7 +402,7 @@
    </div>
    </el-card>
 </div>
-
+ 
 <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
         <el-button type="warning" plain :icon="Delete" @click="handleDamage"  style="width: 140px;margin-left: 10px;">
           {{ $t('order.dilapidation') }}
@@ -427,8 +416,8 @@
   background-color:  #529b2e;
   text-align: center;
   display: inline-block;
-	/* align-items:center; */
-	/* justify-content:center; */
+    /* align-items:center; */
+    /* justify-content:center; */
   margin-left: 20px;
 }
 #boxb{
@@ -437,16 +426,16 @@
   /* display:flex; */
   text-align: center;
   display: inline-block;
-	align-items:center;
-	justify-content:center;
+    align-items:center;
+    justify-content:center;
   margin-left: 20px;
 }
 #box{
   border: 1px solid black;
   background-color:  #337ecc;
   display:flex;
-	align-items:center;
-	justify-content:center;
+    align-items:center;
+    justify-content:center;
 }
 #home-card {
     width: 100%;

--
Gitblit v1.8.0