From dc31d8c4e1e45d6f932050a0da4e18a09d8dfd07 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 15:55:27 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/index.jsx | 7 ++++---
zy-acs-flow/src/map/insight/shelf/ShelfThree.js | 4 ++--
zy-acs-flow/src/map/insight/shelf/index.jsx | 6 +++---
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 12 ++++++------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/index.jsx b/zy-acs-flow/src/map/insight/index.jsx
index 48c10db..a601a51 100644
--- a/zy-acs-flow/src/map/insight/index.jsx
+++ b/zy-acs-flow/src/map/insight/index.jsx
@@ -34,7 +34,7 @@
sx={{ zIndex: 100, opacity: 1 }}
>
{open && (
- <Box pt={12} width={{ xs: '100vW', sm: width }} height={'calc(100vh - 200px);'} mt={{ xs: 2, sm: 1 }} sx={{
+ <Box pt={12} width={{ xs: '100vW', sm: width }} height={'calc(100vh - 100px);'} mt={{ xs: 2, sm: 1 }} sx={{
}}>
<Stack direction="row" p={2}>
<Typography variant="h6" flex="1">
@@ -44,8 +44,9 @@
<CloseIcon />
</IconButton>
</Stack>
- <Box p={2} pt={1}>
+ <Box p={2} pt={1} height='100%'>
<Card sx={{
+ height: '100%',
transition: '0.3s',
boxShadow: themeMode === 'light'
? '0px 2px 8px rgba(0, 0, 0, 0.1)'
@@ -57,7 +58,7 @@
},
borderRadius: '8px',
}}>
- <CardContent>
+ <CardContent sx={{ height: '100%' }}>
{deviceType === DEVICE_TYPE.SHELF && (
<>
<ShelfInsight
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 3e50bb9..be7e735 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -13,6 +13,7 @@
} from '@mui/material';
import ShelfThree from './ShelfThree';
import { getLocGroup } from '../../http';
+import { grey } from '@mui/material/colors';
let shelfThree;
@@ -52,7 +53,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:
@@ -107,16 +107,16 @@
};
renderThree(info, curLocNo);
setLoading(false);
- }, 200)
+ }, 300)
}
return endThree;
}, [info]);
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,11 +128,11 @@
left="50%"
style={{ transform: 'translate(-50%, -50%)' }}
>
- <CircularProgress />
+ <CircularProgress sx={{ color: grey[50] }} />
</Box>
)}
</Box>
- <Box width="40%" height="100%" overflow="auto" p={2}>
+ <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}
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfThree.js b/zy-acs-flow/src/map/insight/shelf/ShelfThree.js
index 1bb5f34..01b60c0 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfThree.js
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfThree.js
@@ -57,8 +57,8 @@
}
addObject = (object) => {
- this.scene.add(object);
- this.objects.push(object);
+ this.scene?.add(object);
+ this.objects?.push(object);
}
initScene = () => {
diff --git a/zy-acs-flow/src/map/insight/shelf/index.jsx b/zy-acs-flow/src/map/insight/shelf/index.jsx
index 8652896..7dd73bb 100644
--- a/zy-acs-flow/src/map/insight/shelf/index.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/index.jsx
@@ -18,7 +18,7 @@
};
return (
- <>
+ <Box sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
<Tabs
value={activeTab}
onChange={handleTabChange}
@@ -33,7 +33,7 @@
<Divider />
- <Box pt={1}>
+ <Box flex={1} pt={2}>
{activeTab === 0 && (
<ShelfMain
data={sprite?.data}
@@ -48,7 +48,7 @@
/>
)}
</Box>
- </>
+ </Box>
)
}
--
Gitblit v1.9.1