From 545a514c25c791b9f0354cd2e49c09b5d75a029f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 02 十二月 2024 15:19:00 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 7afefdb..eda7c3f 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -1,6 +1,7 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
import {
+ MAP_DEFAULT_ROTATION,
DEVICE_TYPE,
DEVICE_Z_INDEX,
AGV_STATUS_MODE,
@@ -72,11 +73,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 +661,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; }
@@ -696,7 +696,7 @@
agvSprite.updateTextRotation = () => {
if (agvText && agvSprite) {
- agvText.rotation = -agvSprite.rotation;
+ agvText.rotation = -agvSprite.rotation - rotationParseNum(MAP_DEFAULT_ROTATION);
}
};
agvSprite.updateTextRotation();
@@ -717,6 +717,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