From bf4a9d88a55a95f54e7c7bf7f397fa6b18258743 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 13:33:57 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 197 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 155 insertions(+), 42 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 283b0e0..e5ae0b1 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
-import { useTranslate } from "react-admin";
+import { useTranslate, useRefresh, useSidebarState } from "react-admin";
import {
TextField,
Select,
@@ -9,7 +9,7 @@
SpeedDial,
SpeedDialAction,
useTheme,
- Snackbar,
+ Fab,
} from '@mui/material';
import {
MoreVert as MoreVertIcon,
@@ -19,20 +19,26 @@
Print as PrintIcon,
Share as ShareIcon,
} from '@mui/icons-material';
+import { MAP_MODE } from "./constants";
import Player from './player';
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
import Insight from "./insight";
import Device from "./Device";
import Settings from "./settings";
+import Batch from "./batch";
import * as Http from './http';
import WebSocketClient from './websocket'
+import ConfirmButton from "../page/components/ConfirmButton";
+import { FitScreen } from '@mui/icons-material';
+
let player;
let websocket;
const Map = () => {
const notify = useNotification();
+ const [sidebarOpen] = useSidebarState();
const translate = useTranslate();
const theme = useTheme();
const themeMode = theme.palette.mode;
@@ -42,13 +48,26 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = useState(MapMode.OBSERVER_MODE);
+ const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
+ const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = React.useRef();
+ const prevSpriteSettingsRef = useRef();
+ const [batchSprites, setBatchSprites] = useState([]);
+
+ const [curZone, setCurZone] = useState(() => {
+ const storedValue = localStorage.getItem('curZone');
+ return storedValue !== null ? JSON.parse(storedValue) : null;
+ });
+
+ const handleResize = () => {
+ const width = contentRef.current.offsetWidth;
+ const height = contentRef.current.offsetHeight;
+ player.resize(width, height);
+ };
useEffect(() => {
Tool.patchRaLayout('0px');
@@ -60,9 +79,16 @@
Tool.setMapContainer(player.mapContainer);
Tool.setThemeMode(themeMode);
Http.setNotify(notify);
+ Http.setMapContainer(player.mapContainer);
// websocket = new WebSocketClient('/ws/map/websocket');
- await Http.fetchMapData(0);
+ await Http.fetchMapData();
+
+ setTimeout(() => {
+ player.adaptScreen();
+ notify.info('Welcome to Rcs');
+ }, 200)
+
// websocket.connect();
// websocket.onMessage = (data) => {
// Tool.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
@@ -72,16 +98,8 @@
initialize();
// resize
- const handleResize = () => {
- const width = contentRef.current.offsetWidth;
- const height = contentRef.current.offsetHeight;
-
- player.resize(width, height);
- };
handleResize();
window.addEventListener('resize', handleResize);
-
- notify('Welcome to Rcs', 'info');
return () => {
if (websocket) {
@@ -92,6 +110,15 @@
window.removeEventListener('resize', handleResize);
Tool.patchRaLayout('');
};
+ }, [])
+
+ useEffect(() => {
+ setTimeout(handleResize, 300)
+ }, [sidebarOpen]);
+
+ useEffect(() => {
+ player.setTheme(themeMode);
+ Tool.setThemeMode(themeMode);
}, [themeMode])
const switchMode = (mode) => {
@@ -99,32 +126,41 @@
setDeviceVisible(false);
setSettingsVisible(false);
+ setBatchSelectionVisible(false);
setSpriteSettings(null);
+ setBatchSprites([]);
switch (mode) {
- case MapMode.OBSERVER_MODE:
+ case MAP_MODE.OBSERVER_MODE:
player.hideGridLines();
+ player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- console.log(selectedSprites);
+ setBatchSprites(selectedSprites);
});
break
- case MapMode.MOVABLE_MODE:
+ case MAP_MODE.MOVABLE_MODE:
player.showGridLines();
+ player.hideStarryBackground();
player.activateMapMultiSelect((selectedSprites, restartFn) => {
Tool.spriteListBeMovable(selectedSprites, () => {
restartFn();
});
});
+
+ mapContainer.children.forEach(child => {
+ Tool.beMovable(child);
+ })
break
- case MapMode.SETTINGS_MODE:
+ case MAP_MODE.SETTINGS_MODE:
player.hideGridLines();
+ player.showStarryBackground(); // 0x2f68ac
player.activateMapMultiSelect((selectedSprites, restartFn) => {
- console.log(selectedSprites);
+ setBatchSprites(selectedSprites);
});
mapContainer.children.forEach(child => {
@@ -171,6 +207,19 @@
}, [spriteSettings, mapContainer])
const prevSpriteSettings = prevSpriteSettingsRef.current;
+ // watch batchSprites
+ React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ if (batchSprites?.length > 0) {
+ setBatchSelectionVisible(true)
+ } else {
+ player.clearSelectedSprites();
+ setBatchSelectionVisible(false)
+ }
+ }, [batchSprites])
+
const actions = [
{ icon: <FileCopyIcon />, name: '澶嶅埗' },
{ icon: <SaveIcon />, name: '淇濆瓨' },
@@ -182,6 +231,7 @@
return (
<Box
sx={{
+ width: '100%',
height: '100%',
display: 'flex',
flexDirection: 'column',
@@ -192,12 +242,13 @@
sx={{
display: 'flex',
alignItems: 'center',
- backgroundColor: '#f5f5f5',
- color: '#000',
+ backgroundColor: theme.palette.background.default,
+ color: theme.palette.text.primary,
padding: '0 16px',
height: '64px',
flexShrink: 0, // keep height
- zIndex: 200
+ zIndex: 200,
+ boxShadow: theme.shadows[1],
}}
>
<TextField
@@ -206,33 +257,49 @@
placeholder="鎼滅储..."
sx={{
width: '200px',
- backgroundColor: '#fff',
+ backgroundColor: theme.palette.background.paper,
borderRadius: 1,
}}
/>
<Box sx={{ flexGrow: 1 }} />
- {mode === MapMode.OBSERVER_MODE && (
+ {mode === MAP_MODE.OBSERVER_MODE && (
<>
<Button
variant="contained"
color="primary"
- sx={{ mr: 1 }}
+ sx={{ mr: 2 }}
>
- 鍋滄RCS杩愯浆
+ {translate('page.map.action.startup')}
</Button>
- <Button variant="contained" color="secondary">
- 妯℃嫙AGV杩愯
+ <Button variant="contained" color="primary">
+ {translate('page.map.action.monitor')}
</Button>
</>
)}
- {mode === MapMode.MOVABLE_MODE && (
+ {mode === MAP_MODE.MOVABLE_MODE && (
<>
+ <Button
+ variant="outlined"
+ sx={{ mr: 2 }}
+ onClick={() => {
+ Tool.clearMapData();
+ }}
+ >
+ {translate('page.map.action.clear')}
+ </Button>
+ <ConfirmButton
+ label="page.map.action.save"
+ variant="contained"
+ sx={{ mr: 2 }}
+ onConfirm={() => {
+ Http.saveMapData(curZone);
+ }}
+ />
<Button
variant="contained"
color="primary"
- sx={{ mr: 1 }}
onClick={() => setDeviceVisible(!deviceVisible)}
>
{translate('page.map.devices.title')}
@@ -240,8 +307,24 @@
</>
)}
- {mode === MapMode.SETTINGS_MODE && (
+ {mode === MAP_MODE.SETTINGS_MODE && (
<>
+ <Button
+ variant="outlined"
+ sx={{ mr: 2 }}
+ onClick={() => {
+ Tool.clearMapData();
+ }}
+ >
+ {translate('page.map.action.clear')}
+ </Button>
+ <ConfirmButton
+ label="page.map.action.save"
+ variant="contained"
+ onConfirm={() => {
+ Http.saveMapData(curZone);
+ }}
+ />
</>
)}
@@ -254,13 +337,14 @@
size="small"
sx={{
ml: 2,
- backgroundColor: '#fff',
+ backgroundColor: theme.palette.background.paper,
+ color: theme.palette.text.primary,
borderRadius: 1,
}}
>
- <MenuItem value={MapMode.OBSERVER_MODE}>鐩戞帶妯″紡</MenuItem>
- <MenuItem value={MapMode.MOVABLE_MODE}>缂栬緫妯″紡</MenuItem>
- <MenuItem value={MapMode.SETTINGS_MODE}>閰嶇疆妯″紡</MenuItem>
+ <MenuItem value={MAP_MODE.OBSERVER_MODE}>{translate('page.map.mode.observer')}</MenuItem>
+ <MenuItem value={MAP_MODE.MOVABLE_MODE}>{translate('page.map.mode.movable')}</MenuItem>
+ <MenuItem value={MAP_MODE.SETTINGS_MODE}>{translate('page.map.mode.settings')}</MenuItem>
</Select>
</Box>
{/* content */}
@@ -290,7 +374,7 @@
}} />
</Box>
- <SpeedDial
+ {/* <SpeedDial
ariaLabel="SpeedDial 绀轰緥"
sx={{ position: 'absolute', bottom: 16, right: 16 }}
icon={<MoreVertIcon />}
@@ -302,7 +386,30 @@
tooltipTitle={action.name}
/>
))}
- </SpeedDial>
+ </SpeedDial> */}
+
+ <Box
+ sx={{
+ position: 'absolute',
+ left: 35,
+ bottom: 30,
+ display: 'flex',
+ flexDirection: 'column',
+ gap: 1
+ }}
+ >
+ <Fab
+ variant="extended"
+ color="primary"
+ size="medium"
+ onClick={() => {
+ player.adaptScreen();
+ }}
+ >
+ <FitScreen />
+ {translate('page.map.action.adapt')}
+ </Fab>
+ </Box>
</Box>
<Insight
@@ -329,6 +436,18 @@
setSettingsVisible(false);
}}
sprite={spriteSettings}
+ setSpriteSettings={setSpriteSettings}
+ width={570}
+ />
+
+ <Batch
+ open={batchSelectionVisible}
+ onCancel={() => {
+ setBatchSprites([]);
+ setBatchSelectionVisible(false);
+ }}
+ batchSprites={batchSprites}
+ mode={mode}
width={570}
/>
@@ -343,11 +462,5 @@
</NotificationProvider>
)
}
-
-export const MapMode = Object.freeze({
- OBSERVER_MODE: "1",
- MOVABLE_MODE: "2",
- SETTINGS_MODE: "3",
-})
export default MapPage;
--
Gitblit v1.9.1