From 7c32ab19d3bf4c601212314a1617bbb51c5fdd2a Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 29 三月 2024 16:01:36 +0800 Subject: [PATCH] # --- zy-asrs-flow/src/pages/map/utils.js | 117 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 97 insertions(+), 20 deletions(-) diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js index 0eb32f1..b85af4e 100644 --- a/zy-asrs-flow/src/pages/map/utils.js +++ b/zy-asrs-flow/src/pages/map/utils.js @@ -3,9 +3,11 @@ 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' +import shuttle from '/public/img/map/shuttle.svg' let app = null; let mapContainer = null; @@ -34,8 +36,16 @@ export const SENSOR_TYPE = Object.freeze({ SHELF: "SHELF", + SHUTTLE: "SHUTTLE", POINT: "POINT", AGV: "AGV", +}) + +export const SENSOR_ZINDEX = Object.freeze({ + SHELF: 1, + POINT: 1, + SHUTTLE: 100, + AGV: 100, }) export const SHELF_TYPE = Object.freeze({ @@ -44,12 +54,53 @@ DISABLE: 1, }) +export const NOTIFY_TYPE = Object.freeze({ + OPEN: 'open', + SUCCESS: 'success', + INFO: 'info', + WARNING: 'warning', + ERROR: 'error', +}) + export const getRealPosition = (x, y, mapContainer) => { const rect = app.view.getBoundingClientRect(); return { mapX: (x - rect.left) / mapContainer.scale.x - mapContainer.x / mapContainer.scale.x, mapY: (y - rect.top) / mapContainer.scale.y - mapContainer.y / mapContainer.scale.y } +} + +export const generateSprite = (sensorType) => { + let sprite; + switch (sensorType) { + case SENSOR_TYPE.SHUTTLE: + sprite = new PIXI.Sprite(PIXI.Texture.from(shuttle, { resourceOptions: { scale: 5 } })); + sprite.width = 50; + sprite.height = 50; + sprite.zIndex = SENSOR_ZINDEX.SHUTTLE; + break; + case SENSOR_TYPE.AGV: + sprite = new PIXI.Sprite(PIXI.Texture.from(agv, { resourceOptions: { scale: 5 } })); + sprite.width = 50; + sprite.height = 50; + sprite.zIndex = SENSOR_ZINDEX.AGV; + break; + case SENSOR_TYPE.SHELF: + sprite = new PIXI.Sprite(PIXI.Texture.from(shelf, { resourceOptions: { scale: 1 } })); + sprite.width = 60; + sprite.height = 60; + sprite.zIndex = SENSOR_ZINDEX.SHELF; + break; + case SENSOR_TYPE.POINT: + sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 5 } })); + sprite.width = 10; + sprite.height = 10; + sprite.zIndex = SENSOR_ZINDEX.POINT; + break; + default: + break; + } + return sprite; } export const initSprite = (sprite, type) => { @@ -209,12 +260,14 @@ effectHalfCircle.endFill(); effectHalfCircle.position.set(sprite.x, sprite.y); effectHalfCircle.scale.set(1 / scale); + effectHalfCircle.zIndex = 9999; effectRectangle = new PIXI.Graphics(); effectRectangle.lineStyle(5 * scale, color, 1); effectRectangle.drawRoundedRect(0, 0, sideLen, sideLen, 16 * scale); effectRectangle.endFill(); effectRectangle.mask = effectHalfCircle; + effectRectangle.zIndex = 9999; const scaledWidth = sideLen * (1 / scale); const scaledHeight = sideLen * (1 / scale); @@ -252,14 +305,17 @@ } export const copySprite = (sprite) => { - const copiedSprite = new PIXI.Sprite(sprite.texture); + // const copiedSprite = new PIXI.Sprite(sprite.texture); + const copiedSprite = generateSprite(sprite.data.type) initSprite(copiedSprite); 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(); - showSheflType(copiedSprite); + if (copiedSprite.data.type === SENSOR_TYPE.SHELF) { + showSheflType(copiedSprite); + } return copiedSprite; } @@ -315,6 +371,12 @@ 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, @@ -335,25 +397,21 @@ 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) => { 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; - } + const sprite = generateSprite(item.type); if (sprite) { initSprite(sprite, item.type); // data @@ -376,7 +434,6 @@ }).catch((error) => { console.error(error); }) - } export const saveMapData = async (intl, floor) => { @@ -462,8 +519,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 }, @@ -501,4 +558,24 @@ resolve(true); }, time); }); -}; \ No newline at end of file +}; + +export const isNullOfUndefined = (param) => { + if (null === param || undefined === param) { + return true; + } else { + return false; + } +} + +export const parseLocNo = (locNo) => { + if (!locNo || typeof locNo !== 'string') { + return null; + } + const locParseArr = locNo.split('-'); + return { + row: locParseArr?.[0], + bay: locParseArr?.[1], + lev: locParseArr?.[2], + } +} \ No newline at end of file -- Gitblit v1.9.1