From ae993a786017174d67f17071d2a8a176db6e60e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 14:33:01 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/index.jsx | 4 ++--
zy-acs-flow/src/map/insight/shelf/index.jsx | 16 +++++++++++-----
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/index.jsx b/zy-acs-flow/src/map/insight/index.jsx
index 57af9bb..48c10db 100644
--- a/zy-acs-flow/src/map/insight/index.jsx
+++ b/zy-acs-flow/src/map/insight/index.jsx
@@ -44,7 +44,7 @@
<CloseIcon />
</IconButton>
</Stack>
- <Box p={2}>
+ <Box p={2} pt={1}>
<Card sx={{
transition: '0.3s',
boxShadow: themeMode === 'light'
@@ -61,7 +61,7 @@
{deviceType === DEVICE_TYPE.SHELF && (
<>
<ShelfInsight
-
+ sprite={sprite}
/>
</>
)}
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index ac4d63d..e05fec1 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -14,7 +14,7 @@
import ShelfThree from './ShelfThree';
const ShelfMain = (props) => {
- const { data, curFloor, curLocNo, setCurLocNo } = props;
+ const { data, curLocNo, setCurLocNo } = props;
const translate = useTranslate();
const containerRef = useRef();
const [loading, setLoading] = useState(true);
diff --git a/zy-acs-flow/src/map/insight/shelf/index.jsx b/zy-acs-flow/src/map/insight/shelf/index.jsx
index fe7f02d..8652896 100644
--- a/zy-acs-flow/src/map/insight/shelf/index.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/index.jsx
@@ -2,14 +2,16 @@
import { useTranslate } from "react-admin";
import { Box, Typography, Tabs, Tab, Stack, useTheme, Divider } from '@mui/material';
import ShelfMain from './ShelfMain';
+import JsonShow from '../../JsonShow';
const ShelfInsight = (props) => {
- const { } = props;
+ const { sprite } = props;
const theme = useTheme();
const themeMode = theme.palette.mode;
const translate = useTranslate();
const [activeTab, setActiveTab] = useState(0);
+ const [curLocNo, setCurLocNo] = useState(null);
const handleTabChange = (event, newValue) => {
setActiveTab(newValue);
@@ -31,15 +33,19 @@
<Divider />
- <Box p={3}>
+ <Box pt={1}>
{activeTab === 0 && (
<ShelfMain
+ data={sprite?.data}
+ curLocNo={curLocNo}
+ setCurLocNo={setCurLocNo}
/>
)}
{activeTab === 1 && (
- <Box>
- <h1>2</h1>
- </Box>
+ <JsonShow
+ data={sprite?.data}
+ height={550}
+ />
)}
</Box>
</>
--
Gitblit v1.9.1