#

luxiaotao1123

2024-09-27 3b010a80cfec8da203dfca3d0c5f0f11ef5957b3

#

 zy-acs-flow/src/i18n/en.js

@@ -594,6 +594,19 @@
                },
            },
        },
        mission: {
            enums: {
                posType: {
                    MOVE: 'Move',
                    ORI_LOC: 'Pick Loc',
                    ORI_STA: 'Pick Sta',
                    DEST_LOC: 'Drop Loc',
                    DEST_STA: 'Drop Sta',
                    TO_CHARGE: 'Go To Charge',
                    TO_STANDBY: 'Return To Standby',
                }
            }
        },
    }
};


 zy-acs-flow/src/i18n/zh.js

@@ -593,6 +593,19 @@
                },
            },
        },
        mission: {
            enums: {
                posType: {
                    MOVE: '走行',
                    ORI_LOC: '货架取货',
                    ORI_STA: '站点取货',
                    DEST_LOC: '货架放货',
                    DEST_STA: '站点放货',
                    TO_CHARGE: '去充电',
                    TO_STANDBY: '回待机点',
                }
            }
        },
    }
};


 zy-acs-flow/src/page/mission/MissionCard.jsx

@@ -2,6 +2,7 @@
import { Box, Card, Typography, Avatar, Divider, Stack, Slider } from '@mui/material';
import { ReferenceField, useRedirect } from 'react-admin';
import { blueGrey } from '@mui/material/colors';
import { styled } from '@mui/material/styles';

export const MissionCard = ({ mission, index }) => {
    if (!mission) return null;
@@ -52,18 +53,18 @@
                            sx={{
                                width: 30,
                                height: 30,
                                // bgcolor: blueGrey[500],
                                bgcolor: blueGrey[500],
                            }}
                        >
                            {mission.agv}
                        </Avatar>
                        <Divider orientation="vertical" flexItem sx={{ margin: '0 8px' }} />
                        <Typography variant="h6" noWrap>
                        <Typography variant="body1" noWrap>
                            {mission.groupNo}
                        </Typography>
                    </Box>
                    <Box sx={{}}>
                        <Stack direction="row" justifyContent="space-between">
                    <Box>
                        <Stack direction="row" justifyContent="space-between" mb={1}>
                            <Typography variant="caption" color="textSecondary">
                                Backpack: {mission.backpack}
                            </Typography>
@@ -71,13 +72,24 @@
                                Code: {mission.destCode}
                            </Typography>
                        </Stack>
                        <Stack direction="row" justifyContent="space-between">

                        <Stack direction="row" justifyContent="space-between" mb={1}>
                            <Typography variant="overline">
                                Task: [{mission.taskNos.join(',')}]
                            </Typography>
                        </Stack>
                        <Stack direction="row">
                            <Slider />

                        <Stack pl={1} pr={1} direction="row" spacing={1} alignItems="center">
                            <Slider
                                aria-label="Temperature"
                                defaultValue={mission.progress}
                                getAriaValueText={(value) => {
                                    return `${value}°C`;
                                }}
                                color="secondary"
                                size="small"
                                marks
                            />
                        </Stack>
                    </Box>
                </Box>

 zy-acs-flow/src/page/mission/MissionColumn.jsx

@@ -1,9 +1,12 @@
import { Droppable } from '@hello-pangea/dnd';
import { Box, Stack, Typography } from '@mui/material';

import {
    useTranslate,
} from 'react-admin';
import { MissionCard } from './MissionCard';

export const MissionColumn = ({ stage, missions, }) => {
    const translate = useTranslate();

    return (
        <Box
@@ -23,8 +26,10 @@
            }}
        >
            <Stack alignItems="center">
                <Typography variant="subtitle1">
                    {stage}
                <Typography variant="body1" sx={{
                    // fontWeight: 'bold'
                }}>
                    {translate(`page.mission.enums.posType.${stage}`)}
                </Typography>
                <Typography
                    variant="subtitle1"

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java

@@ -25,4 +25,6 @@

    private String destCode;

    private String progress = "50";

}