From c557aabf32134f5297833b4aafceb11db93c42e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 10 十月 2024 14:01:29 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/settings/index.jsx | 40 +++++++++++++++++++-
zy-acs-flow/src/i18n/en.js | 7 +++
zy-acs-flow/src/map/insight/index.jsx | 40 +++++++++++++++++++-
zy-acs-flow/src/i18n/zh.js | 6 +++
zy-acs-flow/src/map/MapPage.jsx | 6 ++
5 files changed, 94 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 667522c..e393bde 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -1,3 +1,4 @@
+import { settings } from 'pixi.js';
import englishMessages from 'ra-language-english';
const customEnglishMessages = {
@@ -627,6 +628,12 @@
station: 'STATION',
direction: 'DIRECTION',
},
+ settings: {
+ title: 'Settings',
+ },
+ insight: {
+ title: 'Insight',
+ },
},
}
};
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index dc0095a..a18ad78 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -626,6 +626,12 @@
station: '杈撻�佺嚎',
direction: '鏂瑰悜',
},
+ settings: {
+ title: '璁剧疆',
+ },
+ insight: {
+ title: '璇︽儏',
+ },
},
}
};
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index baca6d7..64dbb40 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -60,7 +60,7 @@
Tool.setMapContainer(player.mapContainer);
Tool.setThemeMode(themeMode);
Http.setNotify(notify);
- websocket = new WebSocketClient('/ws/map/websocket');
+ // websocket = new WebSocketClient('/ws/map/websocket');
await Http.fetchMapData(0);
// websocket.connect();
@@ -310,6 +310,7 @@
onCancel={() => {
setInsightVisible(false);
}}
+ width={378}
/>
<Device
@@ -324,8 +325,11 @@
<Settings
open={settingsVisible}
onCancel={() => {
+ setSpriteSettings(null);
setSettingsVisible(false);
}}
+ sprite={spriteSettings}
+ width={378}
/>
</Box>
diff --git a/zy-acs-flow/src/map/insight/index.jsx b/zy-acs-flow/src/map/insight/index.jsx
index 479dd9f..41155ec 100644
--- a/zy-acs-flow/src/map/insight/index.jsx
+++ b/zy-acs-flow/src/map/insight/index.jsx
@@ -1,12 +1,48 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { useTranslate } from "react-admin";
+import { Drawer, Box, Typography, Grid, IconButton, Stack, useTheme } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
+import { PAGE_DRAWER_WIDTH } from '@/config/setting';
const Insight = (props) => {
- const { open, onCancel } = props;
+ const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH, title } = props;
+ const theme = useTheme();
+ const themeMode = theme.palette.mode;
+ const translate = useTranslate();
+ const handleClose = () => {
+ onCancel();
+ }
+
+ useEffect(() => {
+ }, [])
return (
<>
-
+ <Drawer
+ variant="persistent"
+ open={open}
+ anchor="right"
+ onClose={handleClose}
+ sx={{ zIndex: 100, opacity: .8 }}
+ >
+ {open && (
+ <Box pt={12} width={{ xs: '100vW', sm: width }} height={'calc(100vh - 200px);'} mt={{ xs: 2, sm: 1 }} sx={{
+ }}>
+ <Stack direction="row" p={2}>
+ <Typography variant="h6" flex="1">
+ {title || translate('page.map.settings.title')}
+ </Typography>
+ <IconButton onClick={handleClose} size="small">
+ <CloseIcon />
+ </IconButton>
+ </Stack>
+ <Box p={3}>
+ </Box>
+ </Box>
+ )}
+ </Drawer>
</>
)
}
diff --git a/zy-acs-flow/src/map/settings/index.jsx b/zy-acs-flow/src/map/settings/index.jsx
index ddaed44..7c2bb80 100644
--- a/zy-acs-flow/src/map/settings/index.jsx
+++ b/zy-acs-flow/src/map/settings/index.jsx
@@ -1,12 +1,48 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { useTranslate } from "react-admin";
+import { Drawer, Box, Typography, Grid, IconButton, Stack, useTheme } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
+import { PAGE_DRAWER_WIDTH } from '@/config/setting';
const Settings = (props) => {
- const { open, onCancel } = props;
+ const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH, title } = props;
+ const theme = useTheme();
+ const themeMode = theme.palette.mode;
+ const translate = useTranslate();
+ const handleClose = () => {
+ onCancel();
+ }
+
+ useEffect(() => {
+ }, [])
return (
<>
-
+ <Drawer
+ variant="persistent"
+ open={open}
+ anchor="right"
+ onClose={handleClose}
+ sx={{ zIndex: 100, opacity: .8 }}
+ >
+ {open && (
+ <Box pt={12} width={{ xs: '100vW', sm: width }} height={'calc(100vh - 200px);'} mt={{ xs: 2, sm: 1 }} sx={{
+ }}>
+ <Stack direction="row" p={2}>
+ <Typography variant="h6" flex="1">
+ {title || translate('page.map.settings.title')}
+ </Typography>
+ <IconButton onClick={handleClose} size="small">
+ <CloseIcon />
+ </IconButton>
+ </Stack>
+ <Box p={3}>
+ </Box>
+ </Box>
+ )}
+ </Drawer>
</>
)
}
--
Gitblit v1.9.1