From 871f2adaa5aab007ed34c513b5140bf28a151d0f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 22 十一月 2024 08:51:50 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/tool.js | 4 ++-- zy-acs-flow/src/map/MapPage.jsx | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index ba9ebb1..ade2ea5 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -41,6 +41,7 @@ const [mapContainer, setMapContainer] = useState(null); const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE); + const modeRef = useRef(mode); const [dataFetched, setDataFetched] = useState(false); const [insightVisible, setInsightVisible] = useState(false); const [deviceVisible, setDeviceVisible] = useState(false); @@ -80,7 +81,9 @@ await Http.fetchMapData(curZone, setRcsStatus, setCurSprite); websocket.connect(); websocket.onMessage = (wsMsg) => { - Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite); + if (modeRef.current === MAP_MODE.OBSERVER_MODE) { + Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite); + } } player.rotateMap(localStorage.getItem('mapRotation')); @@ -104,7 +107,6 @@ player.destroy(); window.removeEventListener('resize', handleResize); Tool.patchRaLayout(''); - Tool.isF }; }, []) @@ -118,6 +120,8 @@ }, [themeMode]) const switchMode = (mode) => { + modeRef.current = mode; + Tool.removeSelectedEffect(); player.hideGridLines(); diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js index 045b324..7afefdb 100644 --- a/zy-acs-flow/src/map/tool.js +++ b/zy-acs-flow/src/map/tool.js @@ -684,8 +684,6 @@ agvSprite.position.set(codeSprite.position.x, codeSprite.position.y); agvSprite.rotation = targetRotation + agvRotationOffset; mapContainer.addChild(agvSprite); - console.log(agvSprite, setCurSprite); - beInsight(agvSprite, setCurSprite); // agvNo sprite const agvText = new PIXI.Text(agvNo.toString(), { @@ -719,6 +717,8 @@ animateRotation(agvSprite, targetRotation + agvRotationOffset, agvRotationOffset); } + beInsight(agvSprite, setCurSprite); + new TWEEDLE.Tween(agvSprite.position) .to({ x: codeSprite.position.x, -- Gitblit v1.9.1