From a957c1c914f6890c8a6a8c477495809b065fcbcf Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 18 四月 2025 16:59:35 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/MapPage.jsx |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 3fa87d0..a92cbe7 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -8,7 +8,7 @@
     useTheme,
     Fab,
 } from '@mui/material';
-import { MAP_MODE } from "./constants";
+import { MAP_MODE, MAP_DEFAULT_ROTATION } from "./constants";
 import Player from './player';
 import * as Tool from './tool';
 import { NotificationProvider, useNotification } from './Notification';
@@ -19,11 +19,13 @@
 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 RePositionBtn from "./header/RePositionBtn";
 
 let player;
 let websocket;
@@ -86,7 +88,7 @@
                 }
             }
 
-            player.rotateMap(localStorage.getItem('mapRotation'));
+            player.rotateMap(localStorage.getItem('mapRotation') || Tool.rotationParseNum(MAP_DEFAULT_ROTATION));
             setTimeout(() => {
                 notify.info(translate('page.map.welcome'));
                 player.adaptScreen();
@@ -281,6 +283,7 @@
                         >
                             {rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')}
                         </Button>
+                        <RePositionBtn />
                         <Button variant="contained" color="primary">
                             {translate('page.map.action.monitor')}
                         </Button>
@@ -409,16 +412,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 +430,7 @@
                         }}
                     >
                         <RotateRight />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.rotate')}&nbsp;
                     </Fab>
                     <Fab
                         variant="extended"
@@ -442,7 +441,7 @@
                         }}
                     >
                         <FitScreen />
-                        {/* &nbsp;{translate('page.map.action.adapt')} */}
+                        &nbsp;{translate('page.map.action.adapt')}&nbsp;
                     </Fab>
                 </Box>
             </Box>

--
Gitblit v1.9.1