From a513e8cc2ff76fd60cab665f6bd3174d624c37b4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 八月 2024 08:37:10 +0800
Subject: [PATCH] 钢化更改文字显示，大屏模块、磨边的玻璃显示更改判断条件，下片台注释打印
---
UI-Project/src/views/largescreen/largescreen.vue | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index bd641d5..70207f8 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -38,6 +38,12 @@
<div id="longa" v-show="dalipiana"></div>
<div id="longb" v-show="dalipianb"></div>
<div id="shangpianji" v-show="shangpian"></div>
+ <!-- <div id="shangpianji" v-show="xiapian"></div>
+ <div id="shangpianji" v-show="shangpian"></div>
+ <div id="shangpianji" v-show="shangpian"></div>
+ <div id="shangpianji" v-show="shangpian"></div>
+ <div id="shangpianji" v-show="shangpian"></div>
+ <div id="shangpianji" v-show="shangpian"></div> -->
</div>
<div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
<el-table height="240" ref="table" width="340px"
@@ -171,6 +177,7 @@
let socket3 = null;
let socket4 = null;
let socket5 = null;
+let socket6 = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
tableData.value = data.awaitingRepairs[0]
@@ -208,8 +215,10 @@
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassIsRun`;
const handleMessage3 = (data) => {
const tasks = data.taskCaches[0];
- woshia.value = tasks.some(task => task.endCell == 2001 && task.glassId == 0);
- woshic.value = tasks.some(task => task.endCell == 2002 && task.glassId == 0);
+ woshia.value = tasks.some(task => task.line == 2001);
+ woshic.value = tasks.some(task => task.line == 2002);
+ console.log(tasks);
+
};
// 澶х悊鐗囩
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/isRun`;
@@ -225,6 +234,13 @@
if(data.engineering.length !==0 ){
shangpian.value = true;
}
+};
+// 涓嬬墖
+const socketUrl6 = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unLoadGlassIsRun`;
+const handleMessage6 = (data) => {
+// if(data.engineering.length !==0 ){
+// shangpian.value = true;
+// }
};
const renderPieCharts = () => {
processesData.value.forEach((data, index) => {
@@ -302,6 +318,7 @@
socket3 = initializeWebSocket(socketUrl3, handleMessage3);
socket4 = initializeWebSocket(socketUrl4, handleMessage4);
socket5 = initializeWebSocket(socketUrl5, handleMessage5);
+ socket6 = initializeWebSocket(socketUrl6, handleMessage6);
});
onUnmounted(() => {
if (socket) {
@@ -319,6 +336,9 @@
if (socket5) {
closeWebSocket5(socket5);
}
+ if (socket6) {
+ closeWebSocket6(socket6);
+ }
});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
@@ -327,6 +347,7 @@
closeWebSocket3();
closeWebSocket4();
closeWebSocket5();
+closeWebSocket6();
});
</script>
--
Gitblit v1.8.0