From da3b8f9268253a8da7c7d6d2217693114b48fe28 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 12 三月 2025 19:49:11 +0800 Subject: [PATCH] 中空理片笼、卧式缓存模块、钢化前大理片笼、原片仓储模块新增历史任务页面,大屏显示页面修改、上片接口判断(部分) --- UI-Project/src/views/Returns/upreturns.vue | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue index f85b453..06d28ba 100644 --- a/UI-Project/src/views/Returns/upreturns.vue +++ b/UI-Project/src/views/Returns/upreturns.vue @@ -26,6 +26,8 @@ const cuttingMachineStatusColor = ref('#911005'); const tableDataa = ref<any[]>([]); const tableDatab = ref<any[]>([]); +const stationInfos = reactive({}); +const buttonEnabledStatus = ref({}); const tableData = ref([]) const titleSelectJson = ref({ engineerId: [], @@ -83,6 +85,41 @@ }else { tableDataa.value = '' } + if (data.stationOne != null) { + // data.stationOne[0].forEach(station => { + // stationInfos[station.slot] = { + // hasValidDimension: station.patternHeight !== null && station.patternHeight !== '' || + // station.patternThickness !== null && station.patternThickness !== '' + // }; + // console.log(station); + // console.log(stationInfos[station.slot]); + + // }); + data.stationOne[0].forEach((station) => { + stationInfos[station.patternHeight] = { + hasPatternHeight: station.patternHeight !== null && station.patternHeight !== '', + }; + // buttonEnabledStatus.value[workstationId] = hasValidDimension; + console.log(station); + console.log(stationInfos[station.patternHeight]); +}); + } + // if (data.stationOne != null) { + // // 鍒濆鍖栨寜閽姸鎬佸璞� + // buttonEnabledStatus.value = {}; + // data.stationOne[0].forEach((station, index) => { + // const workstationId = station.workstationId; + // const hasValidDimension = station.patternHeight !== null && station.patternHeight !== '' || + // station.patternThickness !== null && station.patternThickness !== ''; + // buttonEnabledStatus.value[workstationId] = hasValidDimension; + // console.log(station.workstationId); + + // }); + // } + + + + if(data.loadTask1!=null){ tableData.value = data.loadTask1[0] window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId) @@ -96,6 +133,13 @@ canSelectProjectc.value = false; tableData.value = ''; } +}; +// 妫�鏌ユ寜閽槸鍚﹀彲鐢� +// const isButtonEnabled = (slot: string) => { +// return buttonEnabledStatus.value[slot] || false; +// }; +const isButtonEnabled = (patternHeight: string) => { + return stationInfos[patternHeight]?.hasValidDimension ?? false; }; onBeforeUnmount(() => { closeWebSocket(); @@ -480,7 +524,7 @@ <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/> <el-table-column fixed="right" :label="$t('film.operate')" align="center"> <template #default="scope"> - <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button> + <el-button size="mini" :disabled="!isButtonEnabled(scope.row.patternHeight)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button> </template> </el-table-column> </el-table> -- Gitblit v1.8.0