From 47f35a2deb3b63e31ee45b229ef809dc9f596af5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 28 二月 2025 09:46:40 +0800
Subject: [PATCH] 钢化颜色新增空判断，新增入参
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 0a7c408..36e0d64 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -62,7 +62,7 @@
const blind = ref(false)
const engineerId = ref();
const currentGlassId = ref(null);
-const currentstate = ref(null);
+const temperingLayoutId = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
@@ -74,9 +74,9 @@
const rawData = ref([]);
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glassId
const currentGlassRect = computed(() => {
- return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
+ return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
});
-function showDialog(glassId: number) {
+ function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
@@ -97,6 +97,8 @@
line: 4001,
state: 8,
workingProcedure: '閽㈠寲',
+ temperingLayoutId: currentPage.value,
+ engineerId: engineerId.value,
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -119,6 +121,8 @@
line: 4001,
state: 9,
workingProcedure: '閽㈠寲',
+ temperingLayoutId: currentPage.value,
+ engineerId: engineerId.value,
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -238,22 +242,24 @@
};
function getRectColor(state: number): string {
switch (state) {
- case -1:
- return '#CDAF95';
- case 0:
- return '#7AC5CD';
- case 1:
- return '#95d475';
- case 2:
- return 'lightblue';
- case 3:
- return '#eebe77';
+ // case -1:
+ // return '#CDAF95';
+ // case 0:
+ // 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 '#4682B4';
+ default:
+ return '#CDAF95';
}
}
// 鏇存柊鐭╁舰鐘舵��
--
Gitblit v1.8.0