From 91c0155937f3177c41cfd91636d5094454fff855 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 三月 2025 17:19:14 +0800
Subject: [PATCH] 添加上片历史任务接口
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 279cba1..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,11 +97,13 @@
line: 4001,
state: 8,
workingProcedure: '閽㈠寲',
+ temperingLayoutId: currentPage.value,
+ engineerId: engineerId.value,
})
if (response.code == 200) {
ElMessage.success(response.message);
blind.value = false;
- updateRectStatus(currentGlassId.value, 8);
+ updateRectstate(currentGlassId.value, 8);
} else {
ElMessage.error(response.msg);
}
@@ -119,11 +121,13 @@
line: 4001,
state: 9,
workingProcedure: '閽㈠寲',
+ temperingLayoutId: currentPage.value,
+ engineerId: engineerId.value,
})
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 +197,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 +238,35 @@
}
});
adjustedRects.value = adjustedRectsData;
- currentPage.value = 1;
}
};
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ // 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 '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
// 鏇存柊鐭╁舰鐘舵��
-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