#

luxiaotao1123

2024-09-24 9f90ab48ee848a56f45c80e5d050676d4f3a6c2f

#

 version/v1.0.0.sql

New file
@@ -0,0 +1,3 @@
man_task_sts
add
20 CANCEL

 zy-acs-flow/src/page/task/TaskList.jsx

@@ -30,8 +30,10 @@
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
    FunctionField,
    Pagination,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { Box, Chip, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import TaskCreate from "./TaskCreate";
import TaskPanel from "./TaskPanel";
@@ -43,6 +45,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import TaskListAside from "./TaskListAside";
import { getTaskStsChipColor } from '@/utils/color-util';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -150,7 +153,8 @@
                        <MyExportButton />
                    </TopToolbar>
                )}
                perPage={DEFAULT_PAGE_SIZE}
                pagination={<Pagination rowsPerPageOptions={[10, 20, 50, 100]} />}
                perPage={20}
                aside={<TaskListAside />}
            >
                <StyledDatagrid
@@ -176,8 +180,20 @@
                    <ReferenceField source="taskType" label="table.field.task.taskType" reference="taskType" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
                    {/* <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField> */}
                    <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={true}>
                        <FunctionField render={record => (
                            <Chip
                                label={record.name}
                                variant="outlined"
                                size="small"
                                color={getTaskStsChipColor(record.name)}
                                sx={{ fontSize: '0.75rem' }}
                            />
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <NumberField source="priority" label="table.field.task.priority" />
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime />

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

@@ -18,6 +18,28 @@
    }
}

export const getTaskStsChipColor = (taskStatus) => {
    if (!taskStatus) {
        return 'default';
    }
    switch (taskStatus) {
        case '初始化':
            return 'info';
        case '等待中':
            return 'warning';
        case '已分配':
            return 'success';
        case '进行中':
            return 'primary';
        case '已完成':
            return 'default';
        case '已取消':
            return 'error';
        default:
            return 'default';
    }
}

export const getBusStsColor = (busStatus) => {
    if (!busStatus) {
        return 'default';

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java

@@ -17,6 +17,7 @@
    ASSIGN(3),
    PROGRESS(4),
    COMPLETE(5),
    CANCEL(6),
    ;

    public int dataSort;