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 | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index ec2a53f..9117879 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -33,9 +33,24 @@
})
export const SENSOR_TYPE = Object.freeze({
+ SHUTTLE: "SHUTTLE",
SHELF: "SHELF",
POINT: "POINT",
AGV: "AGV",
+})
+
+export const SHELF_TYPE = Object.freeze({
+ 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) => {
@@ -72,7 +87,7 @@
}
// sprite be movable from sprite click event
-export const beMovable = (sprite, setDidClickSprite) => {
+export const beMovable = (sprite) => {
sprite.off('pointerup');
sprite.off('pointermove');
sprite.off('pointerdown');
@@ -83,7 +98,6 @@
let dragTarget;
function onDragStart(event) {
if (event.button === 0) {
- setDidClickSprite(true);
dragTarget = event.currentTarget;
mapContainer.parent.off('pointermove');
mapContainer.parent.on('pointermove', onDragMove, dragTarget);
@@ -101,7 +115,6 @@
function onDragEnd() {
if (dragTarget) {
- setDidClickSprite(false);
this.parent.off('pointermove');
this.parent.off('pointerup');
dragTarget.alpha = 1;
@@ -112,7 +125,7 @@
}
// sprite be beSettings from sprite click event
-export const beSettings = (sprite, setSpriteBySettings, setDidClickSprite) => {
+export const beSettings = (sprite, setSpriteBySettings) => {
sprite.off('pointerup');
sprite.off('pointermove');
sprite.off('pointerdown');
@@ -122,18 +135,18 @@
function onClick(event) {
setSpriteBySettings(sprite);
- // setDidClickSprite(true);
}
}
// sprites be movable from select box
// the scale was dynamic
-export const spriteListBeMovable = (selectedSprites, scale, resetFn) => {
+export const spriteListBeMovable = (selectedSprites, resetFn) => {
if (selectedSprites && selectedSprites.length > 0) {
let batchMove = false;
let batchMoveStartPos = null;
const batchMoving = (event) => {
+ const scale = mapContainer.scale.x;
if (batchMove && batchMoveStartPos) {
// offset move val
var mouseMovement = {
@@ -141,8 +154,8 @@
y: (event.global.y - batchMoveStartPos.y) / scale
};
for (let sprite of selectedSprites) {
- sprite.position.x = sprite.data.batchMoveStartPos.x + mouseMovement.x;
- sprite.position.y = sprite.data.batchMoveStartPos.y + mouseMovement.y;
+ sprite.position.x = sprite.batchMoveStartPos.x + mouseMovement.x;
+ sprite.position.y = sprite.batchMoveStartPos.y + mouseMovement.y;
}
}
}
@@ -158,13 +171,15 @@
mapContainer.parent.off('mousemove');
mapContainer.parent.off('mouseup');
- resetFn();
+ if (resetFn) {
+ resetFn();
+ }
}
const batchMoveStart = (event) => {
batchMoveStartPos = { x: event.data.global.clone().x, y: event.data.global.clone().y };
selectedSprites.forEach(child => {
- child.data.batchMoveStartPos = { x: child.position.x, y: child.position.y };
+ child.batchMoveStartPos = { x: child.position.x, y: child.position.y };
})
batchMove = true;
@@ -253,6 +268,7 @@
copiedSprite.rotation = sprite.rotation;
copiedSprite.data = deepCopy(sprite.data);
copiedSprite.data.uuid = generateID();
+ showSheflType(copiedSprite);
return copiedSprite;
}
@@ -328,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) => {
@@ -356,10 +381,12 @@
// dynamical data
Object.assign(sprite.data, item.property);
+ showSheflType(sprite);
// graph
sprite.position.set(item.positionX, item.positionY);
sprite.scale.set(item.scaleX, item.scaleY);
sprite.rotation = rotationParseNum(item.rotation);
+
mapContainer.addChild(sprite);
}
})
@@ -397,10 +424,10 @@
})
const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
- await Http.doPostPromise('api/map/save', {
+ await Http.doPostPromise('api/map/save', {
itemList: mapItemList,
floor: floor
- }, (res) => {
+ }, (res) => {
closeLoading();
}).catch((error) => {
closeLoading();
@@ -453,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 },
@@ -462,4 +489,42 @@
closeIcon: false,
onClick: () => { }
});
+}
+
+export const showSheflType = (sprite) => {
+ let showColor;
+ switch (sprite.data.shelfType) {
+ case SHELF_TYPE.STORE:
+ break;
+ case SHELF_TYPE.TRACK:
+ showColor = '#faf6e9';
+ break;
+ case SHELF_TYPE.DISABLE:
+ showColor = '#ffc8c8';
+ break;
+ default:
+ break;
+ }
+ 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