From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusPanel.jsx | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusPanel.jsx b/zy-acs-flow/src/page/bus/BusPanel.jsx
index 85e14d5..8ec27c4 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();
@@ -36,11 +37,11 @@
return (
<>
- <Card sx={{ maxWidth: '80%', margin: 'auto' }}>
+ <Card sx={{ maxWidth: '80%', margin: 'auto', mt: .5, mb: .5 }}>
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
- <Typography variant="h6" gutterBottom align="left" sx={{
+ <Typography variant="h5" gutterBottom align="left" sx={{
maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
whiteSpace: 'nowrap',
overflow: 'hidden',
@@ -49,7 +50,7 @@
{Common.camelToPascalWithSpaces(translate('table.field.bus.busNo'))}: {record.busNo}
</Typography>
{/* inherit, primary, secondary, textPrimary, textSecondary, error */}
- <Typography variant="h6" gutterBottom align="right" >
+ <Typography variant="h5" gutterBottom align="right" >
ID: {record.id}
</Typography>
</Grid>
@@ -61,7 +62,7 @@
</Typography>
</Grid>
</Grid>
- <Box height={20}> </Box>
+ <Box height={10}> </Box>
<Box>
<Table size="small">
<TableHead>
@@ -94,8 +95,9 @@
<TableRow key={task.id}>
<TableCell>
<Link to={`/task/${task.id}`}>
- {task.seqNum}
+
</Link>
+ {task.seqNum}
</TableCell>
<TableCellRight>
{task.taskType$}
@@ -104,10 +106,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}
--
Gitblit v1.9.1