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 | 88 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 70 insertions(+), 18 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index b303556..1638915 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState, useRef, useEffect, useMemo } from "react"; import { TextField, Select, @@ -7,6 +7,7 @@ Box, SpeedDial, SpeedDialAction, + useTheme, } from '@mui/material'; import { MoreVert as MoreVertIcon, @@ -16,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); @@ -40,17 +94,17 @@ flexDirection: 'column', }} > - {/* 鑿滃崟鏍� */} <Box sx={{ display: 'flex', alignItems: 'center', - backgroundColor: 'rgb(47, 104, 172)', // 浣跨敤涓婚棰滆壊 - color: '#fff', - padding: '8px 16px', + backgroundColor: '#f5f5f5', + color: '#000', + padding: '0 16px', + height: '64px', + flexShrink: 0, // keep height }} > - {/* 宸︿晶鎼滅储妗� */} <TextField variant="outlined" size="small" @@ -61,9 +115,7 @@ borderRadius: 1, }} /> - {/* 鍗犱綅绗︼紝鎺ㄥ姩鍙充晶鍐呭 */} <Box sx={{ flexGrow: 1 }} /> - {/* 妯″紡閫夋嫨涓嬫媺妗� */} <Select value={mode} onChange={handleModeChange} @@ -79,7 +131,6 @@ <MenuItem value="edit">缂栬緫妯″紡</MenuItem> <MenuItem value="configuration">閰嶇疆妯″紡</MenuItem> </Select> - {/* 鍔熻兘鎸夐挳 */} <Button variant="contained" color="primary" @@ -91,23 +142,24 @@ 妯℃嫙AGV杩愯 </Button> </Box> - {/* 鍦板浘鍖哄煙 */} <Box sx={{ - flexGrow: 1, + flexGrow: 1, // fill remaining of map space position: 'relative', - backgroundColor: '#e0e0e0', // 鏇寸編瑙傜殑鑳屾櫙鑹� + backgroundColor: '#fff', + }} > - {/* 鍦板浘鍗犱綅绗� */} <Box + ref={mapRef} sx={{ width: '100%', height: '100%', - backgroundColor: '#f5f5f5', + backgroundColor: '#e0e0e0', }} - /> - {/* Speed Dial缁勪欢 */} + > + </Box> + <SpeedDial ariaLabel="SpeedDial 绀轰緥" sx={{ position: 'absolute', bottom: 16, right: 16 }} -- Gitblit v1.9.1