From adcd2efd074eb3160c429ea8a5dfd537db1d1304 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 17 十二月 2025 14:37:06 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 390 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 341 insertions(+), 49 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 946a72a..2bd45c6 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -2,6 +2,7 @@
import * as TWEEDLE from 'tweedle.js';
import {
MAP_DEFAULT_ROTATION,
+ MAP_MIRROR,
DEVICE_TYPE,
DEVICE_Z_INDEX,
AGV_STATUS_MODE,
@@ -11,8 +12,9 @@
DEVICE_SELECTED_EFFECT_COLOR,
POINT_ROUTE_DIRECTION,
ANIMATE_DURING_TIME,
+ AGV_ANGLE_OFFSET_VAL,
} from './constants';
-import { getRouteList } from './http';
+import { getRouteList, fetchAreaList } from './http';
import PointRoute from "./PointRoute";
import shelf from '/map/shelf.svg';
@@ -29,7 +31,7 @@
import ctuLoadedFullBattery from '/map/agv/ctuLoadedFullBattery.svg';
let app, mapContainer, themeMode;
-let selectedSprite, effectCircle, effectTicker;
+let selectedSprite, effectOverlay, effectTicker;
let tooltip;
export function getApp() {
@@ -171,16 +173,17 @@
let batchMoveStartPos = null;
const batchMoving = (event) => {
- const scale = mapContainer.scale.x;
+ const scaleX = mapContainer.scale.x;
+ const scaleY = mapContainer.scale.y;
if (batchMove && batchMoveStartPos) {
// offset move val
var mouseMovement = {
- x: (event.global.x - batchMoveStartPos.x) / scale,
- y: (event.global.y - batchMoveStartPos.y) / scale
+ x: (event.global.x - batchMoveStartPos.x) / scaleX,
+ y: (event.global.y - batchMoveStartPos.y) / scaleY
};
for (let sprite of selectedSprites) {
- sprite.position.x = sprite.batchMoveStartPos.x + mouseMovement.x;
- sprite.position.y = sprite.batchMoveStartPos.y + mouseMovement.y;
+ sprite.position.x = sprite.batchMoveStartPos.x - mouseMovement.x;
+ sprite.position.y = sprite.batchMoveStartPos.y - mouseMovement.y;
}
}
}
@@ -373,7 +376,8 @@
return;
}
- mapContainer.scale.set(0.3);
+ const focusScale = 0.1;
+ mapContainer.scale.set(MAP_MIRROR ? -focusScale : focusScale, focusScale);
mapContainer.position.set(0, 0);
let bounds = sprite.getBounds();
@@ -418,6 +422,38 @@
}
export const showSelectedEffect = (sprite) => {
+ if (!sprite) {
+ return;
+ }
+ // area
+ if (sprite.data?.type === DEVICE_TYPE.AREA) {
+ const { start, end } = sprite.data || {};
+ const hasBounds = start && end;
+ const minX = hasBounds ? Math.min(start.x, end.x) : 0;
+ const maxX = hasBounds ? Math.max(start.x, end.x) : 0;
+ const minY = hasBounds ? Math.min(start.y, end.y) : 0;
+ const maxY = hasBounds ? Math.max(start.y, end.y) : 0;
+ const width = hasBounds ? Math.abs(maxX - minX) : Math.abs(sprite.width);
+ const height = hasBounds ? Math.abs(maxY - minY) : Math.abs(sprite.height);
+ const centerX = hasBounds ? (minX + maxX) / 2 : sprite.x;
+ const centerY = hasBounds ? (minY + maxY) / 2 : sprite.y;
+ const color = DEVICE_SELECTED_EFFECT_COLOR[DEVICE_TYPE.AREA] || (themeMode === 'light' ? '#747d8c' : '#718093');
+ const lineWidth = Math.max(2, 4 / Math.abs(mapContainer.scale.x || 1));
+
+ effectOverlay = new PIXI.Graphics();
+ effectOverlay.lineStyle(lineWidth, color, 1);
+ effectOverlay.drawRect(-width / 2, -height / 2, width, height);
+ effectOverlay.position.set(centerX, centerY);
+ effectOverlay.zIndex = sprite.zIndex + 1;
+ effectOverlay.blendMode = PIXI.BLEND_MODES.NORMAL;
+ mapContainer.addChild(effectOverlay);
+
+ selectedSprite = sprite;
+ effectTicker = null;
+ return;
+ }
+
+ // others
if (!sprite?.texture || !sprite?.texture?.valid) {
return;
}
@@ -436,15 +472,15 @@
const alpha = 1;
- effectCircle = new PIXI.Graphics();
- effectCircle.beginFill(color, alpha);
- effectCircle.drawCircle(0, 0, radius);
- effectCircle.endFill();
- effectCircle.position.set(sprite.x, sprite.y);
- effectCircle.zIndex = -1;
- effectCircle.blendMode = PIXI.BLEND_MODES.NORMAL;
+ effectOverlay = new PIXI.Graphics();
+ effectOverlay.beginFill(color, alpha);
+ effectOverlay.drawCircle(0, 0, radius);
+ effectOverlay.endFill();
+ effectOverlay.position.set(sprite.x, sprite.y);
+ effectOverlay.zIndex = -1;
+ effectOverlay.blendMode = PIXI.BLEND_MODES.NORMAL;
- mapContainer.addChild(effectCircle);
+ mapContainer.addChild(effectOverlay);
selectedSprite = sprite;
@@ -463,8 +499,8 @@
scalingUp = true;
}
}
- effectCircle.scale.set(pulseScale);
- effectCircle.position.set(sprite.x, sprite.y);
+ effectOverlay.scale.set(pulseScale);
+ effectOverlay.position.set(sprite.x, sprite.y);
};
app.ticker.add(effectTicker);
@@ -475,18 +511,11 @@
app.ticker.remove(effectTicker);
effectTicker = null;
}
- if (effectCircle) {
- mapContainer?.removeChild(effectCircle);
- effectCircle = null;
+ if (effectOverlay) {
+ mapContainer?.removeChild(effectOverlay);
+ effectOverlay = null;
}
selectedSprite = null;
-};
-
-export const updateEffect = () => {
- if (!selectedSprite || !effectCircle) {
- return;
- }
- effectCircle.position.set(selectedSprite.x, selectedSprite.y);
};
export const showRoutes = (curZone, setShowRoutes, setLoading) => {
@@ -500,7 +529,7 @@
const pointRoute = new PointRoute(POINT_ROUTE_DIRECTION[route.direction]);
pointRoute.setPoint(startPoint, endPoint);
pointRoute.clear();
- pointRoute.lineStyle(Math.max(7, 2 * (1 / mapContainer.scale.x)), themeMode === 'light' ? '#ced6e0' : '#535c68');
+ pointRoute.lineStyle(Math.max(7, 2 * (1 / Math.abs(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;
@@ -610,7 +639,6 @@
}
}
-
// service ------------------------
export const getAgvStatusMode = (backpack, battery) => {
@@ -653,23 +681,25 @@
}
export function createAgvJobPanel(parentContainer, text) {
+ const panelScale = 4;
+
const panel = new PIXI.Container();
- const sideLen = 50;
+ const sideLen = 50 * panelScale;
const halfCircle = new PIXI.Graphics();
- halfCircle.beginFill(themeMode === 'light' ? '#5c5a5a' : '#eee');
- halfCircle.lineStyle(2, themeMode === 'light' ? '#5c5a5a' : '#eee');
+ halfCircle.beginFill(themeMode === 'light' ? '#333333' : '#eee');
+ halfCircle.lineStyle(2 * panelScale, themeMode === 'light' ? '#333333' : '#eee');
halfCircle.arc(0, 0, sideLen, 0, Math.PI);
halfCircle.endFill();
const rectangle = new PIXI.Graphics();
- rectangle.lineStyle(2, themeMode === 'light' ? '#5c5a5a' : '#eee', 1);
+ rectangle.lineStyle(2 * panelScale, themeMode === 'light' ? '#333333' : '#eee', .8);
rectangle.drawRoundedRect(
-sideLen / 2, // 宸︿笂瑙� x
-sideLen / 2, // 宸︿笂瑙� y
sideLen, // 瀹�
- sideLen - 20, // 楂� (鐣欎竴鐐圭┖闂达紝鐪嬭捣鏉ユ洿鍍忓崐鍦嗗鍣�)
- 16 // 鍦嗚
+ sideLen - (20 * panelScale), // 楂� (鐣欎竴鐐圭┖闂达紝鐪嬭捣鏉ユ洿鍍忓崐鍦嗗鍣�)
+ 16 * panelScale // 鍦嗚
);
rectangle.endFill();
rectangle.mask = halfCircle;
@@ -678,21 +708,20 @@
const msg = new PIXI.Text(text, {
fill: themeMode === 'light' ? '#2b2b2b' : '#eee',
- fontSize: 12,
+ fontSize: 12 * panelScale,
fontFamily: 'MicrosoftYaHei',
- fontWeight: 'bold',
+ fontWeight: 'bolder',
align: 'center',
});
msg.anchor.set(0.5);
- msg.position.set(0, -10);
+ msg.position.set(0, -10 * panelScale);
panel.addChild(msg);
- panel.scale.set(3);
parentContainer.addChild(panel);
let phase = 0;
function onTick(delta) {
- phase += delta / 8; // 鏃嬭浆閫熷害鍙皟
+ phase += delta / 6; // 鏃嬭浆閫熷害鍙皟
phase %= (Math.PI * 2);
halfCircle.rotation = phase;
}
@@ -711,18 +740,14 @@
}
}
-const agvRotationOffsetDegrees = 90;
-const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees);
+const agvRotationOffset = rotationParseNum(AGV_ANGLE_OFFSET_VAL);
const showAgvSprite = (curZone, agvVo, setCurSprite) => {
- const { agvNo, code, direction, battery, jobType, backpack: backpackCount, error } = agvVo;
+ const { agvNo, code, direction, battery, jobType, backpack: backpackCount, slots, error } = agvVo;
if (!code) { return; }
const codeSprite = querySprite(DEVICE_TYPE.POINT, code);
if (!codeSprite) { return; }
- if (agvNo === '12') {
- console.log(backpackCount);
- }
-
+
const targetRotation = rotationParseNum(direction);
// const backpackCount = backpack?.filter(item => item.loaded === true).length || 0;
@@ -749,6 +774,7 @@
});
agvText.anchor.set(0.5, 0.5);
agvText.position.set(0, 8);
+ agvText.scale.set(MAP_MIRROR ? -1 : 1, 1)
agvSprite.addChild(agvText);
agvSprite.updateTextRotation = () => {
@@ -777,7 +803,7 @@
// job effect
if (jobType) {
if (!agvSprite.data.jobEffect) {
- agvSprite.data.jobEffect = createAgvJobPanel(agvSprite, jobType);
+ agvSprite.data.jobEffect = createAgvJobPanel(agvSprite, jobType + " (" + backpackCount + "/" + slots + ")");
agvSprite.data.jobEffect.x = -80;
agvSprite.data.jobEffect.y = 0;
}
@@ -852,3 +878,269 @@
mapContainer.addChild(agvPath);
}
+
+export const removeAgvGraphics = () => {
+ if (!mapContainer) {
+ return;
+ }
+ for (let i = mapContainer.children.length - 1; i >= 0; i--) {
+ const child = mapContainer.children[i];
+ if (child?.data?.type === DEVICE_TYPE.AGV) {
+ if (child.data.jobEffect) {
+ app?.ticker.remove(child.data.jobEffect._onTick);
+ child.removeChild(child.data.jobEffect);
+ child.data.jobEffect.destroy(true);
+ child.data.jobEffect = null;
+ }
+ mapContainer.removeChild(child);
+ child.destroy({ children: true, texture: false, baseTexture: false });
+ } else if (child?.name?.startsWith('agvPath-')) {
+ mapContainer.removeChild(child);
+ child.destroy({ children: true, texture: false, baseTexture: false });
+ }
+ }
+}
+
+
+// area operator -------------------------------
+
+let areaDrawingCleanup = null;
+const AREA_COLOR = 0x3498db;
+const AREA_BORDER_COLOR = 0x6c7a89;
+
+const addAreaLabel = (draft, text, from, to) => {
+ const centerX = (from.x + to.x) / 2;
+ const centerY = (from.y + to.y) / 2;
+ const currentScale = Math.abs(mapContainer.scale.x || 1);
+ const labelStyle = new PIXI.TextStyle({
+ fontFamily: 'Inter, "Segoe UI", sans-serif',
+ fill: themeMode === 'dark' ? '#f1f2f6' : '#606060ff',
+ fontSize: Math.max(16, 20 / currentScale),
+ fontWeight: 600,
+ letterSpacing: 10,
+ // stroke: themeMode === 'dark' ? '#1e272e' : '#ffffff',
+ // strokeThickness: Math.max(1, 2 / currentScale),
+ // dropShadow: true,
+ // dropShadowColor: themeMode === 'dark' ? '#00000066' : '#95a5a6',
+ // dropShadowBlur: 1.5,
+ // dropShadowAngle: Math.PI / 4,
+ // dropShadowDistance: 2,
+ });
+ const label = new PIXI.Text(text ?? '', labelStyle);
+ label.anchor.set(0.5);
+ label.position.set(centerX, centerY);
+ label.rotation = rotationParseNum(MAP_DEFAULT_ROTATION);
+ label.scale.set(MAP_MIRROR ? -1 : 1, 1);
+ draft.addChild(label);
+};
+
+export const updateAreaSpriteName = (sprite, newName) => {
+ if (!sprite || sprite?.data?.type !== DEVICE_TYPE.AREA) {
+ return;
+ }
+ sprite.data.name = newName;
+ const label = sprite.children?.find((child) => child instanceof PIXI.Text);
+ if (label) {
+ label.text = newName ?? '';
+ }
+};
+
+export const removeAreaSprite = (sprite) => {
+ if (!sprite || sprite?.data?.type !== DEVICE_TYPE.AREA) {
+ return;
+ }
+ const parent = sprite.parent || mapContainer;
+ if (parent) {
+ parent.removeChild(sprite);
+ }
+ sprite.destroy({ children: true, texture: false, baseTexture: false });
+};
+
+export const loadAreas = (curZone, setCurSprite, callback) => {
+ if (!mapContainer) return;
+ clearAreas();
+ fetchAreaList(curZone).then((areas) => {
+ areas.forEach((area) => {
+ const { name, color, id } = area || {};
+ const start = area?.start;
+ const end = area?.end;
+ if (!start || !end || !name || !id) {
+ return;
+ }
+ const graphics = createAreaGraphic({ name, start, end, color, id }, setCurSprite);
+ if (graphics) {
+ mapContainer.addChild(graphics);
+ }
+ });
+ if (callback) {
+ callback(areas);
+ }
+ });
+};
+
+export const clearAreas = () => {
+ if (!mapContainer) return;
+ for (let i = mapContainer.children.length - 1; i >= 0; i--) {
+ const child = mapContainer.children[i];
+ if (child?.data?.type === DEVICE_TYPE.AREA) {
+ mapContainer.removeChild(child);
+ child.destroy({ children: true, texture: false, baseTexture: false });
+ }
+ }
+};
+
+const createAreaGraphic = ({ name, start, end, color, id }, setCurSprite) => {
+ if (!mapContainer) return null;
+ const from = start || { x: 0, y: 0 };
+ const to = end || { x: 0, y: 0 };
+ const areaColor = color || AREA_COLOR;
+
+ const draft = new PIXI.Graphics();
+ draft.name = id ? `area_${id}` : 'area_' + generateID();
+ draft.zIndex = 0;
+ if (setCurSprite) {
+ draft.zIndex = DEVICE_Z_INDEX.AREA;
+ }
+ draft.lineStyle(1 / Math.abs(mapContainer.scale.x || 1), AREA_BORDER_COLOR, 0.9);
+ draft.beginFill(areaColor, 0.18);
+ draft.drawRect(
+ Math.min(from.x, to.x),
+ Math.min(from.y, to.y),
+ Math.abs(from.x - to.x),
+ Math.abs(from.y - to.y),
+ );
+ draft.endFill();
+ addAreaLabel(draft, name, from, to);
+ draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.AREA, name, color: areaColor, id, start: from, end: to };
+ draft.eventMode = 'static';
+ draft.cursor = 'pointer';
+ if (setCurSprite) {
+ draft.off('click');
+ draft.on('click', () => setCurSprite(draft));
+ }
+ return draft;
+};
+
+export const startAreaDrawing = ({ promptText, onComplete, onFinish, setCurSprite } = {}) => {
+ if (!mapContainer || !mapContainer.parent) {
+ return false;
+ }
+ if (areaDrawingCleanup) {
+ areaDrawingCleanup();
+ }
+
+ const stage = mapContainer.parent;
+ stage.off('mousedown');
+ const draft = new PIXI.Graphics();
+ draft.name = 'area_' + generateID();
+ draft.zIndex = DEVICE_Z_INDEX.AREA;
+
+ let drawing = false;
+ let startPoint = null;
+ const areaColor = AREA_COLOR;
+ const originalCursor = stage.cursor;
+ stage.cursor = 'crosshair';
+
+ const drawRect = (from, to) => {
+ draft.clear();
+ const strokeColor = areaColor;
+ draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), AREA_BORDER_COLOR, 0.9);
+ draft.beginFill(strokeColor, 0.18);
+ draft.drawRect(
+ Math.min(from.x, to.x),
+ Math.min(from.y, to.y),
+ Math.abs(from.x - to.x),
+ Math.abs(from.y - to.y),
+ );
+ draft.endFill();
+ };
+
+ const cleanupListeners = () => {
+ stage.off('pointermove', handleMove);
+ stage.off('pointerup', handleUp);
+ stage.off('pointerdown', handleDown);
+ areaDrawingCleanup = null;
+ stage.cursor = originalCursor;
+ if (onFinish) {
+ onFinish();
+ }
+ };
+ areaDrawingCleanup = cleanupListeners;
+
+ const handleDown = (event) => {
+ if (event.button !== undefined && event.button !== 0) {
+ return;
+ }
+ drawing = true;
+ startPoint = mapContainer.toLocal(event.data.global);
+ mapContainer.addChild(draft);
+ };
+
+ const handleMove = (event) => {
+ if (!drawing || !startPoint) {
+ return;
+ }
+ const cur = mapContainer.toLocal(event.data.global);
+ drawRect(startPoint, cur);
+ };
+
+ const handleUp = (event) => {
+ if (!drawing || !startPoint) {
+ return;
+ }
+ drawing = false;
+ const endPoint = mapContainer.toLocal(event.data.global);
+ drawRect(startPoint, endPoint);
+ cleanupListeners();
+
+ const areaName = prompt(promptText || 'Please enter area name');
+ if (!areaName) {
+ mapContainer.removeChild(draft);
+ draft.destroy({ children: true, texture: false, baseTexture: false });
+ return;
+ }
+
+ addAreaLabel(draft, areaName, startPoint, endPoint);
+ draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.AREA, name: areaName, color: areaColor, start: startPoint, end: endPoint };
+ draft.eventMode = 'static';
+ draft.cursor = 'pointer';
+ if (setCurSprite) {
+ draft.off('click');
+ draft.on('click', () => setCurSprite(draft));
+ }
+
+ if (onComplete) {
+ onComplete({
+ name: areaName,
+ start: startPoint,
+ end: endPoint,
+ color: areaColor,
+ graphics: draft
+ });
+ }
+ };
+
+ stage.on('pointerdown', handleDown);
+ stage.on('pointermove', handleMove);
+ stage.on('pointerup', handleUp);
+ return true;
+};
+
+export const cancelAreaDrawing = () => {
+ if (areaDrawingCleanup) {
+ areaDrawingCleanup();
+ }
+};
+
+export const showAreas = (curZone, setShowAreas, setLoading) => {
+ setLoading(true);
+ loadAreas(curZone, null, (areas) => {
+ setLoading(false);
+ setShowAreas(true);
+ })
+};
+
+export const hideAreas = (curZone, setShowAreas) => {
+ clearAreas();
+ setShowAreas(false);
+};
--
Gitblit v1.9.1