From 80e5ee8049eefe7039d77048f43e6e0566a07953 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 09:10:43 +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 | 236 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 190 insertions(+), 46 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 4582016..6865dbc 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -1,8 +1,15 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
+import Http from '@/utils/http';
+import { message } from 'antd';
+import { API_TIMEOUT } from '@/config/setting'
+import agv from '/public/img/map/agv.svg'
+import shelf from '/public/img/map/shelf.png'
+import point from '/public/img/map/point.svg'
let app = null;
let mapContainer = null;
+let notify = null;
let effectTick, effectHalfCircle, effectRectangle;
export function syncApp(param) {
@@ -11,6 +18,10 @@
export function syncMapContainer(param) {
mapContainer = param;
+}
+
+export function syncNotify(param) {
+ notify = param;
}
export function getMapContainer() {
@@ -23,6 +34,7 @@
export const SENSOR_TYPE = Object.freeze({
SHELF: "SHELF",
+ POINT: "POINT",
AGV: "AGV",
})
@@ -44,8 +56,23 @@
};
}
+// show sprite feature from sprite click event
+export const viewFeature = (sprite, setCurSPrite) => {
+ sprite.off('pointerup');
+ sprite.off('pointermove');
+ sprite.off('pointerdown');
+ sprite.off('click');
+
+ sprite.on("click", onClick);
+
+ function onClick(event) {
+ setCurSPrite(sprite);
+ }
+
+}
+
// 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');
@@ -55,13 +82,14 @@
let dragTarget;
function onDragStart(event) {
- setDidClickSprite(true);
- dragTarget = event.currentTarget;
- mapContainer.parent.off('pointermove');
- mapContainer.parent.on('pointermove', onDragMove, dragTarget);
+ if (event.button === 0) {
+ dragTarget = event.currentTarget;
+ mapContainer.parent.off('pointermove');
+ mapContainer.parent.on('pointermove', onDragMove, dragTarget);
- mapContainer.parent.off('pointerup');
- mapContainer.parent.on('pointerup', onDragEnd.bind(mapContainer));
+ mapContainer.parent.off('pointerup');
+ mapContainer.parent.on('pointerup', onDragEnd.bind(mapContainer));
+ }
}
function onDragMove(event) {
@@ -72,7 +100,6 @@
function onDragEnd() {
if (dragTarget) {
- setDidClickSprite(false);
this.parent.off('pointermove');
this.parent.off('pointerup');
dragTarget.alpha = 1;
@@ -83,7 +110,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');
@@ -93,18 +120,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 = {
@@ -112,8 +139,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;
}
}
}
@@ -129,13 +156,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;
@@ -165,7 +194,7 @@
const { width, height } = sprite;
const scale = sprite.scale.x;
const sideLen = (Math.max(width, height) + 10) * scale;
- const color = 0x273c75;
+ const color = app.renderer.backgroundColor === '#f1f2f6' ? 0x273c75 : 0xffffff;
effectHalfCircle = new PIXI.Graphics();
effectHalfCircle.beginFill(color);
@@ -176,7 +205,7 @@
effectHalfCircle.scale.set(1 / scale);
effectRectangle = new PIXI.Graphics();
- effectRectangle.lineStyle(2 * scale, color, 1);
+ effectRectangle.lineStyle(5 * scale, color, 1);
effectRectangle.drawRoundedRect(0, 0, sideLen, sideLen, 16 * scale);
effectRectangle.endFill();
effectRectangle.mask = effectHalfCircle;
@@ -251,6 +280,20 @@
}
}
+export const rotationToNum = (rotation) => {
+ let res = rotation * 180 / Math.PI;
+ if (res < 0) {
+ res += 360;
+ } else if (res > 360) {
+ res -= 360;
+ }
+ return res;
+}
+
+export const rotationParseNum = (num) => {
+ return num * Math.PI / 180;
+}
+
export const findSpriteByUuid = (uuid) => {
return mapContainer?.children?.find(child => child?.data?.uuid === uuid);
}
@@ -271,6 +314,12 @@
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;
}
@@ -279,43 +328,138 @@
return options;
}
-export const adaptScreen = () => {
- if (!mapContainer || !app) {
- return;
- }
- if (mapContainer.children.length === 0) {
+export const fetchMapData = async (curFloor) => {
+ clearMapData();
+ await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
+ const mapItemList = eval(res.data);
+ mapItemList.forEach(item => {
+ let sprite;
+ switch (item.type) {
+ case SENSOR_TYPE.SHELF:
+ sprite = PIXI.Sprite.from(shelf);
+ break;
+ case SENSOR_TYPE.AGV:
+ sprite = PIXI.Sprite.from(agv);
+ break;
+ case SENSOR_TYPE.POINT:
+ sprite = PIXI.Sprite.from(point);
+ break;
+ default:
+ break;
+ }
+ if (sprite) {
+ initSprite(sprite, item.type);
+ // data
+ sprite.data.uuid = item.uuid;
+ sprite.data.no = item.no;
+
+ // dynamical data
+ Object.assign(sprite.data, item.property);
+
+ // graph
+ sprite.position.set(item.positionX, item.positionY);
+ sprite.scale.set(item.scaleX, item.scaleY);
+ sprite.rotation = rotationParseNum(item.rotation);
+ mapContainer.addChild(sprite);
+ }
+ })
+
+ }).catch((error) => {
+ console.error(error);
+ })
+
+}
+
+export const saveMapData = async (intl, floor) => {
+ if (!mapContainer) {
return;
}
- let minX, maxX, minY, maxY;
- for (let sprite of mapContainer.children) {
- let bounds = sprite.getBounds();
- minX = minX !== undefined ? Math.min(minX, bounds.x) : bounds.x;
- minY = minY !== undefined ? Math.min(minY, bounds.y) : bounds.y;
- maxX = maxX !== undefined ? Math.max(maxX, bounds.x + bounds.width) : bounds.x + bounds.width;
- maxY = maxY !== undefined ? Math.max(maxY, bounds.y + bounds.height) : bounds.y + bounds.height;
+ let mapItemList = [];
+ mapContainer?.children.forEach(child => {
+ if (child.data?.uuid) {
+ const { type, uuid, no, ...property } = child.data;
+ mapItemList.push({
+ // data
+ type: type,
+ uuid: uuid,
+ no: no,
+ property: property,
+
+ // graph
+ positionX: child.position.x,
+ positionY: child.position.y,
+ scaleX: child.scale.x,
+ scaleY: child.scale.y,
+ rotation: rotationToNum(child.rotation)
+ })
+ }
+ })
+
+ const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
+ await Http.doPostPromise('api/map/save', {
+ itemList: mapItemList,
+ floor: floor
+ }, (res) => {
+ closeLoading();
+ }).catch((error) => {
+ closeLoading();
+ console.error(error);
+ })
+}
+
+export const clearMapData = (intl) => {
+ if (!mapContainer) {
+ return;
+ }
+ let childList = [];
+ mapContainer.children.forEach(child => {
+ if (child.data?.uuid) {
+ childList.push(child);
+ }
+ })
+ if (childList.length > 0) {
+ childList.forEach(child => {
+ mapContainer.removeChild(child);
+ child.destroy({ children: true, texture: false, baseTexture: false });
+ })
+ childList.forEach((child, index) => {
+ childList[index] = null;
+ });
+ childList = [];
+ }
+}
+
+export const beCenter = (sprite) => {
+ if (!sprite || !app || !mapContainer) {
+ return;
}
- // 鐭╁舰涓績
+ mapContainer.scale.set(1);
+ mapContainer.position.set(0, 0);
+
+ let bounds = sprite.getBounds();
let centerPoint = {
- x: (minX + maxX) / 2 * mapContainer.scale.x,
- y: (minY + maxY) / 2 * mapContainer.scale.y
+ x: bounds.x + bounds.width / 2,
+ y: bounds.y + bounds.height / 2
};
- let newScale = Math.min(
- app.renderer.width / (maxX - minX) * 0.9, // 90%鐨勫搴�
- app.renderer.height / (maxY - minY) * 0.9 // 90%鐨勯珮搴�
- );
-
- new TWEEDLE.Tween(mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
- .to({
- x: newScale,
- y: newScale
- }, 200).start();
+ let targetPos = {
+ x: app.renderer.width / 3 - centerPoint.x * mapContainer.scale.x,
+ y: app.renderer.height / 3 - centerPoint.y * mapContainer.scale.y
+ };
new TWEEDLE.Tween(mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
- .to({
- x: app.renderer.width / 2 - centerPoint.x * newScale,
- y: app.renderer.height / 2 - centerPoint.y * newScale
- }, 200).start();
+ .to(targetPos, 500).start();
+}
+
+export const mapNotify = (msg) => {
+ notify.open({
+ description: msg,
+ duration: 1.5,
+ style: { width: 300 },
+ placement: 'bottom',
+ closeIcon: false,
+ onClick: () => { }
+ });
}
\ No newline at end of file
--
Gitblit v1.9.1