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 | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 12874c3..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";
@@ -52,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);
@@ -139,7 +141,9 @@
setBatchSelectionVisible(false);
setAreaSettingsVisible(false);
setAreaDrawing(false);
+ setAreaListVisible(false);
Tool.cancelAreaDrawing();
+ Tool.hideAreas(curZone, setShowAreas);
setCurSprite(null);
setBatchSprites([]);
@@ -364,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={{}}
@@ -467,7 +478,7 @@
gap: 2
}}
>
- {mode !== MAP_MODE.AREA_MODE && (
+ {mode === MAP_MODE.OBSERVER_MODE && (
<>
<AreaFab
curZone={curZone}
@@ -561,6 +572,13 @@
width={570}
/>
+ <AreaList
+ zoneId={curZone}
+ open={areaListVisible}
+ onClose={() => setAreaListVisible(false)}
+ width={400}
+ />
+
</Box>
);
}
--
Gitblit v1.9.1