From 2e05d43a7da078224a40e6620544969799504a9f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 10 三月 2025 16:48:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Returns/upreturns.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 6df2a38..aef3868 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -74,14 +74,21 @@
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.loadTask1!=null){
tableData.value = data.loadTask1[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
@@ -282,7 +289,7 @@
glassId: row.glassId,
line: 5,
status: 1,
- type: 8,
+ state: 8,
workingProcedure: '涓婄墖',
})
if (response.code === 200) {
@@ -312,7 +319,7 @@
glassId: row.glassId,
line: 5,
status: 1,
- type: 9,
+ state: 9,
workingProcedure: '涓婄墖',
})
if (response.code === 200) {
@@ -496,7 +503,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="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0