From 1809dba25f489ea01c07a9ecc977d9f408545310 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 一月 2026 09:41:49 +0800
Subject: [PATCH] 电压改电量
---
zy-acs-flow/src/map/tool.js | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 10 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 8966bf2..ad5d6e9 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -399,6 +399,20 @@
.start();
}
+export const findAreaSpriteById = (areaId) => {
+ if (!mapContainer || areaId == null) {
+ return null;
+ }
+ const targetId = String(areaId);
+ for (let i = 0; i < mapContainer.children.length; i += 1) {
+ const child = mapContainer.children[i];
+ if (child?.data?.type === DEVICE_TYPE.AREA && String(child.data?.id) === targetId) {
+ return child;
+ }
+ }
+ return null;
+};
+
export const clearMapData = () => {
if (!mapContainer) {
return;
@@ -583,6 +597,12 @@
if (!mapContainer || !sprite) {
return;
}
+ const data = sprite.data || (sprite.data = {});
+
+ if (data.rotationTween) {
+ data.rotationTween.stop();
+ data.rotationTween = null;
+ }
// origin
let currentRotation = sprite.rotation + rotationOffset;
// target
@@ -598,7 +618,7 @@
// destination
const endRotation = sprite.rotation + rotationDifference;
- new TWEEDLE.Tween(sprite)
+ const rotationTween = new TWEEDLE.Tween(sprite)
.to({ rotation: endRotation }, ANIMATE_DURING_TIME)
.easing(TWEEDLE.Easing.Linear.None)
.onUpdate(() => {
@@ -608,6 +628,12 @@
}
})
.start();
+ data.rotationTween = rotationTween;
+ rotationTween.onComplete(() => {
+ if (data.rotationTween === rotationTween) {
+ data.rotationTween = null;
+ }
+ });
};
export const incrementSpriteNo = (str, incrementValue) => {
@@ -829,13 +855,24 @@
beInsight(agvSprite, setCurSprite);
- new TWEEDLE.Tween(agvSprite.position)
+ if (agvSprite.data.moveTween) {
+ agvSprite.data.moveTween.stop();
+ agvSprite.data.moveTween = null;
+ }
+
+ const moveTween = new TWEEDLE.Tween(agvSprite.position)
.to({
x: codeSprite.position.x,
y: codeSprite.position.y
}, ANIMATE_DURING_TIME)
.easing(TWEEDLE.Easing.Linear.None)
.start();
+ agvSprite.data.moveTween = moveTween;
+ moveTween.onComplete(() => {
+ if (agvSprite.data?.moveTween === moveTween) {
+ agvSprite.data.moveTween = null;
+ }
+ });
}
const drawerAgvPath = (curZone, agvVo) => {
@@ -886,6 +923,14 @@
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.moveTween) {
+ child.data.moveTween.stop();
+ child.data.moveTween = null;
+ }
+ if (child.data.rotationTween) {
+ child.data.rotationTween.stop();
+ child.data.rotationTween = null;
+ }
if (child.data.jobEffect) {
app?.ticker.remove(child.data.jobEffect._onTick);
child.removeChild(child.data.jobEffect);
@@ -911,14 +956,25 @@
const addAreaLabel = (draft, text, from, to) => {
const centerX = (from.x + to.x) / 2;
const centerY = (from.y + to.y) / 2;
- const label = new PIXI.Text(text, {
- fill: themeMode === 'dark' ? '#f1f2f6' : '#535353ff',
- fontSize: 20 / Math.abs(mapContainer.scale.x || 1),
- fontWeight: 'bold',
+ 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.rotation = -rotationParseNum(MAP_DEFAULT_ROTATION);
label.scale.set(MAP_MIRROR ? -1 : 1, 1);
draft.addChild(label);
};
@@ -988,9 +1044,9 @@
draft.name = id ? `area_${id}` : 'area_' + generateID();
draft.zIndex = 0;
if (setCurSprite) {
- draft.lineStyle(2 / Math.abs(mapContainer.scale.x || 1), AREA_BORDER_COLOR, 0.9);
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),
@@ -1001,8 +1057,10 @@
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.cursor = 'pointer';
+ draft.eventMode = 'static';
+ }
if (setCurSprite) {
draft.off('click');
draft.on('click', () => setCurSprite(draft));
@@ -1133,3 +1191,47 @@
clearAreas();
setShowAreas(false);
};
+
+export const focusAreaSprite = (sprite, rightPanelWidth) => {
+ if (!sprite || !app || !mapContainer) {
+ return;
+ }
+
+ const data = sprite.data || {};
+ const start = data.start;
+ const end = data.end;
+ const currentScale = Math.abs(mapContainer.scale.x || 1);
+ const boundsBefore = sprite.getBounds();
+ const width = start && end ? Math.abs(end.x - start.x) : boundsBefore.width / currentScale;
+ const height = start && end ? Math.abs(end.y - start.y) : boundsBefore.height / currentScale;
+
+ const paddedWidth = (width || 1000) * 1.25;
+ const paddedHeight = (height || 1000) * 1.25;
+ const viewportWidth = app.renderer.width || 1920;
+ const viewportHeight = app.renderer.height || 1080;
+ const effectiveViewportWidth = Math.max(1, viewportWidth - rightPanelWidth);
+
+ let focusScale = Math.min(
+ (effectiveViewportWidth * 0.65) / paddedWidth,
+ (viewportHeight * 0.65) / paddedHeight
+ );
+ focusScale = Math.min(Math.max(focusScale, 0.03), 0.25);
+
+ mapContainer.scale.set(MAP_MIRROR ? -focusScale : focusScale, focusScale);
+ mapContainer.position.set(0, 0);
+
+ const bounds = sprite.getBounds();
+ const centerX = bounds.x + bounds.width / 2;
+ const centerY = bounds.y + bounds.height / 2;
+ const visibleCenterX = (viewportWidth - rightPanelWidth) / 2;
+
+ const targetPos = {
+ x: visibleCenterX - centerX,
+ y: viewportHeight / 2 - centerY,
+ };
+
+ new TWEEDLE.Tween(mapContainer.position)
+ .easing(TWEEDLE.Easing.Quadratic.Out)
+ .to(targetPos, 500)
+ .start();
+};
--
Gitblit v1.9.1