From ce7cab3f73e46f76b10efd7f8ff8dd5ce712482b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 十一月 2024 14:39:43 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/header/FakeFab.jsx | 18 +++++++++---------
zy-acs-flow/src/map/http.js | 3 ++-
zy-acs-flow/src/map/tool.js | 6 +++---
zy-acs-flow/src/map/MapPage.jsx | 12 +++---------
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index adfba19..ba9ebb1 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -40,7 +40,7 @@
const [app, setApp] = useState(null);
const [mapContainer, setMapContainer] = useState(null);
- const [mode, setMode] = useState(null);
+ const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
const [dataFetched, setDataFetched] = useState(false);
const [insightVisible, setInsightVisible] = useState(false);
const [deviceVisible, setDeviceVisible] = useState(false);
@@ -48,7 +48,6 @@
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
const [curSprite, setCurSprite] = useState(null);
- const prevCurSpriteRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
const [rcsStatus, setRcsStatus] = useState(null);
@@ -78,7 +77,7 @@
Http.setMapContainer(player.mapContainer);
websocket = new WebSocketClient('/ws/map/websocket');
- await Http.fetchMapData(curZone, setRcsStatus);
+ await Http.fetchMapData(curZone, setRcsStatus, setCurSprite);
websocket.connect();
websocket.onMessage = (wsMsg) => {
Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg), setCurSprite);
@@ -89,7 +88,6 @@
notify.info(translate('page.map.welcome'));
player.adaptScreen();
setDataFetched(true);
- setMode(MAP_MODE.OBSERVER_MODE);
}, 200)
}
initialize();
@@ -191,10 +189,7 @@
if (!mapContainer) {
return;
}
- prevCurSpriteRef.current = curSprite;
- if (curSprite && prevCurSprite !== curSprite) {
- Tool.removeSelectedEffect();
- }
+ Tool.removeSelectedEffect();
if (curSprite) {
if (mode === MAP_MODE.OBSERVER_MODE) {
Tool.showSelectedEffect(curSprite);
@@ -210,7 +205,6 @@
setSettingsVisible(false);
}
}, [curSprite]);
- const prevCurSprite = prevCurSpriteRef.current;
// watch batchSprites
React.useEffect(() => {
diff --git a/zy-acs-flow/src/map/header/FakeFab.jsx b/zy-acs-flow/src/map/header/FakeFab.jsx
index ecaae12..f39f6d4 100644
--- a/zy-acs-flow/src/map/header/FakeFab.jsx
+++ b/zy-acs-flow/src/map/header/FakeFab.jsx
@@ -17,15 +17,15 @@
const handleToggle = () => {
getFakeSign(null, (res) => {
let pass = true;
- if (!res) {
- const pwd = prompt("please enter password:");
- if (pwd === 'xltys1995') {
- pass = true;
- } else {
- pass = false;
- alert('Incorrect password');
- }
- }
+ // if (!res) {
+ // const pwd = prompt("please enter password:");
+ // if (pwd === 'xltys1995') {
+ // pass = true;
+ // } else {
+ // pass = false;
+ // alert('Incorrect password');
+ // }
+ // }
if (pass) {
setFakeSign(!res, (updatedSign) => {
setFakeRun(updatedSign);
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index b059e6c..3a66580 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -14,7 +14,7 @@
mapContainer = param;
}
-export const fetchMapData = (zoneId, setRcsStatus) => {
+export const fetchMapData = (zoneId, setRcsStatus, setCurSprite) => {
Tool.clearMapData();
return request.post('/map/data/fetch', {
zoneId: zoneId
@@ -57,6 +57,7 @@
// }, 50);
mapContainer.addChild(sprite);
+ Tool.beInsight(sprite, setCurSprite);
}
}
})
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 08939c6..59f467f 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -111,8 +111,8 @@
if (texture) {
sprite = new PIXI.Sprite(PIXI.Texture.from(texture, { resourceOptions: { scale: 1 } }));
}
- sprite.width = 800;
- sprite.height = 1500;
+ sprite.width = 750;
+ sprite.height = 1300;
sprite.zIndex = DEVICE_Z_INDEX.AGV;
break
case DEVICE_TYPE.POINT:
@@ -656,7 +656,7 @@
}
}
-const agvRotationOffsetDegrees = 0;
+const agvRotationOffsetDegrees = 90;
const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees);
const showAgvSprite = (curZone, agvVo, setCurSprite) => {
--
Gitblit v1.9.1