Merge branch 'rcs_master' into jdxaj

zhang

6 天以前 cab66ddd879dafcee85965e76d52347a5301e5f7

 zy-acs-flow/src/map/MapPage.jsx

@@ -29,6 +29,7 @@
import RouteFab from "./header/RouteFab";
import AreaFab from "./header/AreaFab";
import MoreOperate from "./header/MoreOperate";
import NewsLogDialog from "./NewsLogDialog";

let player;
let websocket;
@@ -66,9 +67,12 @@
        const storedValue = localStorage.getItem('curZone');
        return storedValue !== null ? JSON.parse(storedValue) : null;
    });
    const [logDialogOpen, setLogDialogOpen] = useState(false);

    const handleResize = () => {
        if (!contentRef) { return; }
        if (!contentRef.current || !player) {
            return;
        }
        const width = contentRef.current.offsetWidth;
        const height = contentRef.current.offsetHeight;
        player.resize(width, height);
@@ -125,6 +129,9 @@
    }, [sidebarOpen]);

    useEffect(() => {
        if (!player) {
            return;
        }
        player.setTheme(themeMode);
        Tool.setThemeMode(themeMode);
    }, [themeMode])
@@ -300,7 +307,7 @@
                        </Box>
                        <Button
                            variant="contained"
                            color={rcsStatus ? 'inherit' : 'primary'}
                            color={rcsStatus ? 'error' : 'primary'}
                            sx={{ mr: 2 }}
                            onClick={() => {
                                startupOrShutdown(() => {
@@ -310,7 +317,11 @@
                        >
                            {rcsStatus ? translate('page.map.action.shutdown') : translate('page.map.action.startup')}
                        </Button>
                        <Button variant="contained" color="primary">
                        <Button
                            variant="contained"
                            color="primary"
                            onClick={() => setLogDialogOpen(true)}
                        >
                            {translate('page.map.action.monitor')}
                        </Button>
                        <MoreOperate />
@@ -587,6 +598,10 @@
                width={378}
            />

            <NewsLogDialog
                open={logDialogOpen}
                onClose={() => setLogDialogOpen(false)}
            />
        </Box>
    );
}