From c2437613fdb41f8b187130ffc78f6afafb2d64c3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 13:31:21 +0800
Subject: [PATCH] 所有默认开始时间更为00:00:00
---
UI-Project/src/views/Returns/upreturns.vue | 56 +++++++++++++-------------------------------------------
1 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 87b14cc..8c06ef2 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -31,6 +31,7 @@
const buttonEnabledStatus = ref({});
const globalDate = inject('globalDate');
import { inject } from 'vue';
+import { tr } from "element-plus/es/locale";
const tableData = ref([])
const titleSelectJson = ref({
engineerId: [],
@@ -83,42 +84,18 @@
if (data.LoadOneState != null) {
cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
}
- if (data.list!=null) {
- tableDataa.value = data.list[0].slice(0, 2);
+if (data.stationOne!=null) {
+ const processedData = [...data.stationOne[0]];
+ if (processedData.length > 0) {
+ processedData[0] = { ...processedData[0], workstationId: 1 };
+ }
+ if (processedData.length > 1) {
+ processedData[1] = { ...processedData[1], workstationId: 2 };
+ }
+ tableDataa.value = processedData;
}else {
- tableDataa.value = ''
+ 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)
@@ -132,13 +109,6 @@
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();
@@ -529,7 +499,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="!isButtonEnabled(scope.row.patternHeight)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -634,7 +604,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindbd" top="10vh" width="90%">
+<el-dialog v-model="blindbd" top="10vh" width="95%">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0