From cab66ddd879dafcee85965e76d52347a5301e5f7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 三月 2026 10:25:30 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-acs-flow/src/map/MapPage.jsx | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 610badc..552d4bd 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,12 +8,13 @@
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';
import Insight from "./insight";
import Device from "./Device";
+import AreaList from "./AreaList";
import Settings from "./settings";
import Batch from "./batch";
import AreaSettings from "./areaSettings";
@@ -28,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;
@@ -52,6 +54,7 @@
const [settingsVisible, setSettingsVisible] = useState(false);
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
const [areaSettingsVisible, setAreaSettingsVisible] = useState(false);
+ const [areaListVisible, setAreaListVisible] = useState(false);
const [areaDrawing, setAreaDrawing] = useState(false);
const [curSprite, setCurSprite] = useState(null);
@@ -64,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);
@@ -83,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);
@@ -122,6 +129,9 @@
}, [sidebarOpen]);
useEffect(() => {
+ if (!player) {
+ return;
+ }
player.setTheme(themeMode);
Tool.setThemeMode(themeMode);
}, [themeMode])
@@ -139,6 +149,7 @@
setBatchSelectionVisible(false);
setAreaSettingsVisible(false);
setAreaDrawing(false);
+ setAreaListVisible(false);
Tool.cancelAreaDrawing();
Tool.hideAreas(curZone, setShowAreas);
@@ -215,6 +226,7 @@
if (!mapContainer) {
return;
}
+ setAreaListVisible(false);
Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
@@ -295,7 +307,7 @@
</Box>
<Button
variant="contained"
- color={rcsStatus ? 'inherit' : 'primary'}
+ color={rcsStatus ? 'error' : 'primary'}
sx={{ mr: 2 }}
onClick={() => {
startupOrShutdown(() => {
@@ -305,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 />
@@ -365,11 +381,21 @@
{mode === MAP_MODE.AREA_MODE && (
<>
<Button
- variant={areaDrawing ? "outlined" : "contained"}
- color="primary"
- sx={{}}
- disabled={areaDrawing}
+ variant="outlined"
+ onClick={() => setAreaListVisible(!areaListVisible)}
+ sx={{ mr: 2 }}
+ >
+ {translate('page.map.action.areaList')}
+ </Button>
+ <Button
+ variant="contained"
+ color={areaDrawing ? "error" : "primary"}
onClick={() => {
+ if (areaDrawing) {
+ Tool.cancelAreaDrawing();
+ setAreaDrawing(false);
+ return;
+ }
setCurSprite(null);
const started = Tool.startAreaDrawing({
promptText: translate('page.map.area.prompt.nameInput'),
@@ -392,7 +418,9 @@
}
}}
>
- {translate('page.map.action.addArea')}
+ {areaDrawing
+ ? translate('page.map.action.cancelAddArea')
+ : translate('page.map.action.addArea')}
</Button>
</>
)}
@@ -562,6 +590,18 @@
width={570}
/>
+ <AreaList
+ zoneId={curZone}
+ open={areaListVisible}
+ onClose={() => setAreaListVisible(false)}
+ setCurSprite={setCurSprite}
+ width={378}
+ />
+
+ <NewsLogDialog
+ open={logDialogOpen}
+ onClose={() => setLogDialogOpen(false)}
+ />
</Box>
);
}
--
Gitblit v1.9.1