From 7c1acb0aeed4a77dc475231782a90776d4d5a8f4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 25 九月 2024 12:50:09 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusPanel.jsx | 5 +-
zy-acs-flow/src/page/task/TaskPanel.jsx | 106 +++++++++++++++++-----------------------------------
2 files changed, 38 insertions(+), 73 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusPanel.jsx b/zy-acs-flow/src/page/bus/BusPanel.jsx
index 6cee8d5..87c6b9c 100644
--- a/zy-acs-flow/src/page/bus/BusPanel.jsx
+++ b/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}
diff --git a/zy-acs-flow/src/page/task/TaskPanel.jsx b/zy-acs-flow/src/page/task/TaskPanel.jsx
index 76fb98b..f7ffedc 100644
--- a/zy-acs-flow/src/page/task/TaskPanel.jsx
+++ b/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>
@@ -42,133 +42,97 @@
<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"
+ title="table.field.task.busId"
property={record.busId$}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.seqNum"
+ title="table.field.task.seqNum"
property={record.seqNum}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.priority"
+ title="table.field.task.priority"
property={record.priority}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.name"
- property={record.name}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.taskSts"
- property={record.taskSts$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.taskType"
- property={record.taskType$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.agvId"
+ title="table.field.task.agvId"
property={record.agvId$}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.ioTime"
- property={record.ioTime$}
+ title="table.field.task.taskSts"
+ property={record.taskSts$}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.startTime"
+ title="table.field.task.taskType"
+ property={record.taskType$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.task.startTime"
property={record.startTime$}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.endTime"
+ title="table.field.task.endTime"
property={record.endTime$}
/>
</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$}
+ title="table.field.task.destDesc"
+ property={record.destDesc}
/>
</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$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.emptyMk"
+ title="table.field.task.emptyMk"
property={record.emptyMk}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.zpallet"
+ title="table.field.task.zpallet"
property={record.zpallet}
/>
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.task.phase"
+ 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.errDesc"
+ title="table.field.task.errTime"
+ property={record.errTime$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.task.errDesc"
property={record.errDesc}
/>
</Grid>
--
Gitblit v1.9.1