From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index e3d52c3..2d83c1a 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -33,8 +33,8 @@
<script setup>
import { ref, watchEffect ,onMounted,onUnmounted} from 'vue';
import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
- let language = ref(localStorage.getItem('lang') || 'zh')
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
import Swal from 'sweetalert2'
import request from "@/utils/request";
import { initializeWebSocket,closeWebSocket } from '@/utils/WebSocketService';
@@ -46,7 +46,6 @@
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678',downGlassInfoList:"" } },
-
]);
watchEffect(() => {
// 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌�
@@ -103,10 +102,7 @@
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:8085/api/talk/unloadglass2`;
-//const socketUrl = `ws://${WebSocketHost}:88/api/unLoadGlass/api/talk/unloadglass2`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
data.glassinfo[0].forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
@@ -123,12 +119,11 @@
newItem.height = 20;
}
rack.item = newItem;
- // console.log("鏄剧ず鍥�1",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
}
});
};
onMounted(() => {
- fetchFlowCardId(); // 鑾峰彇鏁版嵁
+ fetchFlowCardId();
socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
@@ -139,7 +134,6 @@
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>';
-
downGlassInfoList.forEach(info => {
tableContent += `<tr>
<td>${info.glassId}</td>
--
Gitblit v1.8.0