From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/upreturns.vue | 85 +++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 06d28ba..5e9904d 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -16,6 +16,7 @@
const blind = ref(false)
const blinda = ref(false)
const blindb = ref(false)
+const blindbd = ref(false)
const ReportData = ref(true);
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
@@ -28,6 +29,9 @@
const tableDatab = ref<any[]>([]);
const stationInfos = reactive({});
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: [],
@@ -80,46 +84,25 @@
if (data.LoadOneState != null) {
cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
}
- if (data.list!=null) {
- tableDataa.value = data.list[0].slice(0, 2);
- }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(station.patternThickness !== undefined){
+ station.haspatternThickness=false;
+ }else{
+ station.haspatternThickness=true;
+ }
+ // stationInfos[station.patternThickness] = {
+ // haspatternThickness: station.patternThickness !== undefined,
+ // };
+ });
+
+ console.log(data.stationOne);
+ if (data.list != null) {
+ tableDataa.value = data.list[0].slice(0, 2);
+ } else {
+ tableDataa.value = [];
+ }
}
- // 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)
@@ -133,13 +116,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();
@@ -189,7 +165,6 @@
console.error(error);
}
}
-
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
@@ -422,6 +397,12 @@
} catch (error) {
}
};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindbd.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Returns/upreturnhistory`;
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -466,6 +447,7 @@
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
@@ -524,7 +506,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="(!stationInfos[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>
@@ -628,6 +610,17 @@
</div>
</template>
</el-dialog>
+ <!-- 鍘嗗彶浠诲姟 -->
+<el-dialog v-model="blindbd" top="10vh" width="90%">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
</div>
</template>
<style scoped>
--
Gitblit v1.8.0