From dca1ee5b00f00dcf8c43776eb60bdd23e5cca056 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 15:23:29 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/utils.js | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index b45a4cf..9117879 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -33,6 +33,7 @@
})
export const SENSOR_TYPE = Object.freeze({
+ SHUTTLE: "SHUTTLE",
SHELF: "SHELF",
POINT: "POINT",
AGV: "AGV",
@@ -42,6 +43,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) => {
@@ -335,6 +344,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) => {
@@ -369,7 +387,6 @@
sprite.scale.set(item.scaleX, item.scaleY);
sprite.rotation = rotationParseNum(item.rotation);
- // sprite.tint = '#000';
mapContainer.addChild(sprite);
}
})
@@ -463,8 +480,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 },
@@ -490,6 +507,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