From cef84b3bdff4625965eac92b6550ed04936d6b23 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 15 十月 2024 16:12:34 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/header/MapSearch.jsx | 2 +-
zy-acs-flow/src/map/tool.js | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/map/header/MapSearch.jsx b/zy-acs-flow/src/map/header/MapSearch.jsx
index f99ccdf..de910c1 100644
--- a/zy-acs-flow/src/map/header/MapSearch.jsx
+++ b/zy-acs-flow/src/map/header/MapSearch.jsx
@@ -19,8 +19,8 @@
const deviceTypeSelectOptionsFn = (translate) => {
const deviceTypes = [
{ key: DEVICE_TYPE.SHELF, id: 'page.map.devices.shelf' },
- { key: DEVICE_TYPE.STATION, id: 'page.map.devices.station' },
{ key: DEVICE_TYPE.AGV, id: 'page.map.devices.agv' },
+ { key: DEVICE_TYPE.STATION, id: 'page.map.devices.station' },
{ key: DEVICE_TYPE.POINT, id: 'page.map.devices.point' },
// 娣诲姞鍏朵粬璁惧绫诲瀷
];
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 8eab20d..094c2af 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -282,12 +282,17 @@
};
let targetPos = {
- x: app.renderer.width / 3 - focusPoint.x * mapContainer.scale.x,
- y: app.renderer.height / 3 - focusPoint.y * mapContainer.scale.y
+ x: app.renderer.width / 4 - focusPoint.x * mapContainer.scale.x,
+ y: app.renderer.height / 2 - focusPoint.y * mapContainer.scale.y
};
- new TWEEDLE.Tween(mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
- .to(targetPos, 500).start();
+ new TWEEDLE.Tween(mapContainer.position)
+ .easing(TWEEDLE.Easing.Quadratic.Out)
+ .to(targetPos, 500)
+ .onComplete(() => {
+ // mapContainer.scale.set(.3);
+ })
+ .start();
}
export const clearMapData = () => {
--
Gitblit v1.9.1