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/shelf/index.jsx |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/zy-acs-flow/src/map/insight/shelf/index.jsx b/zy-acs-flow/src/map/insight/shelf/index.jsx
index 75f55fd..7dd73bb 100644
--- a/zy-acs-flow/src/map/insight/shelf/index.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/index.jsx
@@ -1,21 +1,24 @@
 import React, { useState, useRef, useEffect } from 'react';
 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);
     };
 
     return (
-        <>
+        <Box sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
             <Tabs
                 value={activeTab}
                 onChange={handleTabChange}
@@ -30,19 +33,22 @@
 
             <Divider />
 
-            <Box p={3}>
+            <Box flex={1} pt={2}>
                 {activeTab === 0 && (
-                    <Box>
-                        <h1>1</h1>
-                    </Box>
+                    <ShelfMain
+                        data={sprite?.data}
+                        curLocNo={curLocNo}
+                        setCurLocNo={setCurLocNo}
+                    />
                 )}
                 {activeTab === 1 && (
-                    <Box>
-                        <h1>2</h1>
-                    </Box>
+                    <JsonShow
+                        data={sprite?.data}
+                        height={550}
+                    />
                 )}
             </Box>
-        </>
+        </Box>
     )
 }
 

--
Gitblit v1.9.1