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 |   64 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 3ab4e62..60ec592 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -40,15 +40,15 @@
       if (rect.angle === 0) {  
     adjustedWidth = widtha * 0.12;
     adjustedHeight = heighta * 0.1;
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // 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);  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
+    newX = 5087 - (rect.yCoordinate + heighta); 
   }  
   // if (rect.angle === 0) {  
   //         adjustedWidth = heighta * 0.12;  
@@ -69,8 +69,8 @@
         ycoordinate: rect.xCoordinate * 0.1,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
       };  
       });
       }else{
@@ -91,14 +91,14 @@
       if (rect.angle === 0) {  
     adjustedWidth = widtha * 0.12;
     adjustedHeight = heighta * 0.1;
-    adjustedWidtha = widtha;  
-    adjustedHeighta = heighta;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + widtha); 
     } else {  
     adjustedWidth = heighta * 0.12;  
     adjustedHeight = widtha * 0.1;  
-    adjustedWidtha = heighta;  
-    adjustedHeighta = widtha;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
     newX = 5087 - (rect.yCoordinate + heighta);  
   }  
   //     if (rect.angle === 0) {  
@@ -120,8 +120,8 @@
         ycoordinate: rect.xCoordinate * 0.1,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
       };  
       });
       }else{
@@ -142,14 +142,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 {  
@@ -158,8 +158,8 @@
     y: rect.xCoordinate * 0.16,  
     width: adjustedWidth,  
     height: adjustedHeight,  
-    widtha: adjustedWidtha, 
-    heighta: adjustedHeighta,
+    widtha: rect.width, 
+    heighta: rect.height,
   };  
 });
   }else{
@@ -180,14 +180,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 {  
@@ -196,8 +196,8 @@
         y: rect.xCoordinate * 0.16,
         width: adjustedWidth,  
         height: adjustedHeight,  
-        widtha: adjustedWidtha, 
-        heighta: adjustedHeighta,
+        widtha: rect.width, 
+        heighta: rect.height,
   };  
 });
   }else{
@@ -402,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') }}
@@ -416,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{
@@ -426,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