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/UnLoadGlass/Landingindicationtwo.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index c42fbe5..12bb518 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -30,16 +30,14 @@
</div>
</div>
</template>
-
<script setup>
-import { ref, watchEffect ,onMounted} from 'vue';
-
+import { ref, watchEffect ,onMounted,onUnmounted} from 'vue';
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
import Swal from 'sweetalert2'
import request from "@/utils/request";
-import { initializeWebSocket } from '@/utils/WebSocketService';
+import { initializeWebSocket,closeWebSocket } from '@/utils/WebSocketService';
import { WebSocketHost ,host} from '@/utils/constants'
const racks = ref([
{ x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
@@ -85,12 +83,14 @@
response.data.forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
- const newItem = {
+ rack.fillColor = itemData.item.fullCardColor === 'red' ? '#911005' : '#6a6da9';
+ const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
width: itemData.item.width === 0 ? "" : 10,
height: itemData.item.height === 0 ? "" : 90
};
+ console.log(itemData.item.fullCardColor);
if (index === 2 && itemData.item.width > 0) {
newItem.width = 100;
@@ -115,6 +115,7 @@
}
};
+let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass3`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
@@ -124,7 +125,8 @@
data.glassinfo2[0].forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
- const newItem = {
+ rack.fillColor = itemData.item.fullCardColor === 'red' ? '#911005' : '#6a6da9';
+ const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
width: itemData.item.width === 0 ? "" : 10,
@@ -143,13 +145,15 @@
}
});
};
-
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-
onMounted(() => {
fetchFlowCardId(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
const showCustomAlert = (downGlassInfoList) => {
let tableContent = '<table border="1" style="border-collapse: collapse; width: 100%;">';
tableContent += '<tr><th style="background-color: #f2f2f2;">鐜荤拑ID</th><th style="background-color: #f2f2f2;">鑶滅郴</th><th style="background-color: #f2f2f2;">鍘氬害</th><th style="background-color: #f2f2f2;">瀹藉害</th><th style="background-color: #f2f2f2;">楂樺害</th></tr>';
@@ -175,7 +179,6 @@
}
});
};
-
const showRectInfo = (rack) => {
const content = rack.item.content;
--
Gitblit v1.8.0