From 903adb90f70518fce4bc22d69008c3eee30e4f89 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 01 八月 2024 16:35:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 742ba24..8bd571d 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -36,20 +36,27 @@
// 鏇存柊 tableData 鐨勬暟鎹�
if(data.overGlass!=null){
adjustedRects.value = data.overGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
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);
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * 0.24;
+ adjustedHeight = heighta * 0.16;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ // newX = 5190 - (rect.yCoordinate + rect.width);
} else {
- adjustedWidth = rect.height * 0.24;
- adjustedHeight = rect.width * 0.16;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ adjustedWidth = heighta * 0.24;
+ adjustedHeight = widtha * 0.16;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect,
@@ -71,11 +78,11 @@
});
}
function getRectColora(state) {
- switch (state) {
+ switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
+ return '#CD6090';
case 5:
return '#911005';
}
--
Gitblit v1.8.0