From 2bcc7bbdf9257c5b9e952f7e206123bf1c3d6826 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 15:34:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index bcb4693..58b7421 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -85,7 +85,7 @@
// const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
identId: currentGlassId.value,
- controlsId: 201,
+ controlsId: 8,
line: 1001,
machine: '璇嗗埆',
})
@@ -93,7 +93,7 @@
ElMessage.success(response.message);
// window.location.reload()
blind.value = false;
- updateRectStatus(currentGlassId.value, 201);
+ updateRectStatus(currentGlassId.value, 8);
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -112,7 +112,7 @@
// const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
identId: currentGlassId.value,
- controlsId: 200,
+ controlsId: 9,
line: 1001,
machine: '璇嗗埆',
})
@@ -121,7 +121,7 @@
ElMessage.success(response.message);
// window.location.reload()
blind.value = false;
- updateRectStatus(currentGlassId.value, 200);
+ updateRectStatus(currentGlassId.value, 9);
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
@@ -188,12 +188,12 @@
return '#b3e19d';
case 120:
return '#f89898';
- case 200:
- return 'lightblue';
- case 201:
+ case 8:
+ return '#911005';
+ case 9:
return '#f3d19e';
- default:
- return '#911005'; // 榛樿棰滆壊
+ // default:
+ // return '#911005'; // 榛樿棰滆壊
}
}
// 鏇存柊鐭╁舰鐘舵��
--
Gitblit v1.8.0