From a49392a9a482bb5e3097f344723e5cdd6c587bbe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 三月 2024 13:18:50 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/index.jsx | 2
zy-asrs-flow/src/locales/en-US/map.ts | 6 +++
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 6 ++
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 49 ++++++------------------
4 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 3d92217..1d52a38 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -11,6 +11,12 @@
'map.load.success': 'Welcome To WCS.',
'': '',
'': '',
+ 'map.loc.no': 'Location Number',
+ 'map.pallet.barcode': 'Pallet Barcode',
+ 'map.is.enable': 'Enable or Not',
+ 'map.loc.operation': 'Location Operation',
+ '': '',
+ '': '',
'': '',
'': '',
'map.sensor.type.shuttle': 'Shuttle',
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 2962bc7..17ac267 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -36,7 +36,7 @@
getContainer={props.refCurr}
rootStyle={{ position: "absolute" }}
mask={false}
- width={900}
+ width={window.innerWidth * 0.35}
style={{
opacity: 1
}}
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
index b323c0c..46c2be9 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -16,15 +16,19 @@
const { styles } = useStyles();
const { curSprite, curFloor } = props;
+ const [locNo, setLocNo] = useState('');
const [activeTabKey, setActiveTabKey] = useState('view');
useEffect(() => {
- props.setDrawerTitle(curSprite.data.no + '-' + curFloor);
+ const locNo = curSprite.data.no + '-' + curFloor;
+ setLocNo(locNo)
+ props.setDrawerTitle(intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }) + ': ' + locNo);
}, [curSprite]);
const contentList = {
view: (
<ShelfView
+ locNo={locNo}
data={curSprite.data}
curFloor={curFloor}
/>
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 ba47e3c..48d9d5d 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -16,7 +16,7 @@
},
threeInfo: {
height: '100%',
- width: '50%',
+ width: '60%',
},
spinWrapper: {
height: '100%',
@@ -28,7 +28,7 @@
},
tableInfo: {
height: '100%',
- width: '50%',
+ width: '40%',
padding: '0 10px 0 15px',
overflow: 'auto',
}
@@ -88,47 +88,22 @@
[
{
key: '1',
- label: 'Product',
- children: 'Cloud Database',
+ label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }),
+ children: props.locNo,
},
{
key: '2',
- label: 'Billing Mode',
- children: 'Prepaid',
- },
- {
- key: '1',
- label: 'Product',
- children: 'Cloud Database',
- },
- {
- key: '2',
- label: 'Billing Mode',
- children: 'Prepaid',
- },
- {
- key: '1',
- label: 'Product',
- children: 'Cloud Database',
- },
- {
- key: '2',
- label: 'Billing Mode',
- children: 'Prepaid',
- },
- {
- key: '1',
- label: 'Product',
- children: 'Cloud Database',
- },
- {
- key: '2',
- label: 'Billing Mode',
- children: 'Prepaid',
+ label: intl.formatMessage({ id: 'map.pallet.barcode', defaultMessage: '鎵樼洏鏉＄爜' }),
+ children: '80000010',
},
{
key: '3',
- label: 'Automatic Renewal',
+ label: intl.formatMessage({ id: 'map.is.enable', defaultMessage: '鏄惁鍚敤' }),
+ children: 'Disabled',
+ },
+ {
+ key: '2',
+ label: intl.formatMessage({ id: 'map.loc.operation', defaultMessage: '搴撲綅鎿嶄綔' }),
children: <Button> submit</Button>,
},
]
--
Gitblit v1.9.1