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 |   90 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index e19fb86..6012922 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -16,14 +16,17 @@
 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";
-import { FitScreen, AltRoute, RotateRight } from '@mui/icons-material';
+import { FitScreen, RotateRight, Flip } from '@mui/icons-material';
 import MapSearch from "./header/MapSearch";
 import { startupOrShutdown } from "./http";
 import PulseSignal from "../page/components/PulseSignal";
 import FakeFab from "./header/FakeFab";
+import RouteFab from "./header/RouteFab";
+import MoreOperate from "./header/MoreOperate";
 
 let player;
 let websocket;
@@ -47,6 +50,8 @@
     const [deviceVisible, setDeviceVisible] = useState(false);
     const [settingsVisible, setSettingsVisible] = useState(false);
     const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
+    const [areaSettingsVisible, setAreaSettingsVisible] = useState(false);
+    const [areaDrawing, setAreaDrawing] = useState(false);
 
     const [curSprite, setCurSprite] = useState(null);
     const [batchSprites, setBatchSprites] = useState([]);
@@ -123,15 +128,21 @@
         modeRef.current = mode;
 
         Tool.removeSelectedEffect();
+        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:
@@ -165,6 +176,11 @@
                 mapContainer.children.forEach(child => {
                     Tool.beSettings(child, setCurSprite);
                 })
+                break
+            case MAP_MODE.AREA_MODE:
+                Tool.removeAgvGraphics();
+
+                Tool.loadAreas(curZone, setCurSprite);
                 break
             default:
                 break
@@ -206,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]);
 
@@ -284,6 +305,7 @@
                         <Button variant="contained" color="primary">
                             {translate('page.map.action.monitor')}
                         </Button>
+                        <MoreOperate />
                     </>
                 )}
 
@@ -337,6 +359,41 @@
                     </>
                 )}
 
+                {mode === MAP_MODE.AREA_MODE && (
+                    <>
+                        <Button
+                            variant={areaDrawing ? "outlined" : "contained"}
+                            color="primary"
+                            sx={{}}
+                            disabled={areaDrawing}
+                            onClick={() => {
+                                setCurSprite(null);
+                                const started = Tool.startAreaDrawing({
+                                    promptText: translate('page.map.prompt.areaName'),
+                                    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);
+                                }
+                            }}
+                        >
+                            {translate('page.map.action.addArea')}
+                        </Button>
+                    </>
+                )}
+
                 <Select
                     value={mode ?? ''}
                     onChange={(event) => {
@@ -354,6 +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.AREA_MODE}>{translate('page.map.mode.area')}</MenuItem>
                 </Select>
             </Box>
             {/* content */}
@@ -409,16 +467,12 @@
                 >
                     {mode !== MAP_MODE.MOVABLE_MODE && (
                         <>
-                            <Fab
-                                variant="extended"
-                                color={showRoutes ? 'primary' : 'default'}
-                                size="small"
-                                onClick={() => {
-                                    showRoutes ? Tool.hideRoutes(curZone, setShowRoutes) : Tool.showRoutes(curZone, setShowRoutes)
-                                }}
-                            >
-                                <AltRoute />
-                            </Fab>
+                            <RouteFab
+                                curZone={curZone}
+                                showRoutes={showRoutes}
+                                setShowRoutes={setShowRoutes}
+                                notify={notify}
+                            />
                             <FakeFab />
                         </>
                     )}
@@ -431,7 +485,7 @@
                         }}
                     >
                         <RotateRight />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.rotate')}&nbsp;
                     </Fab>
                     <Fab
                         variant="extended"
@@ -442,7 +496,7 @@
                         }}
                     >
                         <FitScreen />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.adapt')}&nbsp;
                     </Fab>
                 </Box>
             </Box>
@@ -485,6 +539,16 @@
                 width={570}
             />
 
+            <AreaSettings
+                open={areaSettingsVisible}
+                onCancel={() => {
+                    setCurSprite(null);
+                }}
+                sprite={curSprite}
+                setSpriteSettings={setCurSprite}
+                width={570}
+            />
+
         </Box>
     );
 }

--
Gitblit v1.9.1