From 2be235d382664a619967902a312af248da70eee3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 23 七月 2024 14:57:30 +0800
Subject: [PATCH] 钢化版图左右对调,新增显示

---
 UI-Project/src/views/PurchaseReturn/purchaseStorage.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 967840e..4e372e6 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -25,27 +25,30 @@
   }
 }
 
-const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`; 
 // 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
 const handleMessage = (data) => {
   // 鏇存柊 tableData 鐨勬暟鎹�
   if(data.overGlass!=null){
     adjustedRects.value =  data.overGlass[0].map(rect => {  
   let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
-  if (rect.angle === 0) {  
-    adjustedWidth = rect.width * 0.25;  
+      let newX = rect.yCoordinate; 
+      if (rect.angle === 0) {  
+    adjustedWidth = rect.width * 0.24;  
     adjustedHeight = rect.height * 0.16;  
     adjustedWidtha = rect.width;  
     adjustedHeighta = rect.height;  
+    newX = 5190 - (rect.yCoordinate + rect.width);
   } else {  
-    adjustedWidth = rect.height * 0.25;  
+    adjustedWidth = rect.height * 0.24;  
     adjustedHeight = rect.width * 0.16;  
     adjustedWidtha = rect.height;  
     adjustedHeighta = rect.width;  
+    newX = 5190 - (rect.yCoordinate + rect.height);
   }  
   return {  
-    ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�  
-    xcoordinate: rect.yCoordinate * 0.25, 
+    ...rect, 
+    xcoordinate: newX * 0.24, 
     ycoordinate: rect.xCoordinate * 0.16,
     width: adjustedWidth,  
     height: adjustedHeight,  
@@ -73,9 +76,9 @@
     <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
       <!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
       <div v-if="adjustedRects.length > 0">
-    <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects[0].flowCardId }}</div>  
-    <el-scrollbar height="550px">
-    <div  style="position: relative;max-width: 1400px;">  
+      <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>  
+    <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+    <div  style="position: relative;">  
       <div  
       v-for="(rect, index) in adjustedRects"
       :key="index"  
@@ -85,6 +88,7 @@
        backgroundColor: rect.state === 4 ? '#d1edc4' : '#f8e3c5' }">
      <div  class="centered-text">
     <div >{{ rect.glassId }}</div>  
+    <div >{{ rect.flowCardId }}</div>  
     <div>{{ rect.widtha }}*{{ rect.heighta }}</div>  
     <!-- <div style="margin-top: 25px;margin-left: -60px;">{{ rect.widtha }}*{{ rect.heighta }}</div>   -->
   </div>

--
Gitblit v1.8.0