From 77ac6b72ed82d51d0d45bf156ac1b5bb3cb15782 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 19 三月 2024 14:01:43 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 7123c5c..9e56171 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 { FormattedMessage, useIntl, useModel } from '@umijs/max';
-import { Layout, Button, Flex, Row, Col, FloatButton, Select } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, Spin } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
@@ -15,6 +15,7 @@
import Settings from './components/settings'
import * as Utils from './utils'
import Player from './player';
+import MapDrawer from './drawer';
const useStyles = createStyles(({ token }) => {
let dark = token.colorBgBase === '#000';
@@ -98,6 +99,10 @@
const width = contentRef.current.offsetWidth;
const height = contentRef.current.offsetHeight;
app.renderer.resize(width, height);
+ if (model !== MapModel.OBSERVER_MODEL) {
+ player.hideGridlines();
+ player.showGridlines();
+ }
}, [app, mapContainer, windowSize])
// model
@@ -132,6 +137,7 @@
player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
Utils.removeSelectedEffect();
+ setSpriteBySettings(null);
setSettingsVisible(false);
mapContainer.children.forEach(child => {
@@ -157,12 +163,12 @@
}, [model]);
// Add New Device
- const onDrop = (sprite, x, y) => {
+ const onDrop = (sprite, type, x, y) => {
const { mapX, mapY } = Utils.getRealPosition(x, y, mapContainer);
sprite.x = mapX;
sprite.y = mapY;
- Utils.initSprite(sprite);
+ Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
Utils.beMovable(sprite, setDidClickSprite);
};
@@ -172,6 +178,7 @@
player.updateDidClickSprite(didClickSprite);
}, [didClickSprite])
+ // watch spriteBySettings
React.useEffect(() => {
if (!mapContainer) {
return;
@@ -190,6 +197,7 @@
const prevSpriteBySettings = prevSpriteBySettingsRef.current;
const settingsFinish = () => {
+ setSettingsVisible(false);
setSpriteBySettings(null);
}
@@ -198,7 +206,38 @@
<Layout className={styles.layout}>
<Header className={styles.header}>
<Row style={{ height: '100%' }}>
- <Col span={8} style={{ backgroundColor: '#3C40C6' }}></Col>
+ <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>
<Col span={16} style={{ backgroundColor: '#3C40C6' }}>
<Flex className={styles.flex} gap={'large'} justify={'flex-end'} align={'center'}>
<Select
@@ -278,7 +317,7 @@
<Edit
open={deviceVisible}
onCancel={() => {
- // setDeviceVisible(false);
+ setDeviceVisible(false);
}}
refCurr={mapRef.current}
onDrop={onDrop}
@@ -286,12 +325,15 @@
<Settings
open={settingsVisible}
+ curSprite={spriteBySettings}
onCancel={() => {
setSettingsVisible(false);
setSpriteBySettings(null);
}}
+ setSpriteBySettings={setSpriteBySettings}
+ setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
- onDrop={settingsFinish}
+ onSubmit={settingsFinish}
/>
</>
)
--
Gitblit v1.9.1