From a513e8cc2ff76fd60cab665f6bd3174d624c37b4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 八月 2024 08:37:10 +0800
Subject: [PATCH] 钢化更改文字显示，大屏模块、磨边的玻璃显示更改判断条件，下片台注释打印

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

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 520c064..659a95c 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -41,14 +41,14 @@
       if (rect.angle === 0) {  
     adjustedWidth = heighta * 0.12;  
     adjustedHeight = widtha * 0.1;  
-    adjustedWidtha = heighta;  
-    adjustedHeighta = widtha;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + heighta);  
     } else {  
     adjustedWidth = widtha * 0.12;
     adjustedHeight = heighta * 0.1;
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + widtha); 
   }  
   // if (rect.angle === 0) {  
@@ -70,8 +70,8 @@
         ycoordinate: rect.xCoordinate * 0.1,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
       };  
       });
       }else{
@@ -92,14 +92,14 @@
       if (rect.angle === 0) {  
     adjustedWidth = heighta * 0.12;  
     adjustedHeight = widtha * 0.1;  
-    adjustedWidtha = heighta;  
-    adjustedHeighta = widtha;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + heighta);  
     } else {  
     adjustedWidth = widtha * 0.12;
     adjustedHeight = heighta * 0.1;
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + widtha); 
   }  
   //     if (rect.angle === 0) {  
@@ -121,8 +121,8 @@
         ycoordinate: rect.xCoordinate * 0.1,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
       };  
       });
       }else{
@@ -143,14 +143,14 @@
   if (rect.angle === 0) {  
     adjustedWidth = widtha * 0.24;  
     adjustedHeight = heighta * 0.16;
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5190 - (rect.yCoordinate + widtha); 
     } else {  
     adjustedWidth = heighta * 0.24;  
     adjustedHeight = widtha * 0.16;  
-    adjustedWidtha = heighta;  
-    adjustedHeighta = widtha;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5190 - (rect.yCoordinate + heighta);  
   }  
   return {  
@@ -159,8 +159,8 @@
     y: rect.xCoordinate * 0.16,  
     width: adjustedWidth,  
     height: adjustedHeight,  
-    widtha: adjustedWidtha, 
-    heighta: adjustedHeighta,
+    widtha: rect.width, 
+    heighta: rect.height,
   };  
 });
   }else{
@@ -181,14 +181,14 @@
   if (rect.angle === 0) {  
     adjustedWidth = widtha * 0.24;  
     adjustedHeight = heighta * 0.16;  
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     // newX = 5190 - (rect.yCoordinate + widtha); 
   } else {  
     adjustedWidth = heighta * 0.24;  
     adjustedHeight = widtha * 0.16;  
-    adjustedWidtha = heighta;  
-    adjustedHeighta = widtha;  
+    // adjustedWidtha = heighta;  
+    // adjustedHeighta = widtha;  
     // newX = 5190 - (rect.yCoordinate + heighta);  
   }  
   return {  
@@ -197,8 +197,8 @@
         y: rect.xCoordinate * 0.16,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
   };  
 });
   }else{

--
Gitblit v1.8.0