From b6e581cea8422aeb697ebd3942dee066ec5d65e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:47:12 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 22 +++++++++++++---------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java | 2 +-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 07585aa..3bd52aa 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -617,15 +617,16 @@
const curFloor = curFloorGetter();
if (isNullOfUndefined(curFloor)) { return; }
const mapVo = JSON.parse(data);
- // shuttle
+ // shuttleVo
for (const shuttleVo of mapVo.shuttleVos) {
+ // 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; }
-
- drawPreTravelPath(shuttleVo.preTravelPath)
new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
x: shelf.position.x,
@@ -637,28 +638,31 @@
}
-export const drawPreTravelPath = (path) => {
+export const drawPreTravelPath = (path, shuttleNo, curFloor) => {
if (!mapContainer) {
return;
}
-
- let pathLine = mapContainer.getChildByName('preTravelPath');
+ const pathLineName = 'preTravelPath-' + shuttleNo;
+ let pathLine = mapContainer.getChildByName(pathLineName);
if (pathLine) mapContainer.removeChild(pathLine);
pathLine = new PIXI.Graphics();
- pathLine.name = 'preTravelPath';
+ pathLine.name = pathLineName;
pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
pathLine.zIndex = 9999;
+ let firstNode = true;
for (let i = 0; i < path.length; i++) {
const { row, bay, lev } = parseLocNo(path[i]);
+ if (Number(lev) !== curFloor) { continue }
const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
- if (!shelf) continue;
+ if (!shelf) { continue };
let position = shelf.position;
let x = position.x;
let y = position.y;
- if (i === 0) {
+ if (firstNode) {
pathLine.moveTo(x, y);
+ firstNode = false;
} else {
pathLine.lineTo(x, y);
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
index 1978188..2a048ff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
@@ -60,7 +60,7 @@
shuttleVo.setCurLocNo(Utils.getLocNo(row, bay, lev));
List<String> preTravelPath = generatePreTravelPath(row, bay, lev, shouldIncreaseBay, 10);
- shuttleVo.setPreTravelPath(preTravelPath);
+ shuttleVo.setPreTravelPath(preTravelPath);
wsVo.getShuttleVos().add(shuttleVo);
--
Gitblit v1.9.1