From 5985a3693d4d902455b9fd46b052362417b044d7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 16 八月 2024 16:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index ee9a6a7..8f28ec9 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -36,7 +36,8 @@
// 鏇存柊 tableData 鐨勬暟鎹�
if(data.overGlass!=null){
adjustedRects.value = data.overGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
+ const scaleFactor = 1621.78/5190;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
@@ -46,13 +47,13 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.24;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.16;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
// newX = 5190 - (rect.yCoordinate + rect.width);
} else {
- adjustedWidth = heighta * 0.24;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.16;
// adjustedWidtha = heighta;
// adjustedHeighta = widtha;
@@ -60,7 +61,7 @@
}
return {
...rect,
- xcoordinate: newX * 0.24,
+ xcoordinate: newX * scaleFactor,
ycoordinate: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
--
Gitblit v1.8.0