From e933a43a83e61ccc602c61c931d265f6f4eeea48 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 09:59:46 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/tool.js     |    7 +------
 zy-acs-flow/src/map/MapPage.jsx |   10 +++++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index e1bf3ce..0f0bfca 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -34,6 +34,7 @@
 
 let player;
 let websocket;
+let isFirstRender = true;
 
 const Map = () => {
     const notify = useNotification();
@@ -86,12 +87,10 @@
             await Http.fetchMapData();
             websocket.connect();
             websocket.onMessage = (wsMsg) => {
-                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), () => {
-                    setDataFetched(true);
-                    setMode(MAP_MODE.OBSERVER_MODE);
-                });
+                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg));
             }
-
+            setDataFetched(true);
+            setMode(MAP_MODE.OBSERVER_MODE);
             setTimeout(() => {
                 player.adaptScreen();
                 notify.info(translate('page.map.welcome'));
@@ -111,6 +110,7 @@
             player.destroy();
             window.removeEventListener('resize', handleResize);
             Tool.patchRaLayout('');
+            Tool.isF
         };
     }, [])
 
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 395bfc4..9896dc0 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -495,19 +495,14 @@
 
 
 // dynamic graphic ----------------
-let isFirstRender = true;
 
-export const generateDynamicGraphic = (curZone, data, callback) => {
+export const generateDynamicGraphic = (curZone, data) => {
     // console.log("ws", curZone, data);
 
     for (const agvVo of data.agvVos) {
         showAgvSprite(curZone, agvVo)
     }
 
-    if (isFirstRender) {
-        isFirstRender = false;
-        callback();
-    }
 }
 
 const showAgvSprite = (curZone, agvVo) => {

--
Gitblit v1.9.1