From 7efca9a88a5b272ed6b9a0db138f3bdc82b606b6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 八月 2024 13:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 5a991d4..520c064 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -39,17 +39,17 @@
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);
+ } else {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
}
// if (rect.angle === 0) {
// adjustedWidth = heighta * 0.12;
@@ -90,17 +90,17 @@
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);
+ } else {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
}
// if (rect.angle === 0) {
// adjustedWidth = heighta * 0.12;
@@ -413,7 +413,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') }}
@@ -427,8 +427,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{
@@ -437,16 +437,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