From 853596331a89d968ebd17ce7197f71d398149625 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 15 五月 2024 13:23:51 +0800
Subject: [PATCH] 上片机图片
---
UI-Project/src/views/Returns/returns.vue | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 3c5e868..6164565 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -61,26 +61,45 @@
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-request.get("/loadGlass/LoadGlass/list").then((res) => {
- window.localStorage.setItem('patternWidth', res.data.patternWidth)
- window.localStorage.setItem('workstationId', res.data.workstationId)
- if (res.code == 200) {
- console.log(res.data);
- tableDataa.value = res.data
- console.log(res.data.patternWidth);
-
- let workstationId = window.localStorage.getItem('workstationId')
- let patternWidth = window.localStorage.getItem('patternWidth')
- if (patternWidth !== '' || workstationId == '1') {
- flake.value = true
- } else if (patternWidth !== '' || workstationId == '2') {
- flakea.value = true
+ request.get("/loadGlass/LoadGlass/list").then((res) => {
+ if (res.code === 200) {
+ console.log(res.data);
+ tableDataa.value = res.data;
+
+ if (tableDataa.value.length === 2) {
+ if (tableDataa.value[0].patternWidth > 0) {
+ flake.value = true;
+ }
+
+ if (tableDataa.value[1].patternWidth > 0) {
+ flakea.value = true;
}
- } else {
- ElMessage.warning(res.msg)
- // router.push("/login")
- }
- });
+ }
+ } else {
+ ElMessage.warning(res.msg);
+ // router.push("/login");
+ }
+ });
+// request.get("/loadGlass/LoadGlass/list").then((res) => {
+// window.localStorage.setItem('patternWidth', res.data.patternWidth)
+// window.localStorage.setItem('workstationId', res.data.workstationId)
+// if (res.code == 200) {
+// console.log(res.data);
+// tableDataa.value = res.data
+// console.log(res.data.patternWidth);
+
+// let workstationId = window.localStorage.getItem('workstationId')
+// let patternWidth = window.localStorage.getItem('patternWidth')
+// if (patternWidth !== '' || workstationId == '1') {
+// flake.value = true
+// } else if (patternWidth !== '' || workstationId == '2') {
+// flakea.value = true
+// }
+// } else {
+// ElMessage.warning(res.msg)
+// // router.push("/login")
+// }
+// });
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
--
Gitblit v1.8.0