From 9f90ab48ee848a56f45c80e5d050676d4f3a6c2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 09:55:29 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/utils/color-util.js                                            |   22 ++++++++++++++++++++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java |    1 +
 version/v1.0.0.sql                                                             |    3 +++
 zy-acs-flow/src/page/task/TaskList.jsx                                         |   22 +++++++++++++++++++---
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/version/v1.0.0.sql b/version/v1.0.0.sql
new file mode 100644
index 0000000..4270439
--- /dev/null
+++ b/version/v1.0.0.sql
@@ -0,0 +1,3 @@
+man_task_sts
+add
+20 CANCEL
\ No newline at end of file
diff --git a/zy-acs-flow/src/page/task/TaskList.jsx b/zy-acs-flow/src/page/task/TaskList.jsx
index 3c8c15b..933bbd6 100644
--- a/zy-acs-flow/src/page/task/TaskList.jsx
+++ b/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 />
diff --git a/zy-acs-flow/src/utils/color-util.js b/zy-acs-flow/src/utils/color-util.js
index 3eaad52..47ecf12 100644
--- a/zy-acs-flow/src/utils/color-util.js
+++ b/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';
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java
index f9dd6b4..2296504 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskStsType.java
+++ b/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;

--
Gitblit v1.9.1