From ea1cb5429a6cdfdce9702eda31f1b555b3a18b5b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 28 二月 2025 08:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 279cba1..0a7c408 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -101,7 +101,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
- updateRectStatus(currentGlassId.value, 8);
+ updateRectstate(currentGlassId.value, 8);
} else {
ElMessage.error(response.msg);
}
@@ -123,7 +123,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
- updateRectStatus(currentGlassId.value, 9);
+ updateRectstate(currentGlassId.value, 9);
} else {
ElMessage.error(response.msg);
}
@@ -193,6 +193,8 @@
};
const handleCurrentChange = async(val: number) => {
currentPage.value = val;
+ console.log(currentPage.value);
+
const response = await request.post('/temperingGlass/temperingGlassInfo/selectTemperingGlass', {
engineerId: engineerId.value,
temperingLayoutId: currentPage.value
@@ -232,30 +234,33 @@
}
});
adjustedRects.value = adjustedRectsData;
- currentPage.value = 1;
}
};
function getRectColor(state: number): string {
switch (state) {
+ case -1:
+ return '#CDAF95';
case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
}
}
// 鏇存柊鐭╁舰鐘舵��
-function updateRectStatus(glassId: string, status: number) {
+function updateRectstate(glassId: string, state: number) {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = status; // 鏇存柊鐭╁舰鐨勭姸鎬�
+ rect.state = state; // 鏇存柊鐭╁舰鐨勭姸鎬�
}
});
}
--
Gitblit v1.8.0