From baebeeb3275273f96055c33f9eb6daa1c9ffde2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 10:33:53 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/utils.js | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3d68464..373ea69 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -52,6 +52,8 @@
export const SHELF_TYPE = Object.freeze({
STORE: 0,
TRACK: 3,
+ LIFT: 67,
+ CHARGE: 5,
DISABLE: 1,
})
@@ -578,6 +580,12 @@
case SHELF_TYPE.TRACK:
showColor = '#faf6e9';
break;
+ case SHELF_TYPE.LIFT:
+ showColor = '#EBDEF0';
+ break;
+ case SHELF_TYPE.CHARGE:
+ showColor = '#D4EFDF';
+ break;
case SHELF_TYPE.DISABLE:
showColor = '#ffc8c8';
break;
@@ -650,14 +658,13 @@
pathLine = new PIXI.Graphics();
pathLine.name = pathLineName;
- pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
+ pathLine.lineStyle(2 * (1 / mapContainer.scale.x), 0x3498db, 0.8);
pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
let firstNode = true;
- for (let i = path.indexOf(curLocNo) - 1; i < path.length; i++) {
+ for (let i = Math.max(0, path.indexOf(curLocNo) - 1); 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 };
let position = shelf.position;
let x = position.x;
@@ -690,7 +697,7 @@
mapContainer.addChild(shuttle);
viewFeature(shuttle, setCurSPrite);
}
-
+
new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
x: shelf.position.x,
y: shelf.position.y
--
Gitblit v1.9.1