From db0554663e0a63bd0d718ae87b381481c663aab2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 08 十月 2024 13:52:31 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/MapPage.jsx | 167 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 122 insertions(+), 45 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index 0b33b74..1638915 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -1,7 +1,5 @@ -import React from 'react'; +import React, { useState, useRef, useEffect, useMemo } from "react"; import { - AppBar, - Toolbar, TextField, Select, MenuItem, @@ -9,6 +7,7 @@ Box, SpeedDial, SpeedDialAction, + useTheme, } from '@mui/material'; import { MoreVert as MoreVertIcon, @@ -18,9 +17,62 @@ Print as PrintIcon, Share as ShareIcon, } from '@mui/icons-material'; +import Player from './player'; -function MapPage() { - const [mode, setMode] = React.useState('monitoring'); +let player; + +const MapPage = () => { + const mapRef = useRef(); + + const [app, setApp] = useState(null); + const [mapContainer, setMapContainer] = React.useState(null); + + const [mode, setMode] = useState('monitoring'); + + const theme = useTheme(); + const themeMode = theme.palette.mode; + + useEffect(() => { + const parentElement = document.getElementById('main-content'); + if (parentElement && parentElement.classList.contains('RaLayout-content')) { + parentElement.style.paddingLeft = '0px'; + parentElement.style.paddingRight = '0px'; + } + + + // const initialize = async () => { + // player = new Player(mapRef.current, themeMode); + // setApp(player.app); + // setMapContainer(player.mapContainer); + + + + // } + // initialize(); + + // // resize + // const handleResize = () => { + // player.resize(); + // }; + // window.addEventListener('resize', handleResize); + // handleResize(); + + + // return () => { + // player.destroy(); + // window.removeEventListener('resize', handleResize); + // }; + return () => { + // 閿�姣� Pixi.js 搴旂敤 + // ... + + // 鎭㈠鐖跺鍣ㄧ殑鍐呰竟璺� + if (parentElement && parentElement.classList.contains('RaLayout-content')) { + parentElement.style.paddingLeft = ''; + parentElement.style.paddingRight = ''; + } + }; + }, [themeMode]) const handleModeChange = (event) => { setMode(event.target.value); @@ -35,54 +87,79 @@ ]; return ( - <div> - {/* 鑿滃崟鏍� */} - <AppBar position="static"> - <Toolbar> - {/* 宸︿晶鎼滅储妗� */} - <TextField - variant="outlined" - size="small" - placeholder="鎼滅储..." - style={{ marginRight: 'auto' }} - /> - {/* 妯″紡閫夋嫨涓嬫媺妗� */} - <Select - value={mode} - onChange={handleModeChange} - variant="outlined" - size="small" - style={{ marginRight: 16 }} - > - <MenuItem value="monitoring">鐩戞帶妯″紡</MenuItem> - <MenuItem value="edit">缂栬緫妯″紡</MenuItem> - <MenuItem value="configuration">閰嶇疆妯″紡</MenuItem> - </Select> - {/* 鍔熻兘鎸夐挳 */} - <Button variant="contained" color="primary" style={{ marginRight: 8 }}> - 鍋滄RCS杩愯浆 - </Button> - <Button variant="contained" color="secondary"> - 妯℃嫙AGV杩愯 - </Button> - </Toolbar> - </AppBar> - {/* 鍦板浘鍖哄煙 */} + <Box + sx={{ + height: '100%', + display: 'flex', + flexDirection: 'column', + }} + > <Box sx={{ - height: 'calc(100vh - 64px)', // 鍑忓幓AppBar鐨勯珮搴� - position: 'relative', + display: 'flex', + alignItems: 'center', + backgroundColor: '#f5f5f5', + color: '#000', + padding: '0 16px', + height: '64px', + flexShrink: 0, // keep height }} > - {/* 鍦板浘鍗犱綅绗� */} + <TextField + variant="outlined" + size="small" + placeholder="鎼滅储..." + sx={{ + width: '200px', + backgroundColor: '#fff', + borderRadius: 1, + }} + /> + <Box sx={{ flexGrow: 1 }} /> + <Select + value={mode} + onChange={handleModeChange} + variant="outlined" + size="small" + sx={{ + mr: 2, + backgroundColor: '#fff', + borderRadius: 1, + }} + > + <MenuItem value="monitoring">鐩戞帶妯″紡</MenuItem> + <MenuItem value="edit">缂栬緫妯″紡</MenuItem> + <MenuItem value="configuration">閰嶇疆妯″紡</MenuItem> + </Select> + <Button + variant="contained" + color="primary" + sx={{ mr: 1 }} + > + 鍋滄RCS杩愯浆 + </Button> + <Button variant="contained" color="secondary"> + 妯℃嫙AGV杩愯 + </Button> + </Box> + <Box + sx={{ + flexGrow: 1, // fill remaining of map space + position: 'relative', + backgroundColor: '#fff', + + }} + > <Box + ref={mapRef} sx={{ width: '100%', height: '100%', - backgroundColor: '#f0f0f0', + backgroundColor: '#e0e0e0', }} - /> - {/* Speed Dial缁勪欢 */} + > + </Box> + <SpeedDial ariaLabel="SpeedDial 绀轰緥" sx={{ position: 'absolute', bottom: 16, right: 16 }} @@ -97,7 +174,7 @@ ))} </SpeedDial> </Box> - </div> + </Box> ); } -- Gitblit v1.9.1