From c3af288c53805cc1b08516cf2f47dcf75f30f67a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 13:53:34 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agv/AgvShow.jsx | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvShow.jsx b/zy-acs-flow/src/page/agv/AgvShow.jsx
index 0e0d751..4b56b66 100644
--- a/zy-acs-flow/src/page/agv/AgvShow.jsx
+++ b/zy-acs-flow/src/page/agv/AgvShow.jsx
@@ -1,25 +1,14 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
- RecordContextProvider,
- ReferenceManyField,
ShowBase,
- SortButton,
TabbedShowLayout,
- useListContext,
- useRecordContext,
useShowContext,
} from 'react-admin';
-import { Link as RouterLink, useLocation } from 'react-router-dom';
import {
Box,
Button,
Card,
CardContent,
- List,
- ListItem,
- ListItemAvatar,
- ListItemSecondaryAction,
- ListItemText,
Stack,
Typography,
Avatar,
@@ -27,6 +16,7 @@
import { formatDistance } from 'date-fns';
import { AgvShowDetail } from "./show/AgvShowDetail";
import { AgvShowAside } from "./show/AgvShowAside";
+import { AgvShowTask } from "./show/AgvShowTask";
import CustomerTopToolBar from "../components/EditTopToolBar";
import { useTheme } from '@mui/material/styles';
@@ -57,8 +47,19 @@
alignItems: 'center',
}}>
<CustomerTopToolBar />
- <Box mt={1}>
- <Avatar sx={{ bgcolor: theme.palette.primary.main }}>{record.uuid}</Avatar>
+ <Box mt={1} mr={1}>
+ <Stack direction='row'>
+ <Typography
+ variant="h5"
+ sx={{
+ mt: .5,
+ mr: 2
+ }}
+ >
+ {record.agvModelData?.type}
+ </Typography>
+ <Avatar sx={{ bgcolor: theme.palette.primary.main }}>{record.uuid}</Avatar>
+ </Stack>
</Box>
</Box>
@@ -67,8 +68,11 @@
'& .RaTabbedShowLayout-content': { p: 0 },
}}
>
- <TabbedShowLayout.Tab label="DETAIL">
- <AgvShowDetail record={record} />
+ <TabbedShowLayout.Tab label="page.agv.show.tabs.detail">
+ <AgvShowDetail agvId={record.id} />
+ </TabbedShowLayout.Tab>
+ <TabbedShowLayout.Tab label="page.agv.show.tabs.task">
+ <AgvShowTask agvId={record.id} />
</TabbedShowLayout.Tab>
</TabbedShowLayout>
</CardContent>
--
Gitblit v1.9.1