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 | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 6df2a38..06d28ba 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -16,7 +16,6 @@
const blind = ref(false)
const blinda = ref(false)
const blindb = ref(false)
-const dialoglea = ref(false)
const ReportData = ref(true);
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
@@ -27,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: [],
@@ -37,13 +38,9 @@
}).then((response) => {
if (response.code == 200) {
} else {
- ElMessage.warning(response.msg)
+ // ElMessage.warning(response.msg)
}
});
-const handlezhiban = () => {
- dialoglea.value = true;
- fetchFlowCardId();
-};
const selectproject = () => {
dialogFormVisible.value = true;
selectgong();
@@ -70,18 +67,60 @@
if (response.code === 200) {
tableData.value = response.data
// tableData.splice(0, tableData.length, ...response.data);
- ElMessage.error(response.message);
+ // ElMessage.error(response.message);
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
- ElMessage.error(response.message);
+ // ElMessage.error(response.message);
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
+ 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.loadTask1.length !=0){
+ }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)
canSelectProjecta.value = false;
@@ -94,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();
@@ -110,7 +156,7 @@
if (response.code == 200) {
titleSelectJson.value.engineerId = response.data;
} else {
- ElMessage.error(response.message);
+ // ElMessage.error(response.message);
}
} catch (error) {
console.error(error);
@@ -221,23 +267,6 @@
ElMessage.error(response.message);
}
};
-// 鍊肩彮淇℃伅
-const fetchFlowCardId = async () => {
- try {
- const response = await request.post('/loadGlass/work_assignment/selectWorkAssignment', {
- line: 2001,
- workingProcedure: '鍐峰姞宸�'
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data;
- } else {
- ElMessage.error(response.message);
- }
- } catch (error) {
- console.error(error);
- }
-}
onMounted(fetchTableData);
// 寮�濮嬩笂鐗�
const handleBind = (row) => {
@@ -282,7 +311,7 @@
glassId: row.glassId,
line: 5,
status: 1,
- type: 8,
+ state: 8,
workingProcedure: '涓婄墖',
})
if (response.code === 200) {
@@ -312,7 +341,7 @@
glassId: row.glassId,
line: 5,
status: 1,
- type: 9,
+ state: 9,
workingProcedure: '涓婄墖',
})
if (response.code === 200) {
@@ -437,7 +466,6 @@
<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="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</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>
@@ -496,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" 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>
@@ -538,23 +566,6 @@
</div>
</template>
</el-dialog>
- <!-- 鍊肩彮淇℃伅 -->
- <el-dialog v-model="dialoglea" top="15vh" width="70%" :title="$t('searchOrder.dutyinformation')">
- <el-table ref="table" style="margin-top: 20px;height: 300px;"
- :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="line" fixed align="center" :label="$t('searchOrder.line')"/>
- <el-table-column prop="workProcesses" fixed align="center" :label="$t('searchOrder.process')"/>
- <el-table-column prop="teamsGroupsName" align="center" :label="$t('searchOrder.team')">
- </el-table-column>
- <el-table-column prop="deviceName" align="center" :label="$t('searchOrder.basic')">
- </el-table-column>
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="dialoglea = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
-</el-dialog>
<el-dialog v-model="blinda" top="24vh" width="30%" :title="$t('basicData.whetherpause')">
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item :label="$t('Mounting.loadingline')" :required="true">
--
Gitblit v1.8.0