From de6a34c248036d65a3d6797c83e051acdeb78bf7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 十月 2024 15:18:33 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index e47361a..ade4711 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -8,6 +8,7 @@
DEVICE_SELECTED_EFFECT_PADDING,
DEVICE_SELECTED_EFFECT_COLOR,
POINT_ROUTE_DIRECTION,
+ DEVICE_SPRITE_TINT_DARK,
} from './constants';
import { getRouteList } from './http';
import PointRoute from "./PointRoute";
@@ -51,6 +52,21 @@
export function setThemeMode(param) {
themeMode = param;
+ if (mapContainer) {
+ // mapContainer.children.forEach(child => {
+ // const deviceType = child.data?.type;
+ // if (deviceType) {
+ // if (themeMode === 'dark') {
+ // const tint = DEVICE_SPRITE_TINT_DARK[deviceType]
+ // if (tint) {
+ // child.tint = tint;
+ // }
+ // } else {
+ // DEVICE_SPRITE_TINT[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT[deviceType]);
+ // }
+ // }
+ // })
+ }
}
@@ -108,7 +124,8 @@
default:
break;
}
- DEVICE_SPRITE_TINT[deviceType] != null && (sprite.tint = DEVICE_SPRITE_TINT[deviceType]);
+ const tintType = themeMode === 'dark' ? DEVICE_SPRITE_TINT_DARK : DEVICE_SPRITE_TINT;
+ tintType[deviceType] != null && (sprite.tint = tintType[deviceType]);
if (sprite && deviceType !== DEVICE_TYPE.AGV) {
sprite.blendMode = PIXI.BLEND_MODES.MULTIPLY;
@@ -324,11 +341,15 @@
text.y = 3;
background.addChild(text);
tooltip = new PIXI.Container();
+ tooltip.name = "tooltip";
tooltip.addChild(background);
return tooltip;
}
function onSpriteMouseOver(event) {
+ if (tooltip) {
+ app.stage.removeChild(tooltip);
+ }
tooltip = createSpriteTooltip(this);// this => sprite
tooltip.x = event.data.global.x + 10;
tooltip.y = event.data.global.y + 10;
@@ -479,7 +500,7 @@
const pointRoute = new PointRoute(POINT_ROUTE_DIRECTION[route.direction]);
pointRoute.setPoint(startPoint, endPoint);
pointRoute.clear();
- pointRoute.lineStyle(10, 0x2d3436);
+ pointRoute.lineStyle(Math.max(7, 1.5 * (1 / mapContainer.scale.x)), themeMode === 'light' ? '#ced6e0' : '#535c68');
pointRoute.moveTo(startPoint.position.x, startPoint.position.y);
pointRoute.lineTo(endPoint.position.x, endPoint.position.y);
pointRoute.alpha = 1;
@@ -600,14 +621,16 @@
export const generateDynamicGraphic = (curZone, data, setCurSprite) => {
// console.log("ws", curZone, data);
- for (const agv of data.agvVos) {
- showAgvSprite(curZone, agv, setCurSprite)
+ for (const agvVo of data.agvVos) {
+ // console.log(agvVo);
+ showAgvSprite(curZone, agvVo, setCurSprite);
+ drawerAgvPath(curZone, agvVo);
}
}
-const showAgvSprite = (curZone, agv, setCurSprite) => {
- const { agvNo, code, direction, backpack, battery, ...rest } = agv;
+const showAgvSprite = (curZone, agvVo, setCurSprite) => {
+ const { agvNo, code, direction, backpack, dynamicRoute, battery, ...rest } = agvVo;
if (!code) { return }
const codeSprite = querySprite(DEVICE_TYPE.POINT, code);
if (!codeSprite) { return }
@@ -624,4 +647,41 @@
beInsight(agvSprite, setCurSprite);
// agv no on sprite
}
+}
+
+const drawerAgvPath = (curZone, agvVo) => {
+ if (!mapContainer) {
+ return;
+ }
+ const { agvNo, code: curCode, dynamicRoute } = agvVo;
+ if (dynamicRoute?.length <= 1) {
+ return;
+ }
+
+ const agvPathName = 'agvPath-' + agvNo;
+ let agvPath = mapContainer.getChildByName(agvPathName);
+ if (agvPath) {
+ mapContainer.removeChild(agvPath);
+ }
+ agvPath = new PIXI.Graphics();
+ agvPath.name = agvPathName;
+ agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer.scale.x)), 0x2f68ac, 0.8);
+ agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
+ agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
+
+ let firstNode = true;
+ for (let i = Math.max(0, dynamicRoute.indexOf(curCode)); i < dynamicRoute.length; i++) {
+ const node = dynamicRoute[i];
+ const codeSprite = querySprite(DEVICE_TYPE.POINT, node);
+ if (!codeSprite) { continue };
+ const { x, y } = codeSprite.position;
+ if (firstNode) {
+ agvPath.moveTo(x, y);
+ firstNode = false;
+ } else {
+ agvPath.lineTo(x, y);
+ }
+ }
+
+ mapContainer.addChild(agvPath);
}
\ No newline at end of file
--
Gitblit v1.9.1