From 2efa376119e084f6c45f6d5da55d72bc19c40576 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 13:28:05 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/http.js | 30 +++++++++++++++---------------
zy-acs-flow/src/map/MapPage.jsx | 16 +++++++++++++++-
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index b2a887a..9ebb29a 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -90,8 +90,8 @@
}
setTimeout(() => {
- player.adaptScreen();
notify.info(translate('page.map.welcome'));
+ player.adaptScreen();
setDataFetched(true);
setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
@@ -363,6 +363,20 @@
flexGrow: 1, // fill remaining of map space
position: 'relative',
backgroundColor: '#fff',
+ ...(mode === MAP_MODE.SETTINGS_MODE && {
+ animation: 'settingsPulse 1.5s infinite',
+ '@keyframes settingsPulse': {
+ '0%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ '50%': {
+ boxShadow: `0 0 8px 3px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.5)`)}`,
+ },
+ '100%': {
+ boxShadow: `0 0 3px 1px ${theme.palette.primary.main.replace('rgb', 'rgba').replace(')', `, 0.1)`)}`,
+ },
+ },
+ })
}}
>
<Box
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 0357eba..c6d34e1 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -14,9 +14,9 @@
mapContainer = param;
}
-export const fetchMapData = async (zoneId) => {
+export const fetchMapData = (zoneId) => {
Tool.clearMapData();
- await request.post('/map/data/fetch', {
+ return request.post('/map/data/fetch', {
zoneId: zoneId
}, {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
@@ -37,20 +37,20 @@
Object.assign(sprite.data, item.property);
// graph
- setTimeout(() => {
- sprite.position.set(item.positionX, item.positionY);
- sprite.scale.set(item.scaleX, item.scaleY);
- sprite.rotation = Tool.rotationParseNum(item.rotation);
+ // setTimeout(() => {
+ sprite.position.set(item.positionX, item.positionY);
+ sprite.scale.set(item.scaleX, item.scaleY);
+ sprite.rotation = Tool.rotationParseNum(item.rotation);
- // support
- switch (item.type) {
- case DEVICE_TYPE.POINT:
- sprite.scale.set(0.65, 0.65);
- break
- default:
- break
- }
- }, 50);
+ // support
+ switch (item.type) {
+ case DEVICE_TYPE.POINT:
+ sprite.scale.set(0.65, 0.65);
+ break
+ default:
+ break
+ }
+ // }, 50);
mapContainer.addChild(sprite);
}
--
Gitblit v1.9.1