From e9a4418c14ef68fb454300b092c413e8df259ec2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 13 四月 2024 11:50:56 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 47 ++++++-----------------------------------------
1 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 4578c9a..75532e5 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -37,8 +37,9 @@
export const SENSOR_TYPE = Object.freeze({
SHELF: "SHELF",
- CONVEYOR: "CONVEYOR",
SHUTTLE: "SHUTTLE",
+ LIFT: "LIFT",
+ CONVEYOR: "CONVEYOR",
POINT: "POINT",
AGV: "AGV",
})
@@ -57,7 +58,7 @@
TRACK: 3,
LIFT: 67,
CHARGE: 5,
- DISABLE: 1,
+ DISABLE: -1,
})
export const NOTIFY_TYPE = Object.freeze({
@@ -320,7 +321,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);
@@ -399,42 +400,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 () => {
@@ -668,10 +633,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);
--
Gitblit v1.9.1