From d8771a5d5afe1b5da6e6c3fece93db7892fc7bbf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 16:59:00 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx |   94 +++++++++++++++++++++++++++--------------------
 1 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 6a596e4..174e75b 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -96,6 +96,7 @@
             getLocGroup(data.row, data.bay, (response) => {
                 setInfo(response);
                 setCurLocNo(response[0]?.locNo);
+                setSelectedLoc(response[0]);
             });
         }
     }, [data]);
@@ -142,57 +143,70 @@
                 )}
             </Box>
             <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 />
+                <Paper elevation={3} style={{
+                    height: "100%",
+                    padding: '16px',
+                    display: 'flex',
+                    flexDirection: 'column',
+                    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>
+                            </Grid>
+
+                            <Grid item xs={12}>
+                                <Typography variant="subtitle1">
+                                    {translate('table.field.loc.zoneId')}
+                                </Typography>
+                                <Typography variant="body1">{info?.zoneId$}</Typography>
+                            </Grid>
+
+                            <Grid item xs={12}>
+                                <Typography variant="subtitle1">
+                                    {translate('table.field.loc.code')}
+                                </Typography>
+                                <Typography variant="body1">{info?.code$}</Typography>
+                            </Grid>
+                        </Grid>
+                    </Box>
+
                     <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>
-                        </Grid>
-                        <Grid item xs={12}>
-                            <Typography variant="subtitle1">
-                                {translate('table.field.loc.zoneId')}
-                            </Typography>
-                            <Typography variant="body1">{info?.zoneId$}</Typography>
-                        </Grid>
-                        <Grid item xs={12}>
-                            <Typography variant="subtitle1">
-                                {translate('table.field.loc.code')}
-                            </Typography>
-                            <Typography variant="body1">{info?.code$}</Typography>
-                        </Grid>
                         <Grid item xs={12}>
                             <Typography variant="subtitle1">
                                 {translate('common.field.opt')}
                             </Typography>
                             <Stack spacing={2} mt={2}>
                                 <Button variant="contained" color="error" fullWidth>
-                                    {translate('map.loc.lock')}
+                                    lock
                                 </Button>
                                 <Button variant="contained" disabled fullWidth>
-                                    {translate('map.loc.unlock')}
+                                    unlock
                                 </Button>
                                 <Button variant="contained" fullWidth>
-                                    {translate('map.loc.reset')}
+                                    reset
                                 </Button>
                             </Stack>
                         </Grid>

--
Gitblit v1.9.1