From aa5a6f2751fdc6a8ebcb254fadf081cfe3ca0a54 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 28 三月 2024 15:11:21 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/index.jsx | 2 +-
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 2 +-
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 39 ++++++++++++++++++++++++++++++---------
3 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 1ffe3db..e1f0218 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -29,7 +29,7 @@
getContainer={props.refCurr}
rootStyle={{ position: "absolute" }}
mask={false}
- width={600}
+ width={900}
style={{
opacity: 1
}}
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
index 73293bc..02416bc 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -52,7 +52,7 @@
initScene = () => {
const scene = new THREE.Scene();
// scene.background = new THREE.Color(0xf0f0f0);
- // scene.background = new THREE.Color(0x333333);
+ scene.background = new THREE.Color(0x333333);
if (help) {
scene.add(new THREE.AxesHelper(1000));
}
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
index 93b021f..c23f742 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -9,11 +9,24 @@
const useStyles = createStyles(({ token, css }) => {
return {
+ infoBox: {
+ height: '100%',
+ display: 'flex',
+ gap: '0px',
+ },
+ threeInfo: {
+ height: '100%',
+ width: '50%',
+ },
threeContainer: {
zIndex: 99,
- width: '500px',
- height: '600px',
+ width: '100%',
+ height: '688.88px',
},
+ tableInfo: {
+ height: '100%',
+ width: '50%',
+ }
}
})
@@ -50,13 +63,21 @@
return (
<>
- <Spin
- spinning={loading}
- indicator={<LoadingOutlined spin />}
- size={'large'}
- >
- <div ref={refContainer} className={styles.threeContainer}></div>
- </Spin>
+ <div className={styles.infoBox}>
+ <div className={styles.threeInfo}>
+ <Spin
+ spinning={loading}
+ indicator={<LoadingOutlined spin />}
+ size={'large'}
+ >
+ <div ref={refContainer} className={styles.threeContainer}></div>
+ </Spin>
+ </div>
+ <div className={styles.tableInfo}>
+
+ </div>
+ </div>
+
</>
)
}
--
Gitblit v1.9.1