From f94994cc9b31934c9db5931af4c8ae46494396e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 14:50:17 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/index.jsx | 7 ++++++-
zy-asrs-flow/src/pages/map/drawer/shuttle/index.jsx | 2 ++
zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx | 10 +++++-----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 3ae3579..c005c2a 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -20,6 +20,9 @@
const { curSprite, curFloor } = props;
const [drawerTitle, setDrawerTitle] = useState('');
+ const [drawerWidth, setDrawerWidth] = useState(() => {
+ return window.innerWidth * 0.35;
+ })
useEffect(() => {
}, [props.curSprite]);
@@ -37,7 +40,7 @@
getContainer={props.refCurr}
rootStyle={{ position: "absolute" }}
mask={false}
- width={window.innerWidth * 0.35}
+ width={drawerWidth}
style={{
opacity: 1
}}
@@ -64,6 +67,7 @@
curSprite={curSprite}
curFloor={curFloor}
setDrawerTitle={setDrawerTitle}
+ setDrawerWidth={setDrawerWidth}
/>
</>
)}
@@ -82,6 +86,7 @@
curSprite={curSprite}
curFloor={curFloor}
setDrawerTitle={setDrawerTitle}
+ setDrawerWidth={setDrawerWidth}
/>
</>
)}
diff --git a/zy-asrs-flow/src/pages/map/drawer/shuttle/index.jsx b/zy-asrs-flow/src/pages/map/drawer/shuttle/index.jsx
index 472ee07..2c42c87 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shuttle/index.jsx
@@ -14,6 +14,8 @@
const [activeTabKey, setActiveTabKey] = useState('view');
const [curNo, setCurNo] = React.useState(''); // just used to modify the drawer title
+ props.setDrawerWidth(window.innerWidth * 0.4);
+
useEffect(() => {
if (!curSprite) {
return
diff --git a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
index b541637..36903e6 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx
@@ -65,7 +65,7 @@
title=''
size='middle' // default | middle | small
layout="vertical" // horizontal | vertical
- column={3}
+ column={4}
items={
[
{
@@ -147,11 +147,11 @@
key: '2',
label: intl.formatMessage({ id: 'map.pallet.barcode', defaultMessage: '鎵樼洏鏉＄爜' }),
children: '80000010',
- span: 1
},
{
key: '3',
label: intl.formatMessage({ id: 'map.is.enable', defaultMessage: '鏄惁鍚敤' }),
+ span: 2,
children: 'Disabled',
},
{
@@ -159,13 +159,13 @@
label: intl.formatMessage({ id: 'map.loc.operation', defaultMessage: '搴撲綅鎿嶄綔' }),
children: (
<>
- <Button className={styles.tableButton} size='large' type="primary" danger>
+ <Button className={styles.tableButton} size='default' type="primary" danger>
<FormattedMessage id='map.loc.lock' defaultMessage='閿佸畾' />
</Button>
- <Button className={styles.tableButton} size='large' disabled>
+ <Button className={styles.tableButton} size='default' disabled>
<FormattedMessage id='map.loc.unlock' defaultMessage='瑙ｉ攣' />
</Button>
- <Button className={styles.tableButton} size='large'>
+ <Button className={styles.tableButton} size='default'>
<FormattedMessage id='map.loc.reset' defaultMessage='娓呴櫎搴撲綅' />
</Button>
</>
--
Gitblit v1.9.1