From 9f62a50709d7b554ca78973f7a962a38b4bcf421 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 01 八月 2024 14:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 154 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 104 insertions(+), 50 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index b9892b8..3ab4e62 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -28,25 +28,45 @@
if(data.intoGlass!=null){
adjustedRects1.value = data.intoGlass[0].map(rect => {
console.log( adjustedRects1.value);
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
- if (rect.angle === 0) {
- adjustedWidth = rect.height * 0.12;
- adjustedHeight = rect.width * 0.1;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5087 - (rect.xCoordinate + rect.height);
- } else {
- adjustedWidth = rect.width * 0.12;
- adjustedHeight = rect.height * 0.1;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5087 - (rect.xCoordinate + 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.12;
+ adjustedHeight = heighta * 0.1;
+ 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);
+ }
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -59,25 +79,45 @@
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
console.log( adjustedRects2.value);
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
if (rect.angle === 0) {
- adjustedWidth = rect.height * 0.12;
- adjustedHeight = rect.width * 0.1;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5087 - (rect.xCoordinate + rect.height);
- } else {
- adjustedWidth = rect.width * 0.12;
- adjustedHeight = rect.height * 0.1;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5087 - (rect.xCoordinate + rect.width);
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ 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);
}
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -90,20 +130,27 @@
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
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);
+ adjustedWidth = widtha * 0.24;
+ adjustedHeight = heighta * 0.16;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5190 - (rect.yCoordinate + widtha);
} 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 + heighta);
}
return {
...rect,
@@ -121,20 +168,27 @@
// 宸插嚭鐐�
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
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);
+ adjustedWidth = widtha * 0.24;
+ adjustedHeight = heighta * 0.16;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ // newX = 5190 - (rect.yCoordinate + widtha);
} 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 + heighta);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
--
Gitblit v1.8.0