From 00b0ec55e1b0eef82b3a31166e8273ecea776568 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 19 十月 2024 14:34:51 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/MapPage.jsx | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index 59298e7..1564c27 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -21,6 +21,7 @@ import ConfirmButton from "../page/components/ConfirmButton"; import { FitScreen } from '@mui/icons-material'; import MapSearch from "./header/MapSearch"; +import { startupOrShutdown } from "./http"; let player; let websocket; @@ -48,6 +49,7 @@ const prevCurSpriteRef = useRef(); const [batchSprites, setBatchSprites] = useState([]); + const [rcsStatus, setRcsStatus] = useState(null); const [curZone, setCurZone] = useState(() => { const storedValue = localStorage.getItem('curZone'); return storedValue !== null ? JSON.parse(storedValue) : null; @@ -73,7 +75,7 @@ Http.setMapContainer(player.mapContainer); websocket = new WebSocketClient('/ws/map/websocket'); - await Http.fetchMapData(); + await Http.fetchMapData(curZone, setRcsStatus); websocket.connect(); websocket.onMessage = (wsMsg) => { Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite); @@ -196,15 +198,17 @@ } if (curSprite) { if (mode === MAP_MODE.OBSERVER_MODE) { - Tool.showSelectedEffect(curSprite) - setInsightVisible(true) + Tool.showSelectedEffect(curSprite); + setInsightVisible(true); } if (mode === MAP_MODE.SETTINGS_MODE) { - Tool.showSelectedEffect(curSprite) - setSettingsVisible(true) + Tool.showSelectedEffect(curSprite); + setSettingsVisible(true); } } else { Tool.removeSelectedEffect(); + setInsightVisible(false); + setSettingsVisible(false); } }, [curSprite]); const prevCurSprite = prevCurSpriteRef.current; @@ -259,10 +263,15 @@ <> <Button variant="contained" - color="primary" + color={rcsStatus ? 'inherit' : 'primary'} sx={{ mr: 2 }} + onClick={() => { + startupOrShutdown(() => { + setRcsStatus(!rcsStatus); + }); + }} > - {translate('page.map.action.startup')} + {rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')} </Button> <Button variant="contained" color="primary"> {translate('page.map.action.monitor')} @@ -408,7 +417,6 @@ open={insightVisible} onCancel={() => { setCurSprite(null); - setInsightVisible(false); }} sprite={curSprite} width={570} @@ -427,7 +435,6 @@ open={settingsVisible} onCancel={() => { setCurSprite(null); - setSettingsVisible(false); }} sprite={curSprite} setSpriteSettings={setCurSprite} @@ -438,7 +445,6 @@ open={batchSelectionVisible} onCancel={() => { setBatchSprites([]); - setBatchSelectionVisible(false); }} batchSprites={batchSprites} mode={mode} -- Gitblit v1.9.1