From 9483baffba9a24a2a36fc8739fc65b59317d9142 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 14:18:46 +0800
Subject: [PATCH] 队列拆分
---
zy-acs-flow/src/map/tool.js | 176 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 44 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index d50ab3d..a22da46 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -1,15 +1,18 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
import {
+ MAP_DEFAULT_ROTATION,
+ MAP_MIRROR,
DEVICE_TYPE,
DEVICE_Z_INDEX,
AGV_STATUS_MODE,
DEVICE_SPRITE_TINT,
+ DEVICE_SPRITE_TINT_DARK,
DEVICE_SELECTED_EFFECT_PADDING,
DEVICE_SELECTED_EFFECT_COLOR,
POINT_ROUTE_DIRECTION,
- DEVICE_SPRITE_TINT_DARK,
ANIMATE_DURING_TIME,
+ AGV_ANGLE_OFFSET_VAL,
} from './constants';
import { getRouteList } from './http';
import PointRoute from "./PointRoute";
@@ -54,19 +57,16 @@
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]);
- // }
- // }
- // })
+ mapContainer.children.forEach(child => {
+ const deviceType = child.data?.type;
+ if (deviceType) {
+ if (themeMode === 'dark') {
+ DEVICE_SPRITE_TINT_DARK[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT_DARK[deviceType]);
+ } else {
+ DEVICE_SPRITE_TINT[deviceType] != null && (child.tint = DEVICE_SPRITE_TINT[deviceType]);
+ }
+ }
+ })
}
}
@@ -173,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;
}
}
}
@@ -375,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();
@@ -491,22 +493,30 @@
effectCircle.position.set(selectedSprite.x, selectedSprite.y);
};
-export const showRoutes = (curZone, setShowRoutes) => {
- setShowRoutes(true);
- getRouteList(curZone, (routeList) => {
- routeList.forEach(route => {
- const startPoint = querySprite(DEVICE_TYPE.POINT, route.startCodeStr);
- const endPoint = querySprite(DEVICE_TYPE.POINT, route.endCodeStr);
- 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.moveTo(startPoint.position.x, startPoint.position.y);
- pointRoute.lineTo(endPoint.position.x, endPoint.position.y);
- pointRoute.alpha = 1;
- mapContainer.addChild(pointRoute);
- })
- })
+export const showRoutes = (curZone, setShowRoutes, setLoading) => {
+ setLoading(true);
+ getRouteList(
+ curZone,
+ (routeList) => {
+ routeList.forEach(route => {
+ const startPoint = querySprite(DEVICE_TYPE.POINT, route.startCodeStr);
+ const endPoint = querySprite(DEVICE_TYPE.POINT, route.endCodeStr);
+ const pointRoute = new PointRoute(POINT_ROUTE_DIRECTION[route.direction]);
+ pointRoute.setPoint(startPoint, endPoint);
+ pointRoute.clear();
+ 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;
+ mapContainer.addChild(pointRoute);
+ })
+ setLoading(false);
+ setShowRoutes(true);
+ },
+ () => {
+ setLoading(false);
+ },
+ )
};
export const hideRoutes = (curZone, setShowRoutes) => {
@@ -646,6 +656,56 @@
}
}
+export function createAgvJobPanel(parentContainer, text) {
+ const panelScale = 4;
+
+ const panel = new PIXI.Container();
+
+ const sideLen = 50 * panelScale;
+ const halfCircle = new PIXI.Graphics();
+ 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 * panelScale, themeMode === 'light' ? '#333333' : '#eee', .8);
+ rectangle.drawRoundedRect(
+ -sideLen / 2, // 宸︿笂瑙� x
+ -sideLen / 2, // 宸︿笂瑙� y
+ sideLen, // 瀹�
+ sideLen - (20 * panelScale), // 楂� (鐣欎竴鐐圭┖闂达紝鐪嬭捣鏉ユ洿鍍忓崐鍦嗗鍣�)
+ 16 * panelScale // 鍦嗚
+ );
+ rectangle.endFill();
+ rectangle.mask = halfCircle;
+
+ panel.addChild(rectangle, halfCircle);
+
+ const msg = new PIXI.Text(text, {
+ fill: themeMode === 'light' ? '#2b2b2b' : '#eee',
+ fontSize: 12 * panelScale,
+ fontFamily: 'MicrosoftYaHei',
+ fontWeight: 'bolder',
+ align: 'center',
+ });
+ msg.anchor.set(0.5);
+ msg.position.set(0, -10 * panelScale);
+
+ panel.addChild(msg);
+ parentContainer.addChild(panel);
+
+ let phase = 0;
+ function onTick(delta) {
+ phase += delta / 6; // 鏃嬭浆閫熷害鍙皟
+ phase %= (Math.PI * 2);
+ halfCircle.rotation = phase;
+ }
+ app.ticker.add(onTick);
+
+ panel._onTick = onTick;
+ return panel;
+}
// dynamic graphic ----------------
@@ -656,17 +716,16 @@
}
}
-const agvRotationOffsetDegrees = 90;
-const agvRotationOffset = rotationParseNum(agvRotationOffsetDegrees);
+const agvRotationOffset = rotationParseNum(AGV_ANGLE_OFFSET_VAL);
const showAgvSprite = (curZone, agvVo, setCurSprite) => {
- const { agvNo, code, direction, battery, backpack, 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; }
const targetRotation = rotationParseNum(direction);
- const backpackCount = backpack?.filter(item => item.loaded === true).length || 0;
+ // const backpackCount = backpack?.filter(item => item.loaded === true).length || 0;
let agvSprite = querySprite(DEVICE_TYPE.AGV, agvNo);
if (!agvSprite) {
@@ -690,12 +749,13 @@
fill: 0x000000,
});
agvText.anchor.set(0.5, 0.5);
- agvText.position.set(0, 5);
+ agvText.position.set(0, 8);
+ agvText.scale.set(MAP_MIRROR ? -1 : 1, 1)
agvSprite.addChild(agvText);
agvSprite.updateTextRotation = () => {
if (agvText && agvSprite) {
- agvText.rotation = -agvSprite.rotation;
+ agvText.rotation = -agvSprite.rotation - rotationParseNum(MAP_DEFAULT_ROTATION);
}
};
agvSprite.updateTextRotation();
@@ -716,10 +776,31 @@
animateRotation(agvSprite, targetRotation + agvRotationOffset, agvRotationOffset);
}
+ // job effect
+ if (jobType) {
+ if (!agvSprite.data.jobEffect) {
+ agvSprite.data.jobEffect = createAgvJobPanel(agvSprite, jobType + " (" + backpackCount + "/" + slots + ")");
+ agvSprite.data.jobEffect.x = -80;
+ agvSprite.data.jobEffect.y = 0;
+ }
+ if (agvSprite.data.jobEffect) {
+ agvSprite.data.jobEffect.rotation = -agvSprite.rotation - rotationParseNum(MAP_DEFAULT_ROTATION);
+ }
+ } else {
+ if (agvSprite.data.jobEffect) {
+ app.ticker.remove(agvSprite.data.jobEffect._onTick);
+ agvSprite.removeChild(agvSprite.data.jobEffect);
+ agvSprite.data.jobEffect.destroy(true);
+ agvSprite.data.jobEffect = null;
+ }
+ }
+
if (error) {
agvSprite.tint = 0xff3f34;
} else {
- agvSprite.tint = 0xffffff;
+ agvSprite.tint = themeMode === 'dark'
+ ? DEVICE_SPRITE_TINT_DARK[DEVICE_TYPE.AGV]
+ : DEVICE_SPRITE_TINT[DEVICE_TYPE.AGV];
}
beInsight(agvSprite, setCurSprite);
@@ -738,6 +819,9 @@
return;
}
const { agvNo, code: curCode, dynamicRoute } = agvVo;
+ if (!dynamicRoute || dynamicRoute.indexOf(curCode) === -1) {
+ return;
+ }
const agvPathName = 'agvPath-' + agvNo;
let agvPath = mapContainer.getChildByName(agvPathName);
@@ -746,7 +830,11 @@
}
agvPath = new PIXI.Graphics();
agvPath.name = agvPathName;
- agvPath.lineStyle(Math.max(20, 4 * (1 / mapContainer?.scale.x || 1)), 0x2f68ac, 0.8);
+ agvPath.lineStyle(
+ Math.max(200, 4 * (1 / mapContainer?.scale.x || 1)),
+ themeMode === 'dark' ? 0x40739e : 0x2f68ac,
+ 0.8,
+ );
agvPath.zIndex = DEVICE_Z_INDEX.DYNAMIC_ROUTE;
// agvPath.blendMode = PIXI.BLEND_MODES.NORMAL;
--
Gitblit v1.9.1