From 14901b7b990ae38fa4f2e4d57324b6d5e1189c63 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 08 八月 2024 14:50:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index f0b25de..5a991d4 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -216,9 +216,14 @@
function updateRectColors() {
adjustedRectsa.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 5;
+ rect.state = 8;
}
});
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
}
function getRectColora(state) {
switch (state) {
@@ -228,7 +233,7 @@
return '#95d475';
case -1:
return '#CDAF95';
- case 5:
+ case 8:
return '#911005';
}
}
@@ -238,7 +243,7 @@
return '#eebe77';
case 4:
return '#CD6090';
- case 5:
+ case 8:
return '#911005';
}
}
@@ -266,7 +271,7 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -311,7 +316,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -339,7 +344,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
--
Gitblit v1.8.0