From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 11 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index cc606e9..4981505 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -14,8 +14,10 @@
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";
import * as Http from './http';
import WebSocketClient from './websocket'
import ConfirmButton from "../page/components/ConfirmButton";
@@ -25,6 +27,8 @@
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;
let websocket;
@@ -48,12 +52,16 @@
const [deviceVisible, setDeviceVisible] = useState(false);
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);
const [batchSprites, setBatchSprites] = useState([]);
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;
@@ -124,15 +132,23 @@
modeRef.current = mode;
Tool.removeSelectedEffect();
+ Tool.clearAreas();
player.hideGridLines();
setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
+ setAreaSettingsVisible(false);
+ setAreaDrawing(false);
+ setAreaListVisible(false);
+ Tool.cancelAreaDrawing();
+ Tool.hideAreas(curZone, setShowAreas);
setCurSprite(null);
setBatchSprites([]);
+
+ player.deactivateMapMultiSelect();
switch (mode) {
case MAP_MODE.OBSERVER_MODE:
@@ -167,6 +183,11 @@
Tool.beSettings(child, setCurSprite);
})
break
+ case MAP_MODE.AREA_MODE:
+ Tool.removeAgvGraphics();
+
+ Tool.loadAreas(curZone, setCurSprite);
+ break
default:
break
}
@@ -197,6 +218,7 @@
if (!mapContainer) {
return;
}
+ setAreaListVisible(false);
Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
@@ -207,10 +229,15 @@
Tool.showSelectedEffect(curSprite);
setSettingsVisible(true);
}
+ if (mode === MAP_MODE.AREA_MODE) {
+ Tool.showSelectedEffect(curSprite);
+ setAreaSettingsVisible(true);
+ }
} else {
Tool.removeSelectedEffect();
setInsightVisible(false);
setSettingsVisible(false);
+ setAreaSettingsVisible(false);
}
}, [curSprite]);
@@ -285,6 +312,7 @@
<Button variant="contained" color="primary">
{translate('page.map.action.monitor')}
</Button>
+ <MoreOperate />
</>
)}
@@ -338,6 +366,53 @@
</>
)}
+ {mode === MAP_MODE.AREA_MODE && (
+ <>
+ <Button
+ 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'),
+ onComplete: ({ name, start, end, color, graphics }) => {
+ if (name) {
+ Http.saveAreaData(curZone, { name, start, end, color }).then((savedArea) => {
+ if (savedArea?.id && graphics?.data) {
+ graphics.data.id = savedArea.id;
+ }
+ });
+ }
+ },
+ onFinish: () => {
+ setAreaDrawing(false);
+ },
+ setCurSprite,
+ });
+ if (started) {
+ setAreaDrawing(true);
+ }
+ }}
+ >
+ {areaDrawing
+ ? translate('page.map.action.cancelAddArea')
+ : translate('page.map.action.addArea')}
+ </Button>
+ </>
+ )}
+
<Select
value={mode ?? ''}
onChange={(event) => {
@@ -355,6 +430,7 @@
<MenuItem value={MAP_MODE.OBSERVER_MODE}>{translate('page.map.mode.observer')}</MenuItem>
<MenuItem value={MAP_MODE.MOVABLE_MODE}>{translate('page.map.mode.movable')}</MenuItem>
<MenuItem value={MAP_MODE.SETTINGS_MODE}>{translate('page.map.mode.settings')}</MenuItem>
+ <MenuItem value={MAP_MODE.AREA_MODE}>{translate('page.map.mode.area')}</MenuItem>
</Select>
</Box>
{/* content */}
@@ -408,6 +484,16 @@
gap: 2
}}
>
+ {mode === MAP_MODE.OBSERVER_MODE && (
+ <>
+ <AreaFab
+ curZone={curZone}
+ showAreas={showAreas}
+ setShowAreas={setShowAreas}
+ notify={notify}
+ />
+ </>
+ )}
{mode !== MAP_MODE.MOVABLE_MODE && (
<>
<RouteFab
@@ -419,17 +505,6 @@
<FakeFab />
</>
)}
- <Fab
- variant="extended"
- color="primary"
- size="small"
- onClick={() => {
- player.flipMapHorizontally();
- }}
- >
- <Flip />
- {translate('page.map.action.flip')}
- </Fab>
<Fab
variant="extended"
color="primary"
@@ -493,6 +568,24 @@
width={570}
/>
+ <AreaSettings
+ open={areaSettingsVisible}
+ onCancel={() => {
+ setCurSprite(null);
+ }}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
+ width={570}
+ />
+
+ <AreaList
+ zoneId={curZone}
+ open={areaListVisible}
+ onClose={() => setAreaListVisible(false)}
+ setCurSprite={setCurSprite}
+ width={378}
+ />
+
</Box>
);
}
--
Gitblit v1.9.1