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/BoolValueIcon.jsx | 13 ++++++
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 58 ++++++++++++++++++++--------
2 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/BoolValueIcon.jsx b/zy-acs-flow/src/map/insight/BoolValueIcon.jsx
new file mode 100644
index 0000000..1183b95
--- /dev/null
+++ b/zy-acs-flow/src/map/insight/BoolValueIcon.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { CheckCircle, Cancel } from '@mui/icons-material';
+import { green, red } from '@mui/material/colors';
+
+const BoolValueIcon = ({ value }) => {
+ return value ? (
+ <CheckCircle style={{ color: green[500] }} />
+ ) : (
+ <Cancel style={{ color: red[500] }} />
+ );
+};
+
+export default BoolValueIcon;
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index be7e735..6a596e4 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -10,10 +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;
@@ -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,6 +108,7 @@
startThree(containerRef.current);
shelfThree.handleClick = (objName) => {
setCurLocNo(objName);
+ setSelectedLoc(info.find(loc => objName === loc.locNo));
};
renderThree(info, curLocNo);
setLoading(false);
@@ -111,6 +116,10 @@
}
return endThree;
}, [info]);
+
+ useEffect(() => {
+ console.log(selectedLoc);
+ }, [selectedLoc])
return (
<Box display="flex" height="100%">
@@ -132,48 +141,63 @@
</Box>
)}
</Box>
- <Box width="50%" 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: '瑙ｉ攣' })}
+ {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