From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则，计算本工程下所有玻璃的虚拟格子信息，按照虚拟格子，匹配笼内的实际格子，进笼之后查看格子是否有到齐的，执行调度任务 2、卧理修改任务执行顺序，移除捕获异常操作 3、不覆盖原有逻辑，新增opc任务，避免任务重复执行报错
---
UI-Project/src/views/ReportWork/reportWork.vue | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 7b6a6e9..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>
@@ -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 () => {
@@ -225,23 +225,23 @@
};
fetchTableData();
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
-const handleMessage = (data) => {
+// 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;
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(() => {
@@ -249,7 +249,7 @@
});
onMounted(() => {
fetchTableData();
- socket = initializeWebSocket(socketUrl, handleMessage);
+ // socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
if (socket) {
--
Gitblit v1.8.0