From 8b093ec56bd4e5e721bf48ca497efc819691b2bc Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 15 十二月 2025 16:21:05 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9fa5b90..6012922 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -16,6 +16,7 @@
import Device from "./Device";
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";
@@ -49,7 +50,8 @@
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
- const [zoneDrawing, setZoneDrawing] = useState(false);
+ const [areaSettingsVisible, setAreaSettingsVisible] = useState(false);
+ const [areaDrawing, setAreaDrawing] = useState(false);
const [curSprite, setCurSprite] = useState(null);
const [batchSprites, setBatchSprites] = useState([]);
@@ -126,16 +128,21 @@
modeRef.current = mode;
Tool.removeSelectedEffect();
- Tool.clearZones();
+ Tool.clearAreas();
player.hideGridLines();
setInsightVisible(false);
setDeviceVisible(false);
setSettingsVisible(false);
setBatchSelectionVisible(false);
+ setAreaSettingsVisible(false);
+ setAreaDrawing(false);
+ Tool.cancelAreaDrawing();
setCurSprite(null);
setBatchSprites([]);
+
+ player.deactivateMapMultiSelect();
switch (mode) {
case MAP_MODE.OBSERVER_MODE:
@@ -170,10 +177,10 @@
Tool.beSettings(child, setCurSprite);
})
break
- case MAP_MODE.ZONING_MODE:
+ case MAP_MODE.AREA_MODE:
Tool.removeAgvGraphics();
- Tool.loadZones(curZone);
+ Tool.loadAreas(curZone, setCurSprite);
break
default:
break
@@ -215,10 +222,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]);
@@ -347,32 +359,37 @@
</>
)}
- {mode === MAP_MODE.ZONING_MODE && (
+ {mode === MAP_MODE.AREA_MODE && (
<>
<Button
- variant={zoneDrawing ? "outlined" : "contained"}
+ variant={areaDrawing ? "outlined" : "contained"}
color="primary"
- sx={{ mr: 2 }}
- disabled={zoneDrawing}
+ sx={{}}
+ disabled={areaDrawing}
onClick={() => {
- const started = Tool.startZoneDrawing({
- promptText: translate('page.map.prompt.zoneName'),
- onComplete: ({ name, start, end, color }) => {
+ setCurSprite(null);
+ const started = Tool.startAreaDrawing({
+ promptText: translate('page.map.prompt.areaName'),
+ onComplete: ({ name, start, end, color, graphics }) => {
if (name) {
- Http.saveZoneData(curZone, { name, start, end, color });
- notify.success(translate('page.map.msg.zoneCreated', { name }));
+ Http.saveAreaData(curZone, { name, start, end, color }).then((savedArea) => {
+ if (savedArea?.id && graphics?.data) {
+ graphics.data.id = savedArea.id;
+ }
+ });
}
},
onFinish: () => {
- setZoneDrawing(false);
- }
+ setAreaDrawing(false);
+ },
+ setCurSprite,
});
if (started) {
- setZoneDrawing(true);
+ setAreaDrawing(true);
}
}}
>
- {translate('page.map.action.addZone')}
+ {translate('page.map.action.addArea')}
</Button>
</>
)}
@@ -394,7 +411,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.ZONING_MODE}>{translate('page.map.mode.zoning')}</MenuItem>
+ <MenuItem value={MAP_MODE.AREA_MODE}>{translate('page.map.mode.area')}</MenuItem>
</Select>
</Box>
{/* content */}
@@ -522,6 +539,16 @@
width={570}
/>
+ <AreaSettings
+ open={areaSettingsVisible}
+ onCancel={() => {
+ setCurSprite(null);
+ }}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
+ width={570}
+ />
+
</Box>
);
}
--
Gitblit v1.9.1