From 3512ff73239775ff866e73f3da2c5eac2f8e2494 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:50:04 +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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/batch/index.jsx b/zy-asrs-flow/src/pages/map/batch/index.jsx
index 23b4e39..7f1166f 100644
--- a/zy-asrs-flow/src/pages/map/batch/index.jsx
+++ b/zy-asrs-flow/src/pages/map/batch/index.jsx
@@ -4,6 +4,7 @@
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 }) => {
@@ -59,12 +60,15 @@
>
{model === ModelEnum.OBSERVER_MODEL && (
<>
- <ShowJson
+ {/* <ShowJson
data={
batchSprites?.map(item => {
return item.data?.no;
})
}
+ /> */}
+ <BatchShelfView
+
/>
</>
)}
--
Gitblit v1.9.1