From 80f471864deb69ec010d0c10f59b37b15234dfdd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 16:20:22 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3679e5e..c1770b7 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 point from '/public/img/map/point.svg'
+import shuttle from '/public/img/map/shuttle.svg'
let app = null;
let mapContainer = null;
@@ -33,6 +34,7 @@
})
export const SENSOR_TYPE = Object.freeze({
+ SHUTTLE: "SHUTTLE",
SHELF: "SHELF",
POINT: "POINT",
AGV: "AGV",
@@ -42,6 +44,14 @@
STORE: 0,
TRACK: 3,
DISABLE: 1,
+})
+
+export const NOTIFY_TYPE = Object.freeze({
+ OPEN: 'open',
+ SUCCESS: 'success',
+ INFO: 'info',
+ WARNING: 'warning',
+ ERROR: 'error',
})
export const getRealPosition = (x, y, mapContainer) => {
@@ -259,6 +269,7 @@
copiedSprite.rotation = sprite.rotation;
copiedSprite.data = deepCopy(sprite.data);
copiedSprite.data.uuid = generateID();
+ showSheflType(copiedSprite);
return copiedSprite;
}
@@ -334,6 +345,15 @@
return options;
}
+export const fetchMapFloor = async () => {
+ const res = await Http.doPost('api/map/floor/list');
+ if (res.code === 200) {
+ return eval(res.data);
+ } else {
+ mapNotify(res.msg, NOTIFY_TYPE.ERROR);
+ }
+}
+
export const fetchMapData = async (curFloor) => {
clearMapData();
await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
@@ -341,11 +361,16 @@
mapItemList.forEach(item => {
let sprite;
switch (item.type) {
+ case SENSOR_TYPE.SHUTTLE:
+ sprite = PIXI.Sprite.from({ source: shuttle, scaleMode: PIXI.SCALE_MODES.HIGH });
+ break;
case SENSOR_TYPE.SHELF:
sprite = PIXI.Sprite.from(shelf);
break;
case SENSOR_TYPE.AGV:
- sprite = PIXI.Sprite.from(agv);
+ sprite = new PIXI.Sprite(PIXI.Texture.from(agv, { resourceOptions: { scale: 5 } }));
+ sprite.width = 50;
+ sprite.height = 50;
break;
case SENSOR_TYPE.POINT:
sprite = PIXI.Sprite.from(point);
@@ -368,7 +393,6 @@
sprite.scale.set(item.scaleX, item.scaleY);
sprite.rotation = rotationParseNum(item.rotation);
- // sprite.tint = '#000';
mapContainer.addChild(sprite);
}
})
@@ -376,7 +400,6 @@
}).catch((error) => {
console.error(error);
})
-
}
export const saveMapData = async (intl, floor) => {
@@ -462,8 +485,8 @@
.to(targetPos, 500).start();
}
-export const mapNotify = (msg) => {
- notify.open({
+export const mapNotify = (msg, type = NOTIFY_TYPE.OPEN) => {
+ notify[type]({
description: msg,
duration: 1.5,
style: { width: 300 },
@@ -489,6 +512,24 @@
}
if (showColor) {
sprite.tint = showColor;
+ } else {
+ sprite.tint = 0xFFFFFF; // recovery
}
return showColor;
+}
+
+export const waitTime = (time = 1000) => {
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ resolve(true);
+ }, time);
+ });
+};
+
+export const isNullOfUndefined = (param) => {
+ if (null === param || undefined === param) {
+ return true;
+ } else {
+ return false;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1