From 726f5da27afc22ea1d8bd5fe730a0722ab8a97c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 09:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 2d6988b..583522d 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -128,13 +128,13 @@
adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- newX = 5190 - (rect.yCoordinate + rect.width);
+ // 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);
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
@@ -163,11 +163,11 @@
function getRectColora(state) {
switch (state) {
case 0:
- return '#d1edc4';
+ return '#7AC5CD';
case 1:
- return '#E6E6FA';
+ return '#95d475';
case -1:
- return '#dedfe0';
+ return '#CDAF95';
case 5:
return '#911005';
}
@@ -175,9 +175,9 @@
function getRectColorb(state) {
switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
+ return '#CD6090';
case 5:
return '#911005';
}
--
Gitblit v1.8.0