From 82416a8117dd69be757380e8a42ecbac6e861e11 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 19 三月 2026 11:12:36 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-acs-flow/src/map/MapPage.jsx | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 8b229e2..44f8813 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -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,6 +67,7 @@
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
});
+ const [logDialogOpen, setLogDialogOpen] = useState(false);
const handleResize = () => {
if (!contentRef.current || !player) {
@@ -315,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 />
@@ -592,6 +598,10 @@
width={378}
/>
+ <NewsLogDialog
+ open={logDialogOpen}
+ onClose={() => setLogDialogOpen(false)}
+ />
</Box>
);
}
--
Gitblit v1.9.1