From 66ab394f977a2fcf4b4fc9334829fc5bb171296f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 09 十月 2024 16:45:28 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 73f9769..69c9801 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
+import { useTranslate } from "react-admin";
import {
TextField,
Select,
@@ -22,6 +23,7 @@
import * as Tool from './tool';
import { NotificationProvider, useNotification } from './Notification';
import Device from "./Device";
+import * as Http from './http';
let player;
@@ -29,6 +31,7 @@
const theme = useTheme();
const themeMode = theme.palette.mode;
const notify = useNotification();
+ const translate = useTranslate();
const mapRef = useRef();
const contentRef = useRef();
@@ -47,6 +50,9 @@
setMapContainer(player.mapContainer);
Tool.setApp(player.app);
Tool.setMapContainer(player.mapContainer);
+ Http.setNotify(notify);
+
+ await Http.fetchMapData(0);
}
initialize();
@@ -57,6 +63,10 @@
const height = contentRef.current.offsetHeight;
player.resize(width, height);
+ if (mode === MapMode.MOVABLE_MODE) {
+ console.log('aa');
+ player.showGridLines();
+ }
};
handleResize();
window.addEventListener('resize', handleResize);
@@ -74,11 +84,29 @@
switch (mode) {
case MapMode.OBSERVER_MODE:
setDeviceVisible(false);
+ player.hideGridLines();
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ console.log(selectedSprites);
+ });
+
break
case MapMode.MOVABLE_MODE:
+ player.showGridLines();
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ Tool.spriteListBeMovable(selectedSprites, () => {
+ restartFn();
+ });
+ });
break
case MapMode.SETTINGS_MODE:
+ player.hideGridLines();
setDeviceVisible(false);
+
+ player.activateMapMultiSelect((selectedSprites, restartFn) => {
+ console.log(selectedSprites);
+ });
break
default:
break
@@ -93,13 +121,15 @@
}, [mode]);
const onDrop = (sprite, type, x, y) => {
+ console.log(sprite, type, x, y);
+
const { mapX, mapY } = Tool.getRealPosition(x, y);
sprite.x = mapX;
sprite.y = mapY;
- // Utils.initSprite(sprite, type);
- // mapContainer.addChild(sprite);
- // Utils.beMovable(sprite);
+ Tool.initSprite(sprite, type);
+ mapContainer.addChild(sprite);
+ Tool.beMovable(sprite);
};
const actions = [
@@ -166,7 +196,7 @@
sx={{ mr: 1 }}
onClick={() => setDeviceVisible(!deviceVisible)}
>
- 娣诲姞妯″瀷
+ {translate('page.map.devices.title')}
</Button>
</>
)}
--
Gitblit v1.9.1