From b5ea3e3d55760df55073f82eacb2dbcb7d3c448f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 16 十月 2024 16:43:11 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 68 +++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 22 deletions(-) diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx index 3e50bb9..6a596e4 100644 --- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx +++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx @@ -10,9 +10,13 @@ Button, Divider, Stack, + Card, + CardContent, } from '@mui/material'; import ShelfThree from './ShelfThree'; import { getLocGroup } from '../../http'; +import { grey } from '@mui/material/colors'; +import { styled } from '@mui/system'; let shelfThree; @@ -52,7 +56,6 @@ break; case '涓嶈鍒�': child.visible = item.locStsEl === 'STOCK' || item.locStsEl === 'PAKOUT'; - // child.visible = !['STOCK', 'IDLE'].includes(item.locStsEl); child.material.color.set(0xE8B67E); break; default: @@ -86,6 +89,7 @@ const containerRef = useRef(); const [loading, setLoading] = useState(true); const [info, setInfo] = useState(null); + const [selectedLoc, setSelectedLoc] = useState(null); useEffect(() => { if (data) { @@ -104,19 +108,24 @@ startThree(containerRef.current); shelfThree.handleClick = (objName) => { setCurLocNo(objName); + setSelectedLoc(info.find(loc => objName === loc.locNo)); }; renderThree(info, curLocNo); setLoading(false); - }, 200) + }, 300) } return endThree; }, [info]); + useEffect(() => { + console.log(selectedLoc); + }, [selectedLoc]) + return ( - <Box display="flex" height="500px"> + <Box display="flex" height="100%"> <Box position="relative" - width="60%" + width="50%" height="100%" ref={containerRef} style={{ backgroundColor: '#7a7a7a' }} @@ -128,52 +137,67 @@ left="50%" style={{ transform: 'translate(-50%, -50%)' }} > - <CircularProgress /> + <CircularProgress sx={{ color: grey[50] }} /> </Box> )} </Box> - <Box width="40%" height="100%" overflow="auto" p={2}> - {/* <Paper elevation={3} style={{ padding: '16px' }}> - <Typography variant="h6" gutterBottom> - {translate('map.loc.no', { defaultMessage: '搴撲綅鍙�' })}: {curLocNo} + <Box width="50%" height="100%" overflow="auto" pl={1}> + <Paper elevation={3} style={{ padding: '16px' }}> + <Typography + variant="subtitle1" + flexWrap="nowrap" + gutterBottom + > + {translate('table.field.loc.locNo')}: {curLocNo} </Typography> <Divider /> - <Grid container spacing={2} style={{ marginTop: '16px' }}> + <Grid container spacing={2} style={{ marginTop: '0px' }}> <Grid item xs={12}> - <Typography variant="subtitle1"> - {translate('map.loc.sts', { defaultMessage: '搴撲綅鐘舵��' })} - </Typography> - <Typography variant="body1">{info?.locSts}</Typography> + <Stack direction='row'> + <Typography + variant="body2" + flexWrap="nowrap" + > + {translate('table.field.loc.locSts')} + </Typography> + <Typography + variant="body2" + flexWrap="nowrap" + > + {selectedLoc?.locSts$} + </Typography> + </Stack> </Grid> <Grid item xs={12}> <Typography variant="subtitle1"> - {translate('map.pallet.barcode', { defaultMessage: '鎵樼洏鏉$爜' })} + {translate('table.field.loc.zoneId')} </Typography> - <Typography variant="body1">{info?.zpallet}</Typography> + <Typography variant="body1">{info?.zoneId$}</Typography> </Grid> <Grid item xs={12}> <Typography variant="subtitle1"> - {translate('map.is.enable', { defaultMessage: '鏄惁鍚敤' })} + {translate('table.field.loc.code')} </Typography> + <Typography variant="body1">{info?.code$}</Typography> </Grid> <Grid item xs={12}> <Typography variant="subtitle1"> - {translate('map.loc.operation', { defaultMessage: '搴撲綅鎿嶄綔' })} + {translate('common.field.opt')} </Typography> <Stack spacing={2} mt={2}> <Button variant="contained" color="error" fullWidth> - {translate('map.loc.lock', { defaultMessage: '閿佸畾' })} + {translate('map.loc.lock')} </Button> <Button variant="contained" disabled fullWidth> - {translate('map.loc.unlock', { defaultMessage: '瑙i攣' })} + {translate('map.loc.unlock')} </Button> <Button variant="contained" fullWidth> - {translate('map.loc.reset', { defaultMessage: '娓呴櫎搴撲綅' })} + {translate('map.loc.reset')} </Button> </Stack> </Grid> </Grid> - </Paper> */} + </Paper> </Box> </Box> ); -- Gitblit v1.9.1