From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/batch/index.jsx | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/batch/index.jsx b/zy-asrs-flow/src/pages/map/batch/index.jsx
index ca9ddf9..fb6fc75 100644
--- a/zy-asrs-flow/src/pages/map/batch/index.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/index.jsx
@@ -4,6 +4,8 @@
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
import ShowJson from '../drawer/showJson';
+import BatchShelfView from './view'
+import BatchModify from './modify';
const useStyles = createStyles(({ token, css }) => {
return {
@@ -13,11 +15,14 @@
const BatchDrawer = (props) => {
const intl = useIntl();
const { styles } = useStyles();
- const { batchSprites } = props;
+ const {
+ batchSprites,
+ model,
+ ModelEnum,
+ } = props;
useEffect(() => {
- console.log(batchSprites);
- }, []);
+ }, [props]);
const handleCancel = () => {
props.onCancel();
@@ -32,8 +37,9 @@
rootStyle={{ position: "absolute" }}
mask={false}
width={600}
+ placement={'left'}
style={{
- opacity: .8
+ opacity: 1
}}
extra={
<Space>
@@ -52,19 +58,32 @@
height: '100%'
}}
>
- <ShowJson
- data={
- batchSprites?.filter(item => {
- return item.data?.type === Utils.SENSOR_TYPE.SHELF
- }).map(item => {
- return item.data?.no;
- })
- }
- height='60%'
- />
- </Card>
+ {model === ModelEnum.OBSERVER_MODEL && (
+ <>
+ <ShowJson
+ data={
+ batchSprites?.map(item => {
+ return item.data?.no;
+ })
+ }
+ />
+ {/* <BatchShelfView
- </Drawer>
+ /> */}
+ </>
+ )}
+
+ {model === ModelEnum.SETTINGS_MODEL && (
+ <>
+ <BatchModify
+ batchSprites={batchSprites}
+ handleCancel={handleCancel}
+ />
+ </>
+ )}
+
+ </Card >
+ </Drawer >
</>
)
}
--
Gitblit v1.9.1