#

luxiaotao1123

2024-09-29 585b14712879ab9412b9749723819202093d2520

#

 zy-acs-flow/src/page/components/EmptyDataLoader.jsx

New file
@@ -0,0 +1,41 @@
import { LinearProgress, Stack, Typography } from '@mui/material';
import { CreateButton, useGetList } from 'react-admin';
import useAppBarHeight from './useAppBarHeight';
import { matchPath, useLocation } from 'react-router';
import { Link } from 'react-router-dom';

const EmptyDataLoader = ({ children }) => {
    const location = useLocation();
    const matchCreate = matchPath('/mission/create', location.pathname);
    const appBarHeight = useAppBarHeight();

    return (
        <Stack
            justifyContent="center"
            alignItems="center"
            gap={3}
            sx={{
                height: `calc(100dvh - ${appBarHeight}px)`,
            }}
        >
            <img src="/empty.svg" alt="No contacts found" />
            <Stack gap={0} alignItems="center">
                <Typography variant="h6" fontWeight="bold">
                    No data found
                </Typography>
                <Typography
                    variant="body2"
                    align="center"
                    color="text.secondary"
                    gutterBottom
                >
                    It seems your server data is empty.
                    <br />
                    {children}
                </Typography>
            </Stack>
        </Stack>
    );
};

export default EmptyDataLoader;

 zy-acs-flow/src/page/components/useAppBarHeight.js

New file
@@ -0,0 +1,12 @@
import { useMediaQuery, useTheme } from '@mui/material';

const DENSE_NAVBAR_HEIGHT = 48;
const DENSE_NAVBAR_HEIGHT_MOBILE = 64;

export default function useAppBarHeight() {
    const { breakpoints } = useTheme();
    const queryDesktop = breakpoints.up('sm');
    return useMediaQuery(queryDesktop)
        ? DENSE_NAVBAR_HEIGHT
        : DENSE_NAVBAR_HEIGHT_MOBILE;
}

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

File was deleted

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

@@ -39,9 +39,9 @@
import PageDrawer from "../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
// import { MissionEmpty } from "./MissionEmpty";
import MissionShow from "./MissionShow";
import { MissionListContent } from "./MissionListContent";
import EmptyDataLoader from "../components/EmptyDataLoader";

const MissionList = () => {

@@ -77,10 +77,17 @@
    if (!data?.length && !hasFilters) {
        return (
            <>
                {/* <MissionEmpty> */}
                <MissionShow open={!!matchShow} id={matchShow?.params.id} />
                {/* <DealArchivedList /> */}
                {/* </MissionEmpty> */}
                <EmptyDataLoader>
                    <Typography
                        variant="body2"
                        align="center"
                        color="text.secondary"
                        gutterBottom
                    >
                        sss
                    </Typography>
                    <MissionShow open={!!matchShow} id={matchShow?.params.id} />
                </EmptyDataLoader>
            </>
        );
    }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java

@@ -26,7 +26,7 @@
    @Override
    public List<MissionVo> getList(Long agvId, String groupNo) {
        List<MissionVo> result = new ArrayList<>();
        List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING, agvId, groupNo);
        List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.WAITING, agvId, groupNo);
        for (String runningGroupNo : runningGroupNos) {
            MissionVo vo = generate(runningGroupNo);
            if (null != vo) {