From 6aa8f23171b3c881da774123f1c079d7d0b88691 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 13:07: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/index.jsx | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index a0745fd..5709878 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -15,6 +15,7 @@
import Edit from './components/device';
import Settings from './components/settings'
import * as Utils from './utils'
+import * as Websocket from './websocket'
import Player from './player';
import MapSearch from './header/search';
import MapFloor from './header/floor';
@@ -85,9 +86,11 @@
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 [curFloor, setCurFloor] = React.useState(1);
+ const [floorList, setFloorList] = React.useState([]);
+ const [curFloor, setCurFloor] = React.useState(() => {
+ const storedValue = localStorage.getItem('curFloor');
+ return storedValue !== null ? JSON.parse(storedValue) : null;
+ });
const [batchSprites, setBatchSprites] = React.useState([]);
const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);
@@ -109,13 +112,19 @@
};
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(() => {
player.adaptScreen();
Utils.mapNotify(intl.formatMessage({ id: 'map.load.success', defaultMessage: '娆㈣繋浣跨敤WCS绯荤粺' }));
}, 200)
+
+ Websocket.createWs();
}
initialize();
}, []);
@@ -141,6 +150,8 @@
setDrawerVisible(false);
setSpriteBySettings(null);
setSettingsVisible(false);
+ setBatchSprites([]);
+ setBatchDrawerVisible(false);
switch (model) {
case MapModel.OBSERVER_MODEL:
@@ -244,6 +255,7 @@
return;
}
switchFloor(curFloor);
+ localStorage.setItem('curFloor', JSON.stringify(curFloor));
}, [curFloor]);
// watch spriteBySettings
@@ -264,10 +276,15 @@
}, [spriteBySettings])
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
+ // watch batchSprites
React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
if (batchSprites?.length > 0) {
setBatchDrawerVisible(true)
} else {
+ player.clearSelectedSprites();
setBatchDrawerVisible(false)
}
}, [batchSprites])
@@ -284,6 +301,7 @@
model={model}
setModel={setModel}
ModelEnum={MapModel}
+ curFloor={curFloor}
curSprite={curSprite}
setCurSPrite={setCurSPrite}
setSpriteBySettings={setSpriteBySettings}
@@ -356,8 +374,9 @@
<Content ref={contentRef} className={styles.content}>
<div ref={mapRef} />
- {hasFloor && (
+ {floorList.length > 0 && (
<MapFloor
+ floorList={floorList}
curFloor={curFloor}
setCurFloor={setCurFloor}
/>
@@ -416,6 +435,7 @@
<MapDrawer
open={drawerVisible}
curSprite={curSprite}
+ curFloor={curFloor}
refCurr={mapRef.current}
onCancel={() => {
setCurSPrite(null);
@@ -427,8 +447,10 @@
open={batchDrawerVisible}
batchSprites={batchSprites}
refCurr={mapRef.current}
+ model={model}
+ ModelEnum={MapModel}
onCancel={() => {
- setBatchSprites(null);
+ setBatchSprites([]);
setBatchDrawerVisible(false);
}}
/>
--
Gitblit v1.9.1