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 | 458 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 324 insertions(+), 134 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 8e2a225..8407a6d 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,7 +1,7 @@
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, Spin } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented, message, Popconfirm } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
@@ -12,10 +12,15 @@
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';
@@ -37,11 +42,15 @@
},
content: {
backgroundColor: '#F8FAFB',
- height: 'calc(100vh - 120px)'
+ height: 'calc(100vh - 120px)',
+ position: 'relative'
},
select: {
color: 'red',
fontWeight: 'bold',
+ },
+ headerCol: {
+ paddingLeft: '50px'
}
};
});
@@ -52,16 +61,17 @@
SETTINGS_MODEL: "3",
})
-let player;
+let player, websocket;
const Map = () => {
const intl = useIntl();
const { initialState, setInitialState } = useModel('@@initialState');
+ const [notify, contextHolder] = notification.useNotification();
const { styles } = useStyles();
const mapRef = React.useRef();
const contentRef = React.useRef();
- const [model, setModel] = React.useState(() => MapModel.OBSERVER_MODEL);
+ const [model, setModel] = React.useState(null);
const [deviceVisible, setDeviceVisible] = React.useState(false);
const [settingsVisible, setSettingsVisible] = React.useState(false);
const [windowSize, setWindowSize] = React.useState({
@@ -70,25 +80,65 @@
});
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 [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(() => {
- player = new Player(mapRef.current, styles.dark, didClickSprite);
- setApp(player.app);
- setMapContainer(player.mapContainer);
- Utils.syncApp(player.app);
- Utils.syncMapContainer(player.mapContainer);
+ const initialize = async () => {
+ player = new Player(mapRef.current, styles.dark);
+ setApp(player.app);
+ setMapContainer(player.mapContainer);
+ Utils.syncApp(player.app);
+ Utils.syncMapContainer(player.mapContainer);
+ Utils.syncNotify(notify);
- const handleResize = () => {
- setWindowSize({
- width: window.innerWidth,
- height: window.innerHeight,
- });
- };
- window.addEventListener('resize', handleResize);
+ websocket = new WebSocketClient('/ws/map/websocket');
+ websocket.connect();
+ websocket.onMessage = (data) => {
+ Utils.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
+ }
+
+ const handleResize = () => {
+ setWindowSize({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+ };
+ window.addEventListener('resize', handleResize);
+
+ 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)
+ }
+ initialize();
+
+ return () => {
+ websocket.onMessage = (data) => { }
+ if (websocket) {
+ websocket.close();
+ }
+ }
}, []);
// resize
@@ -100,66 +150,73 @@
const height = contentRef.current.offsetHeight;
app.renderer.resize(width, height);
if (model !== MapModel.OBSERVER_MODEL) {
- player.hideGridlines();
player.showGridlines();
}
}, [app, mapContainer, windowSize])
- // model
- React.useEffect(() => {
- if (!mapContainer) {
- 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();
setDeviceVisible(false);
- setSettingsVisible(false);
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ setBatchSprites(selectedSprites);
+ });
mapContainer.children.forEach(child => {
- child.off('pointerup');
- child.off('pointermove');
- child.off('pointerdown');
- child.off('click');
+ Utils.viewFeature(child, setCurSPrite);
})
break
case MapModel.MOVABLE_MODEL:
-
player.showGridlines();
player.hideStarryBackground();
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
-
- Utils.removeSelectedEffect();
- setSpriteBySettings(null);
- setSettingsVisible(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(null);
-
setDeviceVisible(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
@@ -170,13 +227,72 @@
Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
- Utils.beMovable(sprite, setDidClickSprite);
+ Utils.beMovable(sprite);
};
- // didClickSprite, stop triggers both sprite click and play's selection boxs
+ // watch curSprite
React.useEffect(() => {
- player.updateDidClickSprite(didClickSprite);
- }, [didClickSprite])
+ if (!mapContainer) {
+ return;
+ }
+ prevCurSpriteRef.current = curSprite;
+ if (curSprite && prevCurSprite !== curSprite) {
+ Utils.removeSelectedEffect();
+ }
+ if (curSprite) {
+ if (model === MapModel.OBSERVER_MODEL) {
+ Utils.showSelectedEffect(curSprite)
+ setDrawerVisible(true)
+ }
+ } else {
+ Utils.removeSelectedEffect();
+ }
+ }, [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(() => {
+ curFloorRef.current = curFloor;
+ if (!mapContainer && !dataFetched) {
+ return;
+ }
+ switchFloor(curFloor);
+ localStorage.setItem('curFloor', JSON.stringify(curFloor));
+ }, [curFloor]);
// watch spriteBySettings
React.useEffect(() => {
@@ -196,53 +312,96 @@
}, [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 (
<>
+ {contextHolder}
<Layout className={styles.layout}>
<Header className={styles.header}>
<Row style={{ height: '100%' }}>
- <Col span={8} style={{ backgroundColor: '#dcdde1' }}>
-
-
- <Select
- defaultValue="agv"
- style={{
- width: 120,
- }}
- size={'large'}
- onChange={(value, option) => {
- console.log(value, option);
- }}
- options={[
- {
- value: 'agv',
- label: 'agv',
- },
- {
- value: 'crn',
- label: 'crn',
- },
- ]}
- />
-
- <Select
-
- // notFoundContent={loading ? <Spin size="small" /> : null}
-
- />
-
-
+ <Col className={styles.headerCol} span={12} style={{}}>
+ {dataFetched && (
+ <MapSearch
+ model={model}
+ setModel={setModel}
+ ModelEnum={MapModel}
+ curFloor={curFloor}
+ curSprite={curSprite}
+ setCurSPrite={setCurSPrite}
+ setSpriteBySettings={setSpriteBySettings}
+ />
+ )}
</Col>
- <Col span={16} style={{ backgroundColor: '#3C40C6' }}>
+ <Col span={12} style={{ backgroundColor: styles.dark ? '#2f3542' : '#4a69bd' }}>
<Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
+
+ {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={() => {
+ switchFloor(curFloor)
+ }}
+ >
+ <FormattedMessage id='map.load' defaultMessage='鍔犺浇鍦板浘' />
+ </Button>
+ </>
+ )}
+
+ {model !== MapModel.OBSERVER_MODEL && (
+ <>
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={() => {
+ Utils.clearMapData(intl);
+ }}
+ >
+ <FormattedMessage id='map.clear' defaultMessage='娓呴櫎鍦板浘' />
+ </Button>
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={() => {
+ Utils.saveMapData(intl, curFloor);
+ }}
+ >
+ <FormattedMessage id='map.save' defaultMessage='淇濆瓨鍦板浘' />
+ </Button>
+ </>
+ )}
+
<Select
- className={styles.select}
+ className='map-header-select'
size={'large'}
defaultValue={MapModel.OBSERVER_MODEL}
style={{
@@ -265,55 +424,88 @@
</Row>
</Header>
<Content ref={contentRef} className={styles.content}>
- <div ref={mapRef} style={{ position: "relative" }} >
- <FloatButton.Group
- shape="square"
- style={{
- left: 35,
- bottom: 35
- }}
- >
- <FloatButton
- icon={<CompressOutlined />}
- />
- <FloatButton.BackTop visibilityHeight={0} />
- </FloatButton.Group>
+ <div ref={mapRef} />
- <FloatButton.Group
- hidden={model === MapModel.OBSERVER_MODEL}
- style={{
- left: 35,
- bottom: window.innerHeight / 2
+ {floorList.length > 0 && (
+ <MapFloor
+ floorList={floorList}
+ curFloor={curFloor}
+ setCurFloor={setCurFloor}
+ />
+ )}
+
+ <FloatButton.Group
+ shape="square"
+ style={{
+ left: 35,
+ bottom: 35
+ }}
+ >
+ <FloatButton
+ icon={<CompressOutlined />}
+ onClick={() => {
+ player.adaptScreen();
}}
- icon={<AppstoreAddOutlined />}
- >
- <FloatButton
- hidden={model === MapModel.OBSERVER_MODEL}
- type={deviceVisible ? 'primary' : 'default'}
- tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='娣诲姞璁惧' /></div>}
- icon={<FileAddOutlined />}
- onClick={() => {
- if (deviceVisible) {
- setDeviceVisible(false);
- } else {
- setDeviceVisible(true);
- setModel(MapModel.MOVABLE_MODEL);
- }
- }}
- />
- <FloatButton
- hidden={model === MapModel.OBSERVER_MODEL}
- type={model === MapModel.SETTINGS_MODEL ? 'primary' : 'default'}
- tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='鍙傛暟璁剧疆' /></div>}
- icon={<SettingOutlined />}
- onClick={() => {
- setModel(model === MapModel.SETTINGS_MODEL ? MapModel.MOVABLE_MODEL : MapModel.SETTINGS_MODEL)
- }}
- />
- </FloatButton.Group>
- </div>
+ />
+ </FloatButton.Group>
+
+ <FloatButton.Group
+ hidden={model === MapModel.OBSERVER_MODEL}
+ style={{
+ left: 35,
+ bottom: window.innerHeight / 2
+ }}
+ icon={<AppstoreAddOutlined />}
+ >
+ <FloatButton
+ hidden={model === MapModel.OBSERVER_MODEL}
+ type={deviceVisible ? 'primary' : 'default'}
+ tooltip={<div><FormattedMessage id='map.device.add' defaultMessage='娣诲姞璁惧' /></div>}
+ icon={<FileAddOutlined />}
+ onClick={() => {
+ if (deviceVisible) {
+ setDeviceVisible(false);
+ } else {
+ setModel(MapModel.MOVABLE_MODEL);
+ setDeviceVisible(true);
+ }
+ }}
+ />
+ <FloatButton
+ hidden={model === MapModel.OBSERVER_MODEL}
+ type={model === MapModel.SETTINGS_MODEL ? 'primary' : 'default'}
+ tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='鍙傛暟璁剧疆' /></div>}
+ icon={<SettingOutlined />}
+ onClick={() => {
+ setModel(model === MapModel.SETTINGS_MODEL ? MapModel.MOVABLE_MODEL : MapModel.SETTINGS_MODEL)
+ }}
+ />
+ </FloatButton.Group>
</Content>
- </Layout>
+ </Layout >
+
+ <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);
+ }}
+ />
<Edit
open={deviceVisible}
@@ -332,9 +524,7 @@
setSpriteBySettings(null);
}}
setSpriteBySettings={setSpriteBySettings}
- setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
- onSubmit={settingsFinish}
/>
</>
)
--
Gitblit v1.9.1