From bf616f97b4d1a96e0ee89c52178a88e044e52a1d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 10:40:24 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agv/AgvShow.jsx | 2 +-
zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx | 5 ++---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 9 ++++++++-
zy-acs-flow/src/page/agv/show/AgvShowAside.jsx | 3 +--
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvShow.jsx b/zy-acs-flow/src/page/agv/AgvShow.jsx
index ddf0801..0e0d751 100644
--- a/zy-acs-flow/src/page/agv/AgvShow.jsx
+++ b/zy-acs-flow/src/page/agv/AgvShow.jsx
@@ -68,7 +68,7 @@
}}
>
<TabbedShowLayout.Tab label="DETAIL">
- <AgvShowDetail />
+ <AgvShowDetail record={record} />
</TabbedShowLayout.Tab>
</TabbedShowLayout>
</CardContent>
diff --git a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
index 2fddc37..31fc068 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowAside.jsx
@@ -32,7 +32,6 @@
const record = useRecordContext();
if (!record) return null;
-
return (
<Box width={400} display={{ xs: 'none', lg: 'block' }}>
{record && (
@@ -49,7 +48,7 @@
<Typography variant="subtitle2" gutterBottom>
{translate('common.edit.side.title')}
</Typography>
- <Divider sx={{ mb: 1 }} />
+ <Divider sx={{ mb: 2 }} />
<Grid container rowSpacing={2} columnSpacing={1}>
<Grid item xs={12} display="flex" gap={1}>
<StatusField label="Status" />
diff --git a/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx b/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
index 78eae42..64c22a4 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
@@ -22,16 +22,15 @@
export const AgvShowDetail = (props) => {
- const { agvId, ...rest } = props;
+ const { record, ...rest } = props;
- const dataProvider = useDataProvider();
const [data, setData] = useState(null);
useEffect(() => {
}, []);
- if (!data) {
+ if (!record) {
return (
<Stack mt={0.5}>
{Array.from({ length: 5 }).map((_, index) => (
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 4a440a2..9043935 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -80,7 +80,14 @@
@PreAuthorize("hasAuthority('manager:agv:list')")
@GetMapping("/agv/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(agvService.getById(id));
+ Agv agv = agvService.getById(id);
+ if (null != agv) {
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ if (null != agvDetail) {
+ agv.setAgvDetail(agvDetail);
+ }
+ }
+ return R.ok().add(agv);
}
@PreAuthorize("hasAuthority('manager:agv:save')")
--
Gitblit v1.9.1