From 95d473bc8c09ef41e1455f93dec49c5ee6ac548f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 08:23:38 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 93 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index b518d46..62d5468 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -9,6 +9,7 @@
import conveyor from '/public/img/map/conveyor.png'
import point from '/public/img/map/point.svg'
import shuttle from '/public/img/map/shuttle.svg'
+import { log } from 'three/examples/jsm/nodes/Nodes.js';
let app = null;
let mapContainer = null;
@@ -37,8 +38,9 @@
export const SENSOR_TYPE = Object.freeze({
SHELF: "SHELF",
- CONVEYOR: "CONVEYOR",
SHUTTLE: "SHUTTLE",
+ LIFT: "LIFT",
+ CONVEYOR: "CONVEYOR",
POINT: "POINT",
AGV: "AGV",
})
@@ -57,7 +59,7 @@
TRACK: 3,
LIFT: 67,
CHARGE: 5,
- DISABLE: 1,
+ DISABLE: -1,
})
export const NOTIFY_TYPE = Object.freeze({
@@ -320,7 +322,7 @@
return
}
const { width, height } = sprite;
- const scale = sprite.scale.x;
+ const scale = sprite?.scale.x;
const sideLen = (Math.max(width, height) + 10) * scale;
const scaledWidth = sideLen * (1 / scale);
const scaledHeight = sideLen * (1 / scale);
@@ -346,14 +348,11 @@
}
export const copySprite = (sprite) => {
- // const copiedSprite = new PIXI.Sprite(sprite.texture);
const copiedSprite = generateSprite(sprite.data.type)
initSprite(copiedSprite);
- 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.position.set(sprite.position.x, sprite.position.y);
+ copiedSprite.scale.set(sprite.scale.x, sprite.scale.y);
+ copiedSprite.rotation = sprite.rotation;
copiedSprite.data = deepCopy(sprite.data);
copiedSprite.data.uuid = generateID();
if (copiedSprite.data.type === SENSOR_TYPE.SHELF) {
@@ -402,42 +401,6 @@
export const findSpriteByUuid = (uuid) => {
return mapContainer?.children?.find(child => child?.data?.uuid === uuid);
-}
-
-export const sensorTypeSelectOptions = (intl) => {
- let options = [];
- Object.entries(SENSOR_TYPE).forEach(([key, value]) => {
- switch (key) {
- case SENSOR_TYPE.SHELF:
- options.push({
- value: value,
- label: intl.formatMessage({ id: 'map.sensor.type.shelf', defaultMessage: '璐ф灦' })
- })
- break;
- case SENSOR_TYPE.SHUTTLE:
- options.push({
- value: value,
- label: intl.formatMessage({ id: 'map.sensor.type.shuttle', defaultMessage: '绌挎杞�' })
- })
- break;
- case SENSOR_TYPE.AGV:
- options.push({
- value: value,
- label: intl.formatMessage({ id: 'map.sensor.type.agv', defaultMessage: '鏃犱汉灏忚溅' })
- })
- break;
- case SENSOR_TYPE.POINT:
- options.push({
- value: value,
- label: intl.formatMessage({ id: 'map.sensor.type.point', defaultMessage: '瀹氫綅鐐�' })
- })
- break;
- default:
- break;
- }
-
- })
- return options;
}
export const fetchMapFloor = async () => {
@@ -656,6 +619,8 @@
// shuttle
showShuttle(shuttleVo, curFloor, setCurSPrite);
}
+
+ showLockPath(mapVo.lockPath, curFloor, setCurSPrite);
}
export const drawTravelPath = (shuttleVo, curFloor) => {
@@ -671,10 +636,10 @@
pathLine = new PIXI.Graphics();
pathLine.name = pathLineName;
- pathLine.lineStyle(2 * (1 / mapContainer.scale.x), 0x3498db, 0.8);
+ pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 0.8);
pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
let firstNode = true;
- for (let i = Math.max(0, path.indexOf(curLocNo) - 1); i < path.length; i++) {
+ for (let i = Math.max(0, path.indexOf(curLocNo)); i < path.length; i++) {
const { row, bay, lev } = parseLocNo(path[i]);
if (Number(lev) !== curFloor) { continue }
const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
@@ -717,4 +682,38 @@
}, 1000).onUpdate(() => {
updateEffect(shuttle);
}).start();
+}
+
+export const showLockPath = (nodes, curFloor, setCurSPrite) => {
+ const pathLineName = 'lockPath-' + curFloor;
+ let pathLine = mapContainer.getChildByName(pathLineName);
+ if (pathLine) {
+ mapContainer.removeChild(pathLine);
+ }
+
+ pathLine = new PIXI.Graphics();
+ pathLine.name = pathLineName;
+ pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0xff0000, 0.8);
+ pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
+ let firstNode = true;
+
+ for(let i = 0; i < nodes.length; i++) {
+ const node = nodes[i];
+ if (node.z !== curFloor) { continue }
+ const shelf = querySprite(SENSOR_TYPE.SHELF, node.x + '-' + node.y);
+ if (!shelf) { continue }
+
+ let position = shelf.position;
+ let x = position.x;
+ let y = position.y;
+ if (firstNode) {
+ pathLine.moveTo(x, y);
+ firstNode = false;
+ } else {
+ pathLine.lineTo(x, y);
+ }
+
+ }
+
+ mapContainer.addChild(pathLine);
}
\ No newline at end of file
--
Gitblit v1.9.1