From e5ff577d91179d9f0ae1f689d182bb2e0465fca1 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 08 十一月 2024 13:48:12 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/http.js | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js index f78cfe5..b8a6cfd 100644 --- a/zy-acs-flow/src/map/http.js +++ b/zy-acs-flow/src/map/http.js @@ -24,7 +24,10 @@ const { code, msg, data: { rcsStatus, common, point } } = res.data; if (code === 200) { setRcsStatus(rcsStatus); - const mapItemList = [...eval(common), ...eval(point)]; + const commonList = common ? eval(common) : []; + const pointList = point ? eval(point) : []; + const mapItemList = [...commonList, ...pointList]; + mapItemList.forEach(item => { if (item.type !== DEVICE_TYPE.AGV) { const sprite = Tool.generateSprite(item.type); @@ -46,7 +49,7 @@ // support switch (item.type) { case DEVICE_TYPE.POINT: - sprite.scale.set(0.65, 0.65); + sprite.scale.set(0.85, 0.85); break default: break @@ -75,7 +78,7 @@ mapContainer.children.forEach(child => { if (child.data?.uuid) { const { type, uuid, no, ...property } = child.data; - if (type !== DEVICE_TYPE.AGV && type !== DEVICE_TYPE.POINT) { + if (type !== DEVICE_TYPE.AGV && type !== DEVICE_TYPE.POINT && type !== DEVICE_TYPE.ROUTE) { sprites.push({ // graph positionX: child.position.x, -- Gitblit v1.9.1