From 4372fc567d19dfc945a5017a264ee33ac456b9cd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 18 三月 2024 15:44:16 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/index.jsx | 12 +++---------
zy-asrs-flow/src/pages/map/drawer/shelf/json.jsx | 5 +++--
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 23 ++---------------------
3 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 3c8fdde..442887e 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -3,7 +3,6 @@
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
-import Http from '@/utils/http';
import ShelfDrawer from './shelf';
import AgvDrawer from './agv';
@@ -14,13 +13,11 @@
const MapDrawer = (props) => {
const intl = useIntl();
const { styles } = useStyles();
+ const { curSprite } = props;
const handleCancel = () => {
props.onCancel();
};
-
- const handleOk = () => {
- }
return (
<>
@@ -36,23 +33,20 @@
<Button onClick={handleCancel}>
<FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' />
</Button>
- <Button hidden={true} onClick={handleOk} type="primary">
- <FormattedMessage id='common.submit' defaultMessage='淇濆瓨' />
- </Button>
</Space>
}
>
{props.curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
<>
<ShelfDrawer
-
+ curSprite={curSprite}
/>
</>
)}
{props.curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
<>
<AgvDrawer
-
+ curSprite={curSprite}
/>
</>
)}
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 e296144..5edecb6 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -14,28 +14,16 @@
const intl = useIntl();
const { styles } = useStyles();
const [activeTabKey, setActiveTabKey] = useState('json');
-
- const [jsonForm] = Form.useForm();
+
+ const { curSprite } = props;
const contentList = {
json: (
<JSON
- refCurr={props.refCurr}
curSprite={props.curSprite}
- setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
- onSubmit={props.onSubmit}
- jsonForm={jsonForm}
/>
),
};
-
- const handleCancel = () => {
- props.onCancel();
- };
-
- const handleOk = () => {
- }
return (
<>
@@ -47,13 +35,6 @@
{
key: 'json',
tab: intl.formatMessage({ id: 'map.drawer.json', defaultMessage: 'JSON' }),
- // icon: <BorderOuterOutlined />
-
- },
- {
- key: 'config',
- tab: intl.formatMessage({ id: 'map.settings.config.param', defaultMessage: '绯荤粺鍙傛暟' }),
- // icon: <BranchesOutlined />
},
]}
activeTabKey={activeTabKey}
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/json.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/json.jsx
index c360660..f75b19b 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/json.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/json.jsx
@@ -9,12 +9,13 @@
})
-const JSON = () => {
+const JSON = (props) => {
+ const { curSprite } = props;
return (
<>
- <h1>JSON</h1>
+ <h1>{curSprite.data.uuid}</h1>
</>
)
--
Gitblit v1.9.1