From e553bf03da95027fc26ac06384e17ef43dd3ccf4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 26 三月 2025 11:33:56 +0800
Subject: [PATCH] 上片模块整体接口更改。控制台报错及警告
---
UI-Project/src/views/Returns/upreturns2.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index da51ee4..ad20672 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -71,10 +71,10 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassTwo`;
const handleMessage = (data: any) => {
- if (data.stationTwo!=null) {
- const processedData = [...data.stationTwo[0]];
+ if (data.stationList.length != 0) {
+ const processedData = [...data.stationList[0]];
if (processedData.length > 0) {
processedData[0] = { ...processedData[0], workstationId: 1 };
}
@@ -85,19 +85,18 @@
}else {
tableDataa.value = []
}
- if (data.LoadTwoervice != null) {
- cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
+ if (data.inkageState != null) {
+ cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
}
- if(data.loadTask2!=null){
- // tableData.splice(0, tableData.length, ...data.loadTask2[0]);
- tableData.value = data.loadTask2[0]
+ if (data.upPattenUsages.length != 0) {
+ tableData.value = data.upPattenUsages[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
canSelectProjectb.value = false;
canSelectProjectc.value = true;
}
else {
- tableData.value = '';
+ tableData.value = [];
canSelectProjecta.value = true;
canSelectProjectb.value = true;
canSelectProjectc.value = false;
@@ -130,7 +129,6 @@
};
// 鏋跺瓙澶嶄綅
const handleptask = async (workstationId: number) => {
- console.log(workstationId);
try {
const confirmResult = await ElMessageBox.confirm(
t('basicData.prackreset'),
@@ -255,7 +253,6 @@
try {
let filmRemove = window.localStorage.getItem('filmRemove')
let engineeringId = window.localStorage.getItem('engineeringIda')
- console.log(engineeringId);
if (engineeringId !== '') {
const response = await request.post('/loadGlass/engineering/engineering/pause', {
stationCell: 6,
@@ -495,7 +492,7 @@
<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
+ <el-button :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -537,8 +534,8 @@
<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
- <el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
+ <el-button type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
+ <el-button type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.8.0