From c7a81b2a1d9d3e0e3809e5ecc11d2e64e51e3d2c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 15:24:11 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3d68464..b518d46 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -6,6 +6,7 @@
import agv from '/public/img/map/agv.svg'
import shelf from '/public/img/map/shelf.png'
+import conveyor from '/public/img/map/conveyor.png'
import point from '/public/img/map/point.svg'
import shuttle from '/public/img/map/shuttle.svg'
@@ -36,6 +37,7 @@
export const SENSOR_TYPE = Object.freeze({
SHELF: "SHELF",
+ CONVEYOR: "CONVEYOR",
SHUTTLE: "SHUTTLE",
POINT: "POINT",
AGV: "AGV",
@@ -43,6 +45,7 @@
export const SENSOR_ZINDEX = Object.freeze({
SHELF: 1,
+ CONVEYOR: 1,
POINT: 1,
TRAVEL_PATH: 80,
SHUTTLE: 100,
@@ -52,6 +55,8 @@
export const SHELF_TYPE = Object.freeze({
STORE: 0,
TRACK: 3,
+ LIFT: 67,
+ CHARGE: 5,
DISABLE: 1,
})
@@ -91,6 +96,12 @@
sprite.width = 60;
sprite.height = 60;
sprite.zIndex = SENSOR_ZINDEX.SHELF;
+ break;
+ case SENSOR_TYPE.CONVEYOR:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(conveyor, { resourceOptions: { scale: 5 } }));
+ sprite.width = 112;
+ sprite.height = 63;
+ sprite.zIndex = SENSOR_ZINDEX.CONVEYOR;
break;
case SENSOR_TYPE.POINT:
sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 5 } }));
@@ -338,9 +349,11 @@
// const copiedSprite = new PIXI.Sprite(sprite.texture);
const copiedSprite = generateSprite(sprite.data.type)
initSprite(copiedSprite);
- copiedSprite.position.set(sprite.position.x, sprite.position.y);
- copiedSprite.scale.set(sprite.scale.x, sprite.scale.y);
- copiedSprite.rotation = sprite.rotation;
+ setTimeout(() => {
+ copiedSprite.position.set(sprite.position.x, sprite.position.y);
+ copiedSprite.scale.set(sprite.scale.x, sprite.scale.y);
+ copiedSprite.rotation = sprite.rotation;
+ }, 50);
copiedSprite.data = deepCopy(sprite.data);
copiedSprite.data.uuid = generateID();
if (copiedSprite.data.type === SENSOR_TYPE.SHELF) {
@@ -457,9 +470,11 @@
showSheflType(sprite);
// graph
- sprite.position.set(item.positionX, item.positionY);
- sprite.scale.set(item.scaleX, item.scaleY);
- sprite.rotation = rotationParseNum(item.rotation);
+ setTimeout(() => {
+ sprite.position.set(item.positionX, item.positionY);
+ sprite.scale.set(item.scaleX, item.scaleY);
+ sprite.rotation = rotationParseNum(item.rotation);
+ }, 50);
mapContainer.addChild(sprite);
}
@@ -578,6 +593,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 +671,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 +710,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