From 5c0622d48c825ca4b75f63dda78d51ed75bc7a2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 四月 2024 11:04:19 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 59 +++++++++++++++--------------------------------------------
1 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index dbc434c..53e5f73 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'
@@ -37,12 +38,15 @@
export const SENSOR_TYPE = Object.freeze({
SHELF: "SHELF",
SHUTTLE: "SHUTTLE",
+ LIFT: "LIFT",
+ CONVEYOR: "CONVEYOR",
POINT: "POINT",
AGV: "AGV",
})
export const SENSOR_ZINDEX = Object.freeze({
SHELF: 1,
+ CONVEYOR: 1,
POINT: 1,
TRAVEL_PATH: 80,
SHUTTLE: 100,
@@ -54,7 +58,7 @@
TRACK: 3,
LIFT: 67,
CHARGE: 5,
- DISABLE: 1,
+ DISABLE: -1,
})
export const NOTIFY_TYPE = Object.freeze({
@@ -93,6 +97,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 } }));
@@ -311,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);
@@ -337,14 +347,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) {
@@ -393,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 () => {
--
Gitblit v1.9.1