From bb9d9aaf8fac5bc19ee325ad322baf59af9aafa6 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 16 十月 2024 17:06:24 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 57 +++++++++++++++++++++++++++------------------------------ 1 files changed, 27 insertions(+), 30 deletions(-) diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx index 174e75b..035ab25 100644 --- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx +++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx @@ -151,44 +151,21 @@ justifyContent: 'space-between', }}> <Box> - <Typography - variant="subtitle1" - flexWrap="nowrap" - gutterBottom - > - {translate('table.field.loc.locNo')}: {curLocNo} - </Typography> - <Divider /> <Grid container spacing={2} style={{ marginTop: '0px' }}> <Grid item xs={12}> - <Stack direction='row'> - <Typography - variant="body2" - flexWrap="nowrap" - > - {translate('table.field.loc.locSts')}: - </Typography> - <Typography - variant="body2" - flexWrap="nowrap" - > - {selectedLoc?.locSts$} - </Typography> - </Stack> + <KeyValuePair label={translate('table.field.loc.locNo')} value={selectedLoc?.locNo || 'N/A'} /> </Grid> <Grid item xs={12}> - <Typography variant="subtitle1"> - {translate('table.field.loc.zoneId')} - </Typography> - <Typography variant="body1">{info?.zoneId$}</Typography> + <KeyValuePair label={translate('table.field.loc.locSts')} value={selectedLoc?.locSts$ || 'N/A'} /> </Grid> <Grid item xs={12}> - <Typography variant="subtitle1"> - {translate('table.field.loc.code')} - </Typography> - <Typography variant="body1">{info?.code$}</Typography> + <KeyValuePair label={translate('table.field.loc.zoneId')} value={selectedLoc?.zoneId$ || 'N/A'} /> + </Grid> + + <Grid item xs={12}> + <KeyValuePair label={translate('table.field.loc.code')} value={selectedLoc?.code$ || 'N/A'} /> </Grid> </Grid> </Box> @@ -217,4 +194,24 @@ ); }; +const KeyValuePair = ({ label, value }) => ( + <> + <Stack direction="row" alignItems="center" spacing={1} sx={{ mb: 1 }}> + <Typography + variant="body2" + sx={{ width: '80px', fontWeight: 'bold', color: 'text.secondary', textAlign: 'left' }} + > + {label}: + </Typography> + <Typography + variant="body2" + sx={{ flexGrow: 1, color: 'text.primary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }} + > + {value} + </Typography> + </Stack> + <Divider /> + </> +); + export default ShelfMain; -- Gitblit v1.9.1