From 0c48163d11195a61c808015a6cd4f235fcc4f9d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 24 三月 2024 11:51:24 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/agv/index.jsx | 2 +-
zy-asrs-flow/src/pages/map/drawer/point/index.jsx | 2 +-
zy-asrs-flow/src/pages/map/batch/index.jsx | 19 +++++++++++++++++--
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 2 +-
zy-asrs-flow/src/pages/map/drawer/showJson.jsx | 6 +++---
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/batch/index.jsx b/zy-asrs-flow/src/pages/map/batch/index.jsx
index c85ade5..74e5c9b 100644
--- a/zy-asrs-flow/src/pages/map/batch/index.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/index.jsx
@@ -1,8 +1,9 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Drawer, Space, Button } from 'antd';
+import { Drawer, Space, Button, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
+import ShowJson from '../drawer/showJson';
const useStyles = createStyles(({ token, css }) => {
return {
@@ -42,7 +43,21 @@
</Space>
}
>
- {batchSprites?.length}
+ <Card
+ className='drawer-card'
+ hoverable
+ bordered={false}
+ type='inner'
+ style={{
+ height: '100%'
+ }}
+ >
+ <ShowJson
+ data={batchSprites?.length}
+ height='30%'
+ />
+ </Card>
+
</Drawer>
</>
)
diff --git a/zy-asrs-flow/src/pages/map/drawer/agv/index.jsx b/zy-asrs-flow/src/pages/map/drawer/agv/index.jsx
index 6899ae9..8041760 100644
--- a/zy-asrs-flow/src/pages/map/drawer/agv/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/agv/index.jsx
@@ -18,7 +18,7 @@
const contentList = {
json: (
<ShowJson
- curSprite={props.curSprite}
+ data={props.curSprite.data}
/>
),
};
diff --git a/zy-asrs-flow/src/pages/map/drawer/point/index.jsx b/zy-asrs-flow/src/pages/map/drawer/point/index.jsx
index 5fd6e94..43e3a12 100644
--- a/zy-asrs-flow/src/pages/map/drawer/point/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/point/index.jsx
@@ -18,7 +18,7 @@
const contentList = {
json: (
<ShowJson
- curSprite={props.curSprite}
+ data={props.curSprite.data}
/>
),
};
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 faef89f..894333f 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -18,7 +18,7 @@
const contentList = {
json: (
<ShowJson
- curSprite={props.curSprite}
+ data={props.curSprite.data}
/>
),
};
diff --git a/zy-asrs-flow/src/pages/map/drawer/showJson.jsx b/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
index c545c33..50062f8 100644
--- a/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/showJson.jsx
@@ -36,13 +36,13 @@
const ShowJSON = (props) => {
const { styles } = useStyles();
- const { curSprite } = props;
+ const { data } = props;
- const formattedJSON = JSON.stringify(curSprite.data, null, 2);
+ const formattedJSON = JSON.stringify(data, null, 2);
return (
<>
- <div className={styles.jsonBox}>
+ <div className={styles.jsonBox} style={{height: props.height}}>
<textarea
readOnly
className={styles.jsonContent}
--
Gitblit v1.9.1