From f52098060fcaf898deb02853da462a013c1e7ce5 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 21 九月 2024 14:33:55 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/agv/show/AgvShowTask.jsx | 58 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 16 deletions(-) diff --git a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx index b77cd65..391fc0c 100644 --- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx +++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx @@ -18,14 +18,14 @@ import { formatDistance } from 'date-fns'; import request from '@/utils/request'; -export const AgvShowTask = ({ agvId }) => { - +export const AgvShowTask = ({ agvId, pageSize = 20 }) => { + const [currCount, setCurrCount] = useState(pageSize); const [records, setRecords] = useState(null); const [total, setTotal] = useState(0); useEffect(() => { - const http = async (agvId) => { - const res = await request.post('task/page', { agvId: agvId }); + const http = async () => { + const res = await request.post('task/page', { agvId: agvId, pageSize: currCount }); const { code, msg, data } = res.data; if (code === 200) { setTotal(data.total); @@ -34,10 +34,8 @@ setRecords(null); } } - if (agvId) { - http(agvId); - } - }, [agvId]); + if (agvId) { http(); } + }, [agvId, currCount]); if (!records) { return ( @@ -64,17 +62,32 @@ ); } - return ( <> {records.length > 0 ? ( - records.map(record => { - return ( - <Typography> - {record.seqNum} - </Typography> - ) - }) + <Box> + {records.map(record => { + return ( + <TaskItem + key={record.id} + record={record} + /> + ) + })} + {currCount < total && ( + <Button + onClick={() => + setCurrCount( + currCount => + currCount + pageSize + ) + } + fullWidth + > + Load more activity + </Button> + )} + </Box> ) : ( <Typography> no data found @@ -83,4 +96,17 @@ </> ) +} + +const TaskItem = ({ record }) => { + + return ( + <> + <Typography + + > + {record.seqNum} + </Typography> + </> + ) } \ No newline at end of file -- Gitblit v1.9.1