#

luxiaotao1123

2024-09-25 7c1acb0aeed4a77dc475231782a90776d4d5a8f4

#

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

@@ -21,6 +21,7 @@
import PanelTypography from "../components/PanelTypography";
import * as Common from '@/utils/common';
import { styled } from '@mui/material/styles';
import { format } from 'date-fns';

const BusPanel = () => {
    const record = useRecordContext();
@@ -104,10 +105,10 @@
                                            {task.taskSts$}
                                        </TableCellRight>
                                        <TableCellRight>
                                            {task.agv$}
                                            {task.agvId$}
                                        </TableCellRight>
                                        <TableCellRight>
                                            {task.ioTime$}
                                            {format(new Date(task.ioTime), 'yyyy-MM-dd HH:mm:ss')}
                                        </TableCellRight>
                                        <TableCellRight>
                                            {task.oriDesc}

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

@@ -27,7 +27,7 @@
                            </Typography>
                            {/*  inherit, primary, secondary, textPrimary, textSecondary, error */}
                            <Typography variant="h6" gutterBottom align="right" >
                                ID: {record.id}
                                {Common.camelToPascalWithSpaces(translate('table.field.task.uuid'))}: {record.uuid}
                            </Typography>
                        </Grid>
                    </Grid>
@@ -40,12 +40,6 @@
                    </Grid>
                    <Box height={20}>&nbsp;</Box>
                    <Grid container spacing={2}>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.uuid" 
                                property={record.uuid}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.busId" 
@@ -66,8 +60,8 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.name" 
                                property={record.name}
                                title="table.field.task.agvId"
                                property={record.agvId$}
                            />
                        </Grid>
                        <Grid item xs={6}>
@@ -84,18 +78,6 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.agvId" 
                                property={record.agvId$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.ioTime" 
                                property={record.ioTime$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.startTime" 
                                property={record.startTime$}
                            />
@@ -108,44 +90,14 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.errTime" 
                                property={record.errTime$}
                                title="table.field.task.oriDesc"
                                property={record.oriDesc}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.oriSta" 
                                property={record.oriSta$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.oriLoc" 
                                property={record.oriLoc$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.oriCode" 
                                property={record.oriCode$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.destSta" 
                                property={record.destSta$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.destLoc" 
                                property={record.destLoc$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.destCode" 
                                property={record.destCode$}
                                title="table.field.task.destDesc"
                                property={record.destDesc}
                            />
                        </Grid>
                        <Grid item xs={6}>
@@ -162,12 +114,24 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.ioTime"
                                property={record.ioTime$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.phase" 
                                property={record.phase}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.errTime"
                                property={record.errTime$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.task.errDesc" 
                                property={record.errDesc}
                            />