From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:53 +0800
Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次，仅一个订阅任务生效，将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段
---
UI-Project/src/views/ReportWork/reportWork.vue | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index d1bfcfe..470e33f 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -7,8 +7,8 @@
<el-select v-model="report.type" :placeholder="$t('reportmanage.ctype')" style="margin-left: 10px;" >
<el-option :label="$t('reportmanage.all')" value="0"></el-option>
<el-option :label="$t('reportmanage.completed')" value="1"></el-option>
- <el-option :label="$t('reportmanage.broke')" value="2"></el-option>
- <el-option :label="$t('reportmanage.takeout')" value="3"></el-option>
+ <el-option :label="$t('reportmanage.broke')" value="8"></el-option>
+ <el-option :label="$t('reportmanage.takeout')" value="9"></el-option>
</el-select>
<el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;" >
<el-option :label="$t('reportmanage.all')" value="0"></el-option>
@@ -18,9 +18,9 @@
</el-select>
<el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')" style="margin-left: 10px;" >
<el-option :label="$t('reportmanage.all')" value="0"></el-option>
- <el-option :label="$t('reportmanage.incise')" value="1"></el-option>
- <el-option :label="$t('reportmanage.edging')" value="2"></el-option>
- <el-option :label="$t('reportmanage.steel')" value="3"></el-option>
+ <el-option :label="$t('reportmanage.incise')" value="鍒囧壊"></el-option>
+ <el-option :label="$t('reportmanage.edging')" value="纾ㄨ竟"></el-option>
+ <el-option :label="$t('reportmanage.steel')" value="閽㈠寲"></el-option>
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('reportmanage.inquire') }}</el-button>
<el-button type="success" style="margin-left: 10px;" @click="handleConfirm">{{ $t('reportmanage.signingwork') }}</el-button>
@@ -178,13 +178,13 @@
ElMessage.error(response.message);
}
- const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
- glassId:"P24060403|3|6",
- line:"2001",
- workingProcedure:"鍐峰姞宸�",
- remark:"",
- status:"2"
- })
+ // const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
+ // glassId:"P24081502|1|1",
+ // line:"1001",
+ // workingProcedure:"鍒囧壊",
+ // remark:"",
+ // status:"0"
+ // })
};
// 鎶ュ伐
const handleConfirm = async () => {
@@ -224,38 +224,38 @@
inputValuesb[rowId] = value;
};
fetchTableData();
-const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
-const handleMessage = (data) => {
+let socket = null;
+// const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
+// const handleMessage = (data) => {
// adjustedRects.value = data.device[0].map(rect => ({
// ...rect,
// completed: rect.completedQuantity,
// breakage: rect.breakageQuantity,
// thisProcess: rect.thisProcess,
// }));
-};
-let socket;
+// };
+// let socket;
onMounted(() => {
- socket = new WebSocket(socketUrl);
- socket.onmessage = (event) => {
- const data = JSON.parse(event.data);
+ // socket = new WebSocket(socketUrl);
+ // socket.onmessage = (event) => {
+ // const data = JSON.parse(event.data);
- // updateCharts();
- };
+ // // updateCharts();
+ // };
// };
});
-
-
-
-
onUnmounted(() => {
socket.close();
});
-
onMounted(() => {
- // fetchFlowCardId();
fetchTableData();
- initializeWebSocket(socketUrl, handleMessage);
+ // socket = initializeWebSocket(socketUrl, handleMessage);
});
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
--
Gitblit v1.8.0