#
luxiaotao1123
2024-10-14 38578d68f539eddfad245cdf2514aa312bef0560
#
3个文件已修改
1个文件已添加
64 ■■■■ 已修改文件
zy-acs-flow/src/map/MapPage.jsx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/batch/BatchSettings.jsx 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/batch/index.jsx 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/constants.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/MapPage.jsx
@@ -19,6 +19,7 @@
    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';
@@ -47,7 +48,7 @@
    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);
@@ -131,7 +132,7 @@
        setBatchSprites([]);
        switch (mode) {
            case MapMode.OBSERVER_MODE:
            case MAP_MODE.OBSERVER_MODE:
                player.hideGridLines();
                player.hideStarryBackground();
@@ -140,7 +141,7 @@
                });
                break
            case MapMode.MOVABLE_MODE:
            case MAP_MODE.MOVABLE_MODE:
                player.showGridLines();
                player.hideStarryBackground();
@@ -154,7 +155,7 @@
                    Tool.beMovable(child);
                })
                break
            case MapMode.SETTINGS_MODE:
            case MAP_MODE.SETTINGS_MODE:
                player.hideGridLines();
                player.showStarryBackground(); // 0x2f68ac
@@ -261,7 +262,7 @@
                />
                <Box sx={{ flexGrow: 1 }} />
                {mode === MapMode.OBSERVER_MODE && (
                {mode === MAP_MODE.OBSERVER_MODE && (
                    <>
                        <Button
                            variant="contained"
@@ -276,7 +277,7 @@
                    </>
                )}
                {mode === MapMode.MOVABLE_MODE && (
                {mode === MAP_MODE.MOVABLE_MODE && (
                    <>
                        <Button
                            variant="outlined"
@@ -306,7 +307,7 @@
                    </>
                )}
                {mode === MapMode.SETTINGS_MODE && (
                {mode === MAP_MODE.SETTINGS_MODE && (
                    <>
                        <Button
                            variant="outlined"
@@ -340,9 +341,9 @@
                        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}>监控模式</MenuItem>
                    <MenuItem value={MAP_MODE.MOVABLE_MODE}>编辑模式</MenuItem>
                    <MenuItem value={MAP_MODE.SETTINGS_MODE}>配置模式</MenuItem>
                </Select>
            </Box>
            {/* content */}
@@ -443,6 +444,8 @@
                onCancel={() => {
                    setBatchSelectionVisible(false);
                }}
                batchSprites={batchSprites}
                mode={mode}
                width={570}
            />
@@ -457,11 +460,5 @@
        </NotificationProvider>
    )
}
export const MapMode = Object.freeze({
    OBSERVER_MODE: "1",
    MOVABLE_MODE: "2",
    SETTINGS_MODE: "3",
})
export default MapPage;
zy-acs-flow/src/map/batch/BatchSettings.jsx
New file
@@ -0,0 +1,11 @@
const BatchSettings = () => {
    return (
        <>
            <h1>s</h1>
        </>
    )
}
export default BatchSettings;
zy-acs-flow/src/map/batch/index.jsx
@@ -3,9 +3,11 @@
import { Drawer, Box, Typography, Tabs, Tab, IconButton, Stack, useTheme, Card, CardContent, Divider } from '@mui/material';
import CloseIcon from '@mui/icons-material/Close';
import { PAGE_DRAWER_WIDTH } from '@/config/setting';
import { MAP_MODE } from "../constants";
import BatchSettings from './BatchSettings';
const Batch = (props) => {
    const { open, onCancel, sprite, width = PAGE_DRAWER_WIDTH, title } = props;
    const { open, onCancel, mode, batchSprites, width = PAGE_DRAWER_WIDTH } = props;
    const theme = useTheme();
    const themeMode = theme.palette.mode;
    const translate = useTranslate();
@@ -31,13 +33,25 @@
                    }}>
                        <Stack direction="row" p={2}>
                            <Typography variant="h6" flex="1">
                                {title || translate('page.map.settings.title')}
                                {batchSprites?.length || 0} items {translate('common.action.selected')}
                            </Typography>
                            <IconButton onClick={handleClose} size="small">
                                <CloseIcon />
                            </IconButton>
                        </Stack>
                        <Box p={3}>
                            {mode === MAP_MODE.OBSERVER_MODE && (
                                <>
                                </>
                            )}
                            {mode === MAP_MODE.SETTINGS_MODE && (
                                <>
                                    <BatchSettings
                                    />
                                </>
                            )}
                        </Box>
                    </Box>
                )}
zy-acs-flow/src/map/constants.js
@@ -1,5 +1,11 @@
export const MAP_MODE = Object.freeze({
    OBSERVER_MODE: "1",
    MOVABLE_MODE: "2",
    SETTINGS_MODE: "3",
})
export const DEVICE_TYPE = Object.freeze({
    SHELF: "SHELF",
    STATION: 'STATION',