From 1315313c3c0e55aa608466d18366dd72c293669e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 15:16:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/header/floor.jsx | 12 +-----------
zy-asrs-flow/src/pages/map/index.jsx | 14 +++++++++-----
zy-asrs-flow/src/pages/map/utils.js | 3 ++-
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/header/floor.jsx b/zy-asrs-flow/src/pages/map/header/floor.jsx
index 7b0f3cc..bd8c229 100644
--- a/zy-asrs-flow/src/pages/map/header/floor.jsx
+++ b/zy-asrs-flow/src/pages/map/header/floor.jsx
@@ -20,16 +20,6 @@
const intl = useIntl();
const { styles } = useStyles();
- const [floorSelectOptions, setFloorSelectOptions] = useState([]);
-
- React.useEffect(() => {
- const initFloorList = async () => {
- const data = await Utils.fetchMapFloor();
- setFloorSelectOptions(data)
- }
- initFloorList();
- }, []);
-
const floorChange = (floor) => {
props.setCurFloor(floor);
}
@@ -39,7 +29,7 @@
<div className={styles.floorBox}>
<Segmented
size={'large'}
- options={floorSelectOptions}
+ options={props.floorList}
value={props.curFloor}
onChange={floorChange}
style={{
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 7158df3..42904f1 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -85,11 +85,10 @@
const [dataFetched, setDataFetched] = React.useState(false);
const [curSprite, setCurSPrite] = React.useState(null);
const prevCurSpriteRef = React.useRef();
- const hasFloor = true;
- // const [hasFloor, setHasFloor] = React.useState(true);
+ const [floorList, setFloorList] = React.useState([]);
const [curFloor, setCurFloor] = React.useState(() => {
const storedValue = localStorage.getItem('curFloor');
- return storedValue !== null ? JSON.parse(storedValue) : 1;
+ return storedValue !== null ? JSON.parse(storedValue) : null;
});
const [batchSprites, setBatchSprites] = React.useState([]);
const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);
@@ -112,7 +111,11 @@
};
window.addEventListener('resize', handleResize);
- await Utils.fetchMapData(curFloor);
+ const mapFloorData = await Utils.fetchMapFloor();
+ setFloorList(mapFloorData);
+ let defaultFloor = curFloor || mapFloorData?.[0]?.value;
+ setCurFloor(defaultFloor);
+ await Utils.fetchMapData(defaultFloor);
setDataFetched(true);
setModel(MapModel.OBSERVER_MODEL)
setTimeout(() => {
@@ -368,8 +371,9 @@
<Content ref={contentRef} className={styles.content}>
<div ref={mapRef} />
- {hasFloor && (
+ {floorList.length > 0 && (
<MapFloor
+ floorList={floorList}
curFloor={curFloor}
setCurFloor={setCurFloor}
/>
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 25f2ca2..cbcba2d 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -347,8 +347,9 @@
const res = await Http.doPost('api/map/floor/list');
if (res.code === 200) {
return eval(res.data);
+ } else {
+ mapNotify(res.msg, NOTIFY_TYPE.ERROR);
}
- mapNotify(res.msg, NOTIFY_TYPE.ERROR);
}
export const fetchMapData = async (curFloor) => {
--
Gitblit v1.9.1