From aeb2d2d0233a12b8675786fc1d83353a9a944155 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:56:43 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3bd52aa..3e975be 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -622,21 +622,9 @@
         // path
         drawPreTravelPath(shuttleVo.preTravelPath, shuttleVo.shuttleNo, curFloor);
         // shuttle
-        const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleVo.shuttleNo);
-        if (!shuttle && !shuttleVo.curLocNo) { continue; }
-        const { row, bay, lev } = parseLocNo(shuttleVo.curLocNo);
-        const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
-        if (!shelf) { continue; }
-
-        new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
-            x: shelf.position.x,
-            y: shelf.position.y
-        }, 1000).onUpdate(() => {
-            updateEffect(shuttle);
-        }).start();
+        showShuttle(shuttleVo.shuttleNo, shuttleVo.curLocNo, curFloor);
     }
 }
-
 
 export const drawPreTravelPath = (path, shuttleNo, curFloor) => {
     if (!mapContainer) {
@@ -668,4 +656,23 @@
         }
     }
     mapContainer.addChild(pathLine);
+}
+
+export const showShuttle = (shuttleNo, curLocNo, curFloor) => {
+    if (!curLocNo) { return }
+    const { row, bay, lev } = parseLocNo(curLocNo);
+    if (Number(lev) !== curFloor) { return }
+
+    const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleNo);
+    if (!shuttle) { return }
+
+    const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
+    if (!shelf) { return }
+
+    new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
+        x: shelf.position.x,
+        y: shelf.position.y
+    }, 1000).onUpdate(() => {
+        updateEffect(shuttle);
+    }).start();
 }
\ No newline at end of file

--
Gitblit v1.9.1