From 94cb5196f4eecdc6102ef3da74087b1a8a58bc99 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 23 三月 2026 13:09:23 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 4981505..552d4bd 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,7 +8,7 @@
useTheme,
Fab,
} from '@mui/material';
-import { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
+import { MAP_MODE, MAP_DEFAULT_ROTATION, setMapPreferences } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
@@ -29,6 +29,7 @@
import RouteFab from "./header/RouteFab";
import AreaFab from "./header/AreaFab";
import MoreOperate from "./header/MoreOperate";
+import NewsLogDialog from "./NewsLogDialog";
let player;
let websocket;
@@ -66,9 +67,12 @@
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
});
+ const [logDialogOpen, setLogDialogOpen] = useState(false);
const handleResize = () => {
- if (!contentRef) { return; }
+ if (!contentRef.current || !player) {
+ return;
+ }
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
player.resize(width, height);
@@ -85,6 +89,7 @@
Tool.setThemeMode(themeMode);
Http.setNotify(notify);
Http.setMapContainer(player.mapContainer);
+ await Http.fetchMapPreferences(curZone, setMapPreferences);
websocket = new WebSocketClient('/ws/map/websocket');
await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
@@ -124,6 +129,9 @@
}, [sidebarOpen]);
useEffect(() => {
+ if (!player) {
+ return;
+ }
player.setTheme(themeMode);
Tool.setThemeMode(themeMode);
}, [themeMode])
@@ -299,7 +307,7 @@
</Box>
<Button
variant="contained"
- color={rcsStatus ? 'inherit' : 'primary'}
+ color={rcsStatus ? 'error' : 'primary'}
sx={{ mr: 2 }}
onClick={() => {
startupOrShutdown(() => {
@@ -309,7 +317,11 @@
>
{rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')}
</Button>
- <Button variant="contained" color="primary">
+ <Button
+ variant="contained"
+ color="primary"
+ onClick={() => setLogDialogOpen(true)}
+ >
{translate('page.map.action.monitor')}
</Button>
<MoreOperate />
@@ -586,6 +598,10 @@
width={378}
/>
+ <NewsLogDialog
+ open={logDialogOpen}
+ onClose={() => setLogDialogOpen(false)}
+ />
</Box>
);
}
--
Gitblit v1.9.1