From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 221 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 153 insertions(+), 68 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 668981a..8407a6d 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,24 +1,26 @@
import * as React from 'react'
-import * as PIXI from 'pixi.js';
+import * as TWEEDLE from 'tweedle.js';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
-import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented, message, Popconfirm } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
FileAddOutlined,
CompressOutlined,
SettingOutlined,
- CloseOutlined
} from '@ant-design/icons';
import './index.css'
import { createStyles } from 'antd-style';
import Edit from './components/device';
+import Http from '@/utils/http';
import Settings from './components/settings'
import * as Utils from './utils'
+import WebSocketClient from './websocket'
import Player from './player';
import MapSearch from './header/search';
import MapFloor from './header/floor';
import MapDrawer from './drawer';
+import BatchDrawer from './batch';
const useStyles = createStyles(({ token }) => {
let dark = token.colorBgBase === '#000';
@@ -59,7 +61,7 @@
SETTINGS_MODEL: "3",
})
-let player;
+let player, websocket;
const Map = () => {
const intl = useIntl();
@@ -78,26 +80,36 @@
});
const [app, setApp] = React.useState(null);
const [mapContainer, setMapContainer] = React.useState(null);
- const [didClickSprite, setDidClickSprite] = React.useState(false);
const [spriteBySettings, setSpriteBySettings] = React.useState(null);
const prevSpriteBySettingsRef = React.useRef();
const [drawerVisible, setDrawerVisible] = React.useState(false);
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 curFloorRef = React.useRef(curFloor);
+ const [batchSprites, setBatchSprites] = React.useState([]);
+ const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);
// init func
React.useEffect(() => {
const initialize = async () => {
- player = new Player(mapRef.current, styles.dark, didClickSprite);
+ player = new Player(mapRef.current, styles.dark);
setApp(player.app);
setMapContainer(player.mapContainer);
Utils.syncApp(player.app);
Utils.syncMapContainer(player.mapContainer);
Utils.syncNotify(notify);
+
+ websocket = new WebSocketClient('/ws/map/websocket');
+ websocket.connect();
+ websocket.onMessage = (data) => {
+ Utils.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
+ }
const handleResize = () => {
setWindowSize({
@@ -107,7 +119,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(() => {
@@ -116,6 +132,13 @@
}, 200)
}
initialize();
+
+ return () => {
+ websocket.onMessage = (data) => { }
+ if (websocket) {
+ websocket.close();
+ }
+ }
}, []);
// resize
@@ -131,61 +154,69 @@
}
}, [app, mapContainer, windowSize])
- // model
- React.useEffect(() => {
- if (!mapContainer && !dataFetched) {
- return;
- }
+ // fn switch model
+ const switchModel = (model) => {
+ Utils.removeSelectedEffect();
+
+ setCurSPrite(null);
+ setDrawerVisible(false);
+ setSpriteBySettings(null);
+ setSettingsVisible(false);
+ setBatchSprites([]);
+ setBatchDrawerVisible(false);
+
switch (model) {
case MapModel.OBSERVER_MODEL:
-
player.hideGridlines();
player.hideStarryBackground();
- player.activateMapEvent(null);
-
- Utils.removeSelectedEffect();
- setCurSPrite(null);
setDeviceVisible(false);
- setSettingsVisible(false);
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ setBatchSprites(selectedSprites);
+ });
mapContainer.children.forEach(child => {
Utils.viewFeature(child, setCurSPrite);
})
break
case MapModel.MOVABLE_MODEL:
-
player.showGridlines();
player.hideStarryBackground();
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, model);
-
- Utils.removeSelectedEffect();
- setSpriteBySettings(null);
- setSettingsVisible(false);
- setDrawerVisible(false);
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ Utils.spriteListBeMovable(selectedSprites, () => {
+ resetFn();
+ });
+ });
mapContainer.children.forEach(child => {
- Utils.beMovable(child, setDidClickSprite);
+ Utils.beMovable(child);
})
break
case MapModel.SETTINGS_MODEL:
-
player.showGridlines();
player.showStarryBackground();
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, model);
-
setDeviceVisible(false);
- setDrawerVisible(false);
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ setBatchSprites(selectedSprites);
+ });
mapContainer.children.forEach(child => {
- Utils.beSettings(child, setSpriteBySettings, setDidClickSprite);
+ Utils.beSettings(child, setSpriteBySettings);
})
break
default:
break
}
+ }
+
+ // model
+ React.useEffect(() => {
+ if (!mapContainer && !dataFetched) {
+ return;
+ }
+ switchModel(model);
}, [model]);
// Add New Device
@@ -196,7 +227,7 @@
Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
- Utils.beMovable(sprite, setDidClickSprite);
+ Utils.beMovable(sprite);
};
// watch curSprite
@@ -219,15 +250,49 @@
}, [curSprite]);
const prevCurSprite = prevCurSpriteRef.current;
+ const clearLockPathConfirm = (e) => {
+ clearLockPath(curFloor);
+ };
+
+ const clearLockPath = async (floor) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.clearing', defaultMessage: '姝ｅ湪娓呯┖' }));
+ try {
+ const resp = await Http.doGet('api/map/clearLockPath', { lev: floor });
+ if (resp.code === 200) {
+ message.success(intl.formatMessage({ id: 'page.clearing.success', defaultMessage: '娓呯┖鎴愬姛' }));
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error(intl.formatMessage({ id: 'page.clearing.fail', defaultMessage: '娓呯┖澶辫触璇烽噸璇曪紒' }));
+ return false;
+ } finally {
+ hide();
+ }
+ }
+
+ // fn switch floor
+ const switchFloor = async (floor) => {
+ await Utils.fetchMapData(floor);
+
+ switchModel(model);
+
+ setTimeout(() => {
+ player.adaptScreen();
+ }, 200)
+ }
+
// watch curFloor
React.useEffect(() => {
- Utils.fetchMapData(curFloor);
+ curFloorRef.current = curFloor;
+ if (!mapContainer && !dataFetched) {
+ return;
+ }
+ switchFloor(curFloor);
+ localStorage.setItem('curFloor', JSON.stringify(curFloor));
}, [curFloor]);
-
- // didClickSprite, stop triggers both sprite click and play's selection boxs
- React.useEffect(() => {
- player.updateDidClickSprite(didClickSprite);
- }, [didClickSprite])
// watch spriteBySettings
React.useEffect(() => {
@@ -247,11 +312,18 @@
}, [spriteBySettings])
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
- const settingsFinish = (values, fn) => {
- fn();
- // setSettingsVisible(false);
- // setSpriteBySettings(null);
- }
+ // watch batchSprites
+ React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ if (batchSprites?.length > 0) {
+ setBatchDrawerVisible(true)
+ } else {
+ player.clearSelectedSprites();
+ setBatchDrawerVisible(false)
+ }
+ }, [batchSprites])
return (
<>
@@ -265,6 +337,7 @@
model={model}
setModel={setModel}
ModelEnum={MapModel}
+ curFloor={curFloor}
curSprite={curSprite}
setCurSPrite={setCurSPrite}
setSpriteBySettings={setSpriteBySettings}
@@ -276,27 +349,27 @@
{model === MapModel.OBSERVER_MODEL && (
<>
+ <Popconfirm
+ title="娓呯┖璺緞"
+ description="姝ゆ搷浣滃彲鑳藉鑷村皬杞︾鎾烇紝纭娓呯┖璺緞鍚楋紵"
+ onConfirm={clearLockPathConfirm}
+ okText="纭"
+ cancelText="鍙栨秷"
+ >
+ <Button
+ className='map-header-button'
+ size={'large'}
+ >
+ <FormattedMessage id='map.clearLockPath' defaultMessage='娓呯┖璺緞' />
+ </Button>
+ </Popconfirm>
+
+
<Button
className='map-header-button'
size={'large'}
- onClick={async () => {
- await Utils.fetchMapData(curFloor);
-
- player.hideGridlines();
- player.hideStarryBackground();
-
- player.activateMapEvent(null);
-
- Utils.removeSelectedEffect();
- setCurSPrite(null);
- setDeviceVisible(false);
- setSettingsVisible(false);
- setDrawerVisible(false);
-
- mapContainer.children.forEach(child => {
- Utils.viewFeature(child, setCurSPrite);
- })
-
+ onClick={() => {
+ switchFloor(curFloor)
}}
>
<FormattedMessage id='map.load' defaultMessage='鍔犺浇鍦板浘' />
@@ -353,8 +426,9 @@
<Content ref={contentRef} className={styles.content}>
<div ref={mapRef} />
- {hasFloor && (
+ {floorList.length > 0 && (
<MapFloor
+ floorList={floorList}
curFloor={curFloor}
setCurFloor={setCurFloor}
/>
@@ -392,8 +466,8 @@
if (deviceVisible) {
setDeviceVisible(false);
} else {
- setDeviceVisible(true);
setModel(MapModel.MOVABLE_MODEL);
+ setDeviceVisible(true);
}
}}
/>
@@ -413,10 +487,23 @@
<MapDrawer
open={drawerVisible}
curSprite={curSprite}
+ curFloor={curFloor}
refCurr={mapRef.current}
onCancel={() => {
setCurSPrite(null);
setDrawerVisible(false);
+ }}
+ />
+
+ <BatchDrawer
+ open={batchDrawerVisible}
+ batchSprites={batchSprites}
+ refCurr={mapRef.current}
+ model={model}
+ ModelEnum={MapModel}
+ onCancel={() => {
+ setBatchSprites([]);
+ setBatchDrawerVisible(false);
}}
/>
@@ -437,9 +524,7 @@
setSpriteBySettings(null);
}}
setSpriteBySettings={setSpriteBySettings}
- setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
- onSubmit={settingsFinish}
/>
</>
)
--
Gitblit v1.9.1