From e19d95da199d0d9e30d14b0a23c0470e37fd1883 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 19 八月 2024 08:51:32 +0800
Subject: [PATCH] 工程实体类移到 公共里
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 124 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 44b5882..1b332f2 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -27,7 +27,7 @@
// 杩涚倝涓�
if(data.intoGlass!=null){
adjustedRects1.value = data.intoGlass[0].map(rect => {
- console.log( adjustedRects1.value);
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -37,27 +37,27 @@
widtha = rect.width;
heighta = rect.height;
}
- 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);
- }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
return {
...rect,
- xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ xcoordinate: newX * scaleFactor,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -65,7 +65,7 @@
}
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
- console.log( adjustedRects2.value);
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -76,26 +76,26 @@
heighta = rect.height;
}
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);
- }
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
return {
...rect,
- xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ xcoordinate: newX * scaleFactor,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -104,6 +104,7 @@
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ const scaleFactor = 1621.78/5190;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -114,26 +115,26 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.24;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.16;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = heighta * 0.24;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.16;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + heighta);
}
return {
...rect,
- x: newX * 0.24,
+ x: newX * scaleFactor,
y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -142,7 +143,8 @@
// 宸插嚭鐐�
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[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;
@@ -152,26 +154,26 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.24;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.16;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
// newX = 5190 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = heighta * 0.24;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.16;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
// newX = 5190 - (rect.yCoordinate + heighta);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: newX * 0.24,
+ x: newX * scaleFactor,
y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -376,7 +378,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') }}
@@ -390,8 +392,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{
@@ -400,16 +402,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