From ab886689e2c4ef8db2b0767717d69ebbaf10326c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 29 十一月 2024 16:37:20 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/tool.js | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js index 7afefdb..d50ab3d 100644 --- a/zy-acs-flow/src/map/tool.js +++ b/zy-acs-flow/src/map/tool.js @@ -72,11 +72,10 @@ export const getRealPosition = (x, y) => { - 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 - } + const globalPoint = new PIXI.Point(); + app.renderer.plugins.interaction.mapPositionToPoint(globalPoint, x, y); + const mapPoint = mapContainer.toLocal(globalPoint); + return { mapX: mapPoint.x, mapY: mapPoint.y }; } export const generateSprite = (deviceType, texture) => { @@ -661,7 +660,7 @@ const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees); const showAgvSprite = (curZone, agvVo, setCurSprite) => { - const { agvNo, code, direction, battery, backpack } = agvVo; + const { agvNo, code, direction, battery, backpack, error } = agvVo; if (!code) { return; } const codeSprite = querySprite(DEVICE_TYPE.POINT, code); if (!codeSprite) { return; } @@ -717,6 +716,12 @@ animateRotation(agvSprite, targetRotation + agvRotationOffset, agvRotationOffset); } + if (error) { + agvSprite.tint = 0xff3f34; + } else { + agvSprite.tint = 0xffffff; + } + beInsight(agvSprite, setCurSprite); new TWEEDLE.Tween(agvSprite.position) -- Gitblit v1.9.1