From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/views/largescreendisplay/screendisplay.vue |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index fe60e32..6e81726 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -26,11 +26,11 @@
 let socket = null;
 // const rawGlassStorageDetailList = ref([])
 // const orderDTOS = ref([])
-const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/glassStorage/api/talk/largenScreen`;
 const debouncedUpdate = debounce((data, handler) => {
   handler(data);
 }, 300);
-const handleMessage = (data) => {
+let handleMessage = (data) => {
   debouncedUpdate(data, (cleanData) => {
     rawGlassStorageDetailList.value = cleanData.rawGlassStorageDetailList[0];
     orderDTOS.value = cleanData.orderDTOS[0];
@@ -61,8 +61,8 @@
 let myChartEdg = null;
 let myChartTemp = null;
 let myChartHollow = null;
-const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
-const handleMessage1 = (data) => {
+const socketUrl1 = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/largenScreen`;
+let handleMessage1 = (data) => {
   edgOneTasks.value = data.edgOneCount[0];
   edgTwoTasks.value = data.edgOneCount[0];
   engineeringOne.value = data.engineeringOne[0];
@@ -82,8 +82,8 @@
 const temperingTaskType = ref([])
 const temperingGlassInfoList = ref([])
 const temperingGlassInfoInList = ref([])
-const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/largenScreen`;
-const handleMessage2 = (data) => {
+const socketUrl2 = `ws://${window.ipConfig.serverUrl}/api/temperingGlass/api/talk/largenScreen`;
+let handleMessage2 = (data) => {
   temperingTaskType.value = data.temperingTaskType[0];
   temperingGlassInfoList.value = data.temperingGlassInfoList[0];
   if (numBoxes3.value != temperingTaskType.value) {
@@ -105,8 +105,8 @@
 };
 let socket3 = null;
 const bigStorageCageUsage = ref([])
-const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
-const handleMessage3 = (data) => {
+const socketUrl3 = `ws://${window.ipConfig.serverUrl}/api/cacheVerticalGlass/api/talk/largenScreen`;
+let handleMessage3 = (data) => {
   bigStorageCageUsage.value = data.bigStorageCageUsage[0];
   timeAxisCreate(t('large.temperingState'), chartTemp.value, myChartTemp, tableDataTime(false, data.tempRunTimes[0]));
 };
@@ -291,8 +291,8 @@
 };
 let socket4 = null;
 const hollowBigStorageCageUsage = ref([])
-const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
-const handleMessage4 = (data) => {
+const socketUrl4 = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/largenScreen`;
+let handleMessage4 = (data) => {
   hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
   timeAxisCreate(t('large.hollowState'), chartHollow.value, myChartHollow, tableDataTime(false, data.hollowRunTimes[0]));
 };
@@ -302,7 +302,7 @@
 const switchNoorAreaLeft = ref(true)
 const switchNoorAreaRight = ref(true)
 const productionVO = ref([])
-const socketUrl5 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreenProduction`;
+const socketUrl5 = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/largenScreenProduction`;
 const createchart = (productionVO) => {
   categories = productionVO.value.map(item => item.date); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
   totalAreaOutOne = productionVO.value.map(item => item.totalAreaOutOne);
@@ -466,7 +466,7 @@
   };
   myChart2.setOption(option2, true);
 }
-const handleMessage5 = (data) => {
+let handleMessage5 = (data) => {
   productionVO.value = data.productionVO[0];
   createchart(productionVO);
 };
@@ -501,7 +501,7 @@
 }
 const exportToExcel = async () => {
   try {
-    window.open(`http://${WebSocketHost}:10011/largenScreen/exportDailyProduction`, '_blank');
+    window.open(`http://${window.ipConfig.serverUrl}:10011/largenScreen/exportDailyProduction`, '_blank');
   }
   catch (error) {
     console.error(error);
@@ -1332,7 +1332,7 @@
   /* margin-top: 50px; */
   /* float: left; */
   position: relative;
-  background-image: url('../../assets/screen.png');
+  background-image: url('/screen.png');
   width: 795px;
   height: 700px;
   background-size: contain;

--
Gitblit v1.8.0