From 93c70c9d6eff93c62deacf4543c5e25b8ddf2947 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 07 十月 2024 10:13:10 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/mission/MissionResend.jsx | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/zy-acs-flow/src/page/mission/MissionResend.jsx b/zy-acs-flow/src/page/mission/MissionResend.jsx index 1d9518f..10b1a43 100644 --- a/zy-acs-flow/src/page/mission/MissionResend.jsx +++ b/zy-acs-flow/src/page/mission/MissionResend.jsx @@ -147,39 +147,40 @@ const headCells = [ { - id: 'name', + id: 'actionType', numeric: false, disablePadding: true, - label: 'Dessert聽(100g serving)', + label: 'table.field.action.actionType', }, { - id: 'calories', + id: 'code', numeric: true, disablePadding: false, - label: 'Calories', + label: 'table.field.action.code', }, { - id: 'fat', + id: 'taskId', numeric: true, disablePadding: false, - label: 'Fat聽(g)', + label: 'table.field.action.taskId', }, { - id: 'carbs', + id: 'val', numeric: true, disablePadding: false, - label: 'Carbs聽(g)', + label: 'table.field.action.val', }, { - id: 'protein', + id: 'params', numeric: true, disablePadding: false, - label: 'Protein聽(g)', + label: 'table.field.action.params', }, ]; const ActionTable = ({ actionIds }) => { const dataProvider = useDataProvider(); + const translate = useTranslate(); const [actions, setActions] = useState([]); const [selected, setSelected] = React.useState([]); @@ -225,12 +226,16 @@ return ( <> <Box sx={{ width: '100%' }}> - <Paper sx={{ width: '100%', mb: 2 }}> + <Paper sx={{ + width: '100%', + mb: 2, + }}> <Toolbar sx={[ { pl: { sm: 2 }, pr: { xs: 1, sm: 1 }, + minHeight: '52.5px !important', }, selected.length > 0 && { bgcolor: (theme) => @@ -250,7 +255,7 @@ ) : ( <Typography sx={{ flex: '1 1 100%' }} - variant="h6" + variant="subtitle1" id="tableTitle" component="div" > @@ -297,7 +302,7 @@ align={headCell.numeric ? 'right' : 'left'} padding={headCell.disablePadding ? 'none' : 'normal'} > - {headCell.label} + {translate(headCell.label)} </TableCell> ))} </TableRow> @@ -333,12 +338,14 @@ scope="row" padding="none" > - {row.name} + [ {row.priority} ] + + {row.actionType$} </TableCell> - <TableCell align="right">{row.calories}</TableCell> - <TableCell align="right">{row.fat}</TableCell> - <TableCell align="right">{row.carbs}</TableCell> - <TableCell align="right">{row.protein}</TableCell> + <TableCell align="right">{row.code}</TableCell> + <TableCell align="right">{row.taskId$}</TableCell> + <TableCell align="right">{row.val}</TableCell> + <TableCell align="right">{row.params}</TableCell> </TableRow> ); })} -- Gitblit v1.9.1