From 70a47fd91119a6b40147b8bf094ec70f09a998e3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 12 十月 2024 14:35:34 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/http.js | 63 ++++++++++++++++--------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js index aea7868..89d6129 100644 --- a/zy-acs-flow/src/map/http.js +++ b/zy-acs-flow/src/map/http.js @@ -3,9 +3,14 @@ import { DEVICE_TYPE } from './constants'; let notify; +let mapContainer; export function setNotify(param) { notify = param; +} + +export function setMapContainer(param) { + mapContainer = param; } export const fetchMapData = async (zoneId) => { @@ -17,46 +22,42 @@ 'Content-Type': 'application/x-www-form-urlencoded' } }).then((res) => { - const { code, msg, data } = res.data; + const { code, msg, data: { data } } = res.data; if (code === 200) { const mapItemList = eval(data); + mapItemList.forEach(item => { + if (item.type !== DEVICE_TYPE.AGV) { + const sprite = Tool.generateSprite(item.type); + if (sprite) { + Tool.initSprite(sprite, item.type); + // data + sprite.data.uuid = item.uuid; + sprite.data.no = item.no; + + // dynamical data + Object.assign(sprite.data, item.property); + + // graph + setTimeout(() => { + sprite.position.set(item.positionX, item.positionY); + sprite.scale.set(item.scaleX, item.scaleY); + sprite.rotation = Tool.rotationParseNum(item.rotation); + }, 50); + + mapContainer.addChild(sprite); + } + } + }) + } else { + notify.error(msg); } - - // mapItemList.forEach(item => { - // if (!( - // item.type === SENSOR_TYPE.SHUTTLE - // || item.type === SENSOR_TYPE.AGV - // )) { - // const sprite = generateSprite(item.type); - // 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); - - // showSheflType(sprite); - // // graph - // setTimeout(() => { - // sprite.position.set(item.positionX, item.positionY); - // sprite.scale.set(item.scaleX, item.scaleY); - // sprite.rotation = rotationParseNum(item.rotation); - // }, 50); - - // mapContainer.addChild(sprite); - // } - // } - // }) - }).catch((error) => { notify.error(error.message); console.error(error.message); }) } -export const saveMapData = async (zone, mapContainer) => { +export const saveMapData = async (zone) => { if (!mapContainer) { return; } -- Gitblit v1.9.1