From da43aa38dedc711d20093a0ee467a9674594644b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 24 七月 2024 13:56:22 +0800
Subject: [PATCH] 上片机位置信息更换，显示玻璃根据宽、高、数量判断，上方表格增加序号，数量固定为1。钢化模块新增状态5，新增破损功能
---
UI-Project/src/views/Returns/returns.vue | 91 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 55a5f37..3dc5d78 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -17,6 +17,15 @@
const flakea = ref(false)
const flakeb = ref(false)
const flakec = ref(false)
+const user = ref('');
+const projectNo = ref('');
+const workstationId = ref('');
+const id = ref('');
+const patternHeight = ref('');
+const patternWidth = ref('');
+const filmsId = ref('');
+const patternThickness = ref('');
+const number = ref('');
import { WebSocketHost ,host} from '@/utils/constants'
import request from "@/utils/request"
const ida = ref(null);
@@ -93,16 +102,16 @@
if (response.code == 200) {
tableDataa.value = response.data
if (tableDataa.value.length === 4) {
- if (tableDataa.value[0].patternHeight > 0) {
+ if (tableDataa.value[0].patternHeight > 0 && tableDataa.value[0].patternWidth > 0 && tableDataa.value[0].number > 0) {
flake.value = true;
}
- if (tableDataa.value[1].patternHeight > 0) {
+ if (tableDataa.value[1].patternHeight > 0 && tableDataa.value[1].patternWidth > 0 && tableDataa.value[1].number > 0) {
flakea.value = true;
}
- if (tableDataa.value[2].patternHeight > 0) {
+ if (tableDataa.value[2].patternHeight > 0 && tableDataa.value[2].patternWidth > 0 && tableDataa.value[2].number > 0) {
flakeb.value = true;
}
- if (tableDataa.value[3].patternHeight > 0) {
+ if (tableDataa.value[3].patternHeight > 0 && tableDataa.value[3].patternWidth > 0 && tableDataa.value[3].number > 0) {
flakec.value = true;
}
}
@@ -196,15 +205,6 @@
onBeforeUnmount(() => {
closeWebSocket();
});
-const user = ref('');
-const projectNo = ref('');
-const workstationId = ref('');
-const id = ref('');
-const patternHeight = ref('');
-const patternWidth = ref('');
-const filmsId = ref('');
-const patternThickness = ref('');
-const number = ref('');
// 娣诲姞
const handleBindRack = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
@@ -225,25 +225,38 @@
patternThickness: selectedValuec.value,
number: number.value
});
- window.localStorage.setItem('workstationId', workstationId.value)
- window.localStorage.setItem('patternHeight', selectedValuea.value)
+ // window.localStorage.setItem('workstationId', workstationId.value)
+ // window.localStorage.setItem('patternHeight', selectedValuea.value)
+ // window.localStorage.setItem('patternWidth', selectedValue.value)
+ // window.localStorage.setItem('number', number.value)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
// window.location.reload()
add.value = false;
tableDataa.value = response.data;
- let workstationId = window.localStorage.getItem('workstationId')
- let patternHeight = window.localStorage.getItem('patternHeight')
- if (patternHeight !== '' && workstationId === '1') {
+ // let workstationId = window.localStorage.getItem('workstationId')
+ // let patternHeight = window.localStorage.getItem('patternHeight')
+ // let patternWidth = window.localStorage.getItem('patternWidth')
+ // let number = window.localStorage.getItem('number')
+ if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '1') {
flake.value = true
- } else if (patternHeight !== '' && workstationId === '2'){
+ } else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '2'){
flakea.value = true
- }else if (patternHeight !== '' && workstationId === '3'){
+ }else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '3'){
flakeb.value = true
- }else if (patternHeight !== '' && workstationId === '4'){
+ }else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '4'){
flakec.value = true
}
+ // if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '1') {
+ // flake.value = true
+ // } else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '2'){
+ // flakea.value = true
+ // }else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '3'){
+ // flakeb.value = true
+ // }else if (patternHeight !== '0' && patternWidth !== '0' && number !== '0' && workstationId === '4'){
+ // flakec.value = true
+ // }
selectedValuea.value = '';
selectedValue.value = '';
selectedValueb.value = '';
@@ -256,8 +269,6 @@
}
} catch (error) {
// 澶勭悊璇锋眰閿欒
- console.error(error);
- alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
}
}
else if( ida.value === 1 || ida.value === 3){
@@ -271,23 +282,19 @@
patternThickness: selectedValuec.value,
number: number.value
});
- window.localStorage.setItem('workstationId', workstationId.value)
- window.localStorage.setItem('patternHeight', selectedValuea.value)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
// window.location.reload()
add.value = false;
tableDataa.value = response.data;
- let workstationId = window.localStorage.getItem('workstationId')
- let patternHeight = window.localStorage.getItem('patternHeight')
- if (patternHeight !== '' && workstationId === '1') {
+ if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '1') {
flake.value = true
- } else if (patternHeight !== '' && workstationId === '2'){
+ } else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '2'){
flakea.value = true
- }else if (patternHeight !== '' && workstationId === '3'){
+ }else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '3'){
flakeb.value = true
- }else if (patternHeight !== '' && workstationId === '4'){
+ }else if (selectedValuea.value !== '0' && selectedValue.value !== '0' && number.value !== '0' && workstationId.value === '4'){
flakec.value = true
}
selectedValuea.value = '';
@@ -302,8 +309,6 @@
}
} catch (error) {
// 澶勭悊璇锋眰閿欒
- console.error(error);
- alert('璇锋眰澶辫触锛岃绋嶅悗鍐嶈瘯锛�');
}
}
else {
@@ -660,12 +665,18 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
>
- <el-table-column prop="engineeringId" :label="$t('basicData.projectnumber')" width="200" align="center"/>
+ <el-table-column prop="layoutSequence" :label="$t('basicData.layoutSequence')" width="100" align="center"/>
+ <el-table-column prop="engineeringId" :label="$t('basicData.projectnumber')" width="200" align="center"/>
<el-table-column prop="width" :label="$t('basicData.glasswidth')" align="center"/>
<el-table-column prop="height" :label="$t('basicData.glassheight')" align="center"/>
<el-table-column prop="filmsId" :label="$t('basicData.coatingtypes')" align="center"/>
- <el-table-column prop="layoutSequence" :label="$t('basicData.quantity')" align="center"/>
- <el-table-column prop="thickness" :label="$t('basicData.thickness')" align="center"/>
+ <el-table-column :label="$t('basicData.quantity')" align="center">
+ <template #default="{ row }">
+ <!-- 杩欓噷鎬绘槸鏄剧ず 1 -->
+ <span>{{ 1 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="thickness" :label="$t('basicData.quantity')" align="center"/>
<!-- <el-table-column
align="center"
label="鐘舵��"
@@ -928,7 +939,7 @@
width: 1500px;
margin-left: -300px
}
-#overlay{
+#overlayb{
position: absolute;
z-index: 1;
width: 228px;
@@ -937,7 +948,7 @@
margin-top: -303px;
margin-left: 355px;
}
-#overlaya{
+#overlayc{
position: absolute;
z-index: 1;
width: 228px;
@@ -946,7 +957,7 @@
margin-top: -303px;
margin-left:703px;
}
-#overlayb{
+#overlay{
position: absolute;
z-index: 1;
width: 228px;
@@ -955,7 +966,7 @@
margin-top: -45px;
margin-left: 355px;
}
-#overlayc{
+#overlaya{
position: absolute;
z-index: 1;
width: 228px;
--
Gitblit v1.8.0