From 0f27101ca5f012db03af7fb50de28c22029cfc24 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 22 四月 2025 08:20:23 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/mission/MissionCard.jsx |    5 +++--
 zy-acs-flow/src/page/segment/SegmentList.jsx |   52 ++++++++++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/zy-acs-flow/src/page/mission/MissionCard.jsx b/zy-acs-flow/src/page/mission/MissionCard.jsx
index 0fc1c16..99bbe5f 100644
--- a/zy-acs-flow/src/page/mission/MissionCard.jsx
+++ b/zy-acs-flow/src/page/mission/MissionCard.jsx
@@ -61,10 +61,11 @@
                     <Box display="flex" alignItems="center" mb={1.5}>
                         <Avatar
                             sx={{
-                                width: 30,
-                                height: 30,
+                                width: 40,
+                                height: 28,
                                 bgcolor: theme.palette.primary.main,
                             }}
+                            variant="rounded"
                         >
                             {mission.agv}
                         </Avatar>
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index 2a25722..43b51fd 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -58,7 +58,7 @@
     '& .column-name': {
     },
     '& .opt': {
-        width: 120
+        width: 130
     },
 }));
 
@@ -260,29 +260,33 @@
                                     <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} />
-                                    {(filterValues.state === 'WAITING' || filterValues.state === 'RUNNING') && (
-                                        <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
-                                            <>
-                                                <ConfirmButton
-                                                    label="common.action.deprecate"
-                                                    size="small"
-                                                    color="error"
-                                                    startIcon={<ClearIcon />}
-                                                    sx={{
-                                                        padding: '1px',
-                                                        fontSize: '.75rem',
-                                                        '& .MuiButton-startIcon': {
-                                                            marginRight: '2px'
-                                                        },
-                                                    }}
-                                                    data={record.id}
-                                                    onConfirm={() => {
-                                                        handleDeprecate(record.id);
-                                                    }}
-                                                />
-                                            </>
-                                        )} />
-                                    )}
+                                    {(
+                                        filterValues.state === 'INIT'
+                                        || filterValues.state === 'WAITING'
+                                        || filterValues.state === 'RUNNING'
+                                    ) && (
+                                            <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
+                                                <>
+                                                    <ConfirmButton
+                                                        label="common.action.deprecate"
+                                                        size="small"
+                                                        color="inherit"
+                                                        startIcon={<ClearIcon />}
+                                                        sx={{
+                                                            padding: '1px',
+                                                            fontSize: '.75rem',
+                                                            '& .MuiButton-startIcon': {
+                                                                marginRight: '2px'
+                                                            },
+                                                        }}
+                                                        data={record.id}
+                                                        onConfirm={() => {
+                                                            handleDeprecate(record.id);
+                                                        }}
+                                                    />
+                                                </>
+                                            )} />
+                                        )}
                                 </StyledDatagrid>
                             </>
                         )}

--
Gitblit v1.9.1