From 558bda3d6bd3995409122463a0d8ce5250b6d211 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 14:55:27 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionCard.jsx | 54 +++++++++++++++++++++++++++++++++++++++++-------------
zy-acs-flow/src/page/mission/index.jsx | 2 ++
2 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionCard.jsx b/zy-acs-flow/src/page/mission/MissionCard.jsx
index dc0d9ab..62bb4d9 100644
--- a/zy-acs-flow/src/page/mission/MissionCard.jsx
+++ b/zy-acs-flow/src/page/mission/MissionCard.jsx
@@ -1,6 +1,7 @@
import { Draggable } from '@hello-pangea/dnd';
-import { Box, Card, Typography } from '@mui/material';
+import { Box, Card, Typography, Avatar, Divider } from '@mui/material';
import { ReferenceField, useRedirect } from 'react-admin';
+import { blueGrey } from '@mui/material/colors';
export const MissionCard = ({ mission, index }) => {
if (!mission) return null;
@@ -27,7 +28,7 @@
};
console.log(mission);
-
+
return (
<Box
@@ -44,20 +45,47 @@
}}
elevation={snapshot?.isDragging ? 3 : 1}
>
- <Box padding={1} display="flex">
- <ReferenceField
- source="company_id"
- record={mission}
- reference="companies"
- link={false}
- >
- </ReferenceField>
- <Box sx={{ marginLeft: 1 }}>
- <Typography variant="body2" gutterBottom>
+ <Box padding={1} display="flex" flexDirection="column">
+ <Box display="flex" flexDirection="row">
+ <Avatar
+ sx={{
+ '& img': { objectFit: 'contain' },
+ width: 20,
+ height: 20,
+ fontSize: '.8rem',
+ bgcolor: blueGrey[500]
+ }}
+ >
+ {mission.agv}
+ </Avatar>
+ <Divider />
+ <Typography variant="body2" >
{mission.groupNo}
</Typography>
+ </Box>
+
+ <Box sx={{ marginLeft: 1 }}>
+ <Typography variant="body2" gutterBottom>
+ groupNo {mission.groupNo}
+ </Typography>
<Typography variant="caption" color="textSecondary">
- {mission.posType}
+ posType {mission.posType}
+ </Typography>
+ </Box>
+ <Box sx={{ marginLeft: 1 }}>
+ <Typography variant="body2" gutterBottom>
+ taskNos {mission.taskNos}
+ </Typography>
+ <Typography variant="caption" color="textSecondary">
+ backpack{mission.backpack}
+ </Typography>
+ </Box>
+ <Box sx={{ marginLeft: 1 }}>
+ <Typography variant="body2" gutterBottom>
+ destCode {mission.destCode}
+ </Typography>
+ <Typography variant="caption" color="textSecondary">
+ agv {mission.agv}
</Typography>
</Box>
</Box>
diff --git a/zy-acs-flow/src/page/mission/index.jsx b/zy-acs-flow/src/page/mission/index.jsx
index c006e83..6e76fec 100644
--- a/zy-acs-flow/src/page/mission/index.jsx
+++ b/zy-acs-flow/src/page/mission/index.jsx
@@ -6,9 +6,11 @@
} from "react-admin";
import MissionList from "./MissionList";
+import MissionShow from "./MissionShow";
export default {
list: MissionList,
+ // show: MissionShow,
recordRepresentation: (record) => {
return `${record.name}`
}
--
Gitblit v1.9.1