From adcd2efd074eb3160c429ea8a5dfd537db1d1304 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 17 十二月 2025 14:37:06 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9251563..a28cf21 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -14,6 +14,7 @@
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";
@@ -26,6 +27,7 @@
import PulseSignal from "../page/components/PulseSignal";
import FakeFab from "./header/FakeFab";
import RouteFab from "./header/RouteFab";
+import AreaFab from "./header/AreaFab";
import MoreOperate from "./header/MoreOperate";
let player;
@@ -51,6 +53,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);
@@ -58,6 +61,7 @@
const [rcsStatus, setRcsStatus] = useState(null);
const [showRoutes, setShowRoutes] = useState(false);
+ const [showAreas, setShowAreas] = useState(false);
const [curZone, setCurZone] = useState(() => {
const storedValue = localStorage.getItem('curZone');
return storedValue !== null ? JSON.parse(storedValue) : null;
@@ -137,7 +141,9 @@
setBatchSelectionVisible(false);
setAreaSettingsVisible(false);
setAreaDrawing(false);
+ setAreaListVisible(false);
Tool.cancelAreaDrawing();
+ Tool.hideAreas(curZone, setShowAreas);
setCurSprite(null);
setBatchSprites([]);
@@ -362,6 +368,13 @@
{mode === MAP_MODE.AREA_MODE && (
<>
<Button
+ variant="outlined"
+ onClick={() => setAreaListVisible(!areaListVisible)}
+ sx={{ mr: 2 }}
+ >
+ {translate('page.map.action.areaList')}
+ </Button>
+ <Button
variant={areaDrawing ? "outlined" : "contained"}
color="primary"
sx={{}}
@@ -465,6 +478,16 @@
gap: 2
}}
>
+ {mode === MAP_MODE.OBSERVER_MODE && (
+ <>
+ <AreaFab
+ curZone={curZone}
+ showAreas={showAreas}
+ setShowAreas={setShowAreas}
+ notify={notify}
+ />
+ </>
+ )}
{mode !== MAP_MODE.MOVABLE_MODE && (
<>
<RouteFab
@@ -549,6 +572,13 @@
width={570}
/>
+ <AreaList
+ zoneId={curZone}
+ open={areaListVisible}
+ onClose={() => setAreaListVisible(false)}
+ width={400}
+ />
+
</Box>
);
}
--
Gitblit v1.9.1