#

luxiaotao1123

2024-09-23 43f2fe7fa6ec90b957d3182730e5c726b7158ced

#

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

@@ -427,7 +427,7 @@
                busSts: "bus status",
                phase: "phase",
                taskList: "task list",
                tasksNum: "number of tasks",
                tasksNum: "tasks number",
            },
            task: {
                uuid: "uuid",

 zy-acs-flow/src/page/agv/show/AgvShowTask.jsx

@@ -23,7 +23,7 @@
import { formatDistance } from 'date-fns';
import request from '@/utils/request';
import { useTheme } from '@mui/material/styles';
import { getTaskStsColor } from '@/utils/common';
import { getTaskStsColor } from '@/utils/color-util';
import ListEmptyTip from "../../components/ListEmptyTip";

const TaskItem = ({ record, now }) => {

 zy-acs-flow/src/page/bus/BusList.jsx

@@ -30,8 +30,9 @@
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
    FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { Box, Typography, Card, Chip } from '@mui/material';
import { styled } from '@mui/material/styles';
import BusCreate from "./BusCreate";
import BusPanel from "./BusPanel";
@@ -43,6 +44,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import * as Common from '@/utils/common';
import BusListAside from "./BusListAside";
import { getBusStsColor } from '@/utils/color-util';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -70,18 +72,14 @@

const filters = [
    // <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    // <TextInput source="uuid" label="table.field.bus.uuid" />,
    <TextInput source="busNo" label="table.field.bus.busNo" alwaysOn resettable />,
    <DateInput source="startTime" label="table.field.bus.startTime" />,
    <DateInput source="endTime" label="table.field.bus.endTime" />,
    // <DateInput source="startTime" label="table.field.bus.startTime" />,
    // <DateInput source="endTime" label="table.field.bus.endTime" />,
    <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts" alwaysOn>
        <AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
    <TextInput source="phase" label="table.field.bus.phase" />,

    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput
        label="common.field.status"
@@ -123,12 +121,12 @@
                    </TopToolbar>
                )}
                perPage={25}
                aside={<BusListAside />}
            // aside={<BusListAside />}
            >
                <StyledDatagrid
                    preferenceKey='bus'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    bulkActionButtons={false}
                    rowClick={'expand'}
                    expand={() => <BusPanel />}
                    expandSingle={true}
                    omit={['id', 'uuid', 'phase', 'updateBy', 'updateTime', 'createTime', 'createBy']}
@@ -137,11 +135,20 @@
                    <TextField source="uuid" label="table.field.bus.uuid" />
                    <TextField source="busNo" label="table.field.bus.busNo" />
                    <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
                        <TextField source="name" />
                        <FunctionField render={record => (
                            <Chip
                                label={record.name}
                                variant="outlined"
                                size="small"
                                color={getBusStsColor(record.name)}
                                sx={{ fontSize: '0.75rem' }}
                            />
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
                    <DateField source="startTime" label="table.field.bus.startTime" showTime />
                    <DateField source="endTime" label="table.field.bus.endTime" showTime />
                    <DateField source="endTime" label="table.field.bus.endTime" showTime emptyText="-" />
                    <TextField source="phase" label="table.field.bus.phase" sortable={false} />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
@@ -153,7 +160,7 @@
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} emptyText="-" />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />

 zy-acs-flow/src/page/bus/BusPanel.jsx

@@ -36,7 +36,7 @@

    return (
        <>
            <Card sx={{ maxWidth: '80%', margin: 'auto' }}>
            <Card sx={{ maxWidth: '80%', margin: 'auto', mt: .5, mb: .5 }}>
                <CardContent>
                    <Grid container spacing={2}>
                        <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>

 zy-acs-flow/src/utils/color-util.js

New file
@@ -0,0 +1,37 @@
import * as Colors from '@mui/material/colors';

export const getTaskStsColor = (taskStatus) => {
    if (!taskStatus) {
        return Colors.grey[500];
    }
    switch (taskStatus) {
        case '等待中':
            return Colors.deepPurple[500];
        case '已分配':
            return Colors.lightBlue[600];
        case '进行中':
            return Colors.teal[700];
        case '已完成':
            return Colors.blueGrey[500];
        default:
            return Colors.amber[500];
    }
}

export const getBusStsColor = (busStatus) => {
    if (!busStatus) {
        return 'default';
    }
    switch (busStatus) {
        case '已接收':
            return 'secondary';
        case '进行中':
            return 'success';
        case '已完成':
            return 'default';
        case '已取消':
            return 'error';
        default:
            return 'default';
    }
}

 zy-acs-flow/src/utils/common.js

@@ -1,4 +1,3 @@
import * as Colors from '@mui/material/colors';

export const extractNavMenus = (data) => {
    if (!data) {
@@ -51,21 +50,3 @@
    });
    return result;
};

export const getTaskStsColor = (taskStatus) => {
    if (!taskStatus) {
        return Colors.grey[500];
    }
    switch (taskStatus) {
        case '等待中':
            return Colors.deepPurple[500];
        case '已分配':
            return Colors.lightBlue[600];
        case '进行中':
            return Colors.teal[700];
        case '已完成':
            return Colors.blueGrey[500];
        default:
            return Colors.amber[500];
    }
}

 zy-acs-framework/src/main/resources/templates/react-admin/ReactCreate.txt

@@ -48,8 +48,8 @@
        notify('common.response.success');
    };

    const handleError = async (data) => {
        notify('common.response.fail');
    const handleError = async (error) => {
        notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
    };

    return (

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/BusController.java

@@ -50,6 +50,7 @@
            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBusId, record.getId()));
            if (!Cools.isEmpty(tasks)) {
                record.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
                record.setTasksNum(tasks.size());
            }
        }
        return R.ok().add(page);