From e1e1a2d934f6bd630abb67784ba18d38f6bea28e Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 03 十二月 2025 16:53:13 +0800
Subject: [PATCH] #
---
src/main/webapp/components/MapCanvas.js | 189 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 47 deletions(-)
diff --git a/src/main/webapp/components/MapCanvas.js b/src/main/webapp/components/MapCanvas.js
index 9c69671..8a6a55e 100644
--- a/src/main/webapp/components/MapCanvas.js
+++ b/src/main/webapp/components/MapCanvas.js
@@ -21,15 +21,23 @@
pixiShelfMap: new Map(),
pixiTrackMap: new Map(),
pixiDevpTextureMap: new Map(),
+ pixiCrnColorTextureMap: new Map(),
+ pixiDevpTextureMap: new Map(),
+ pixiCrnColorTextureMap: new Map(),
+ pixiRgvColorTextureMap: new Map(),
crnList: [],
rgvList: [],
objectsContainer: null,
objectsContainer2: null,
+ tracksContainer: null,
+ shelvesContainer: null,
graphicsCrn: null,
graphicsCrnTrack: null,
graphicsRgvTrack: null,
graphicsRgv: null,
- timer: null
+ timer: null,
+ adjustLabelTimer: null,
+ isSwitchingFloor: false
}
},
mounted() {
@@ -96,7 +104,8 @@
},
methods: {
createMap() {
- this.pixiApp = new PIXI.Application({ backgroundColor: 0xF5F7F9FF, antialias: true });
+ this.pixiApp = new PIXI.Application({ backgroundColor: 0xF5F7F9, antialias: false, powerPreference: 'high-performance', autoDensity: true, resolution: Math.min(window.devicePixelRatio || 1, 2) });
+ PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.LINEAR;
this.$refs.pixiView.appendChild(this.pixiApp.view);
this.pixiApp.view.style.width = '100%';
this.pixiApp.view.style.height = '100%';
@@ -107,13 +116,16 @@
this.graphicsRgvTrack = this.createTrackTexture(25,25);
this.objectsContainer = new PIXI.Container();
this.objectsContainer2 = new PIXI.Container();
+ this.tracksContainer = new PIXI.ParticleContainer(10000, { scale: true, position: true, rotation: false, uvs: false, alpha: false });
+ this.shelvesContainer = new PIXI.ParticleContainer(10000, { scale: true, position: true, rotation: false, uvs: false, alpha: false });
+ this.tracksContainer.autoResize = true;
+ this.shelvesContainer.autoResize = true;
+ this.pixiApp.stage.addChild(this.tracksContainer);
+ this.pixiApp.stage.addChild(this.shelvesContainer);
this.pixiApp.stage.addChild(this.objectsContainer);
this.pixiApp.stage.addChild(this.objectsContainer2);
- this.pixiApp.stage.sortableChildren = true;
- this.objectsContainer.sortableChildren = true;
- this.objectsContainer2.sortableChildren = true;
- this.objectsContainer.zIndex = 10;
- this.objectsContainer2.zIndex = 20;
+ this.pixiApp.renderer.roundPixels = true;
+
//*******************鎷栧姩鐢诲竷*******************
let stageOriginalPos;
@@ -151,7 +163,7 @@
const newPosX = sx - worldX * newZoom;
const newPosY = sy - worldY * newZoom;
this.pixiApp.stage.setTransform(newPosX, newPosY, newZoom, newZoom, 0, 0, 0, 0, 0);
- this.adjustLabelScale();
+ this.scheduleAdjustLabels();
});
//*******************缂╂斁鐢诲竷*******************
@@ -188,8 +200,12 @@
},
changeFloor(lev) {
this.currentLev = lev;
+ this.isSwitchingFloor = true;
+ if (this.adjustLabelTimer) { clearTimeout(this.adjustLabelTimer); this.adjustLabelTimer = null; }
this.objectsContainer.removeChildren();
this.objectsContainer2.removeChildren();
+ if (this.tracksContainer) { this.tracksContainer.removeChildren(); }
+ if (this.shelvesContainer) { this.shelvesContainer.removeChildren(); }
this.crnList = [];
this.rgvList = [];
this.pixiCrnMap = new Map();
@@ -301,7 +317,13 @@
//鍥炶皟
});
if (sprite == null) { continue; }
- this.objectsContainer.addChild(sprite);
+ if (sprite._kind === 'shelf') {
+ this.shelvesContainer.addChild(sprite);
+ } else if (sprite._kind === 'crn-track' || sprite._kind === 'rgv-track') {
+ this.tracksContainer.addChild(sprite);
+ } else {
+ this.objectsContainer.addChild(sprite);
+ }
this.pixiStageList[index][idx] = sprite;
}
});
@@ -311,14 +333,13 @@
let sprite = new PIXI.Sprite(this.graphicsCrn);
const deviceNo = this.getDeviceNo(item.value);
const taskNo = this.getTaskNo(item.value);
- const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#ffffff', stroke: '#000000', strokeThickness: 2 });
+ const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#000000', stroke: '#ffffff', strokeThickness: 1 });
const txt = taskNo > 0 ? (deviceNo + "(" + taskNo + ")") : String(deviceNo);
const text = new PIXI.Text(txt, style);
text.anchor.set(0.5);
text.position.set(sprite.width / 2, sprite.height / 2);
sprite.addChild(text);
sprite.textObj = text;
- sprite.zIndex = 1;
sprite.position.set(item.posX, item.posY);
sprite.interactive = true; // 蹇呴』瑕佽缃墠鑳芥帴鏀朵簨浠�
sprite.buttonMode = true; // 璁╁厜鏍囧湪hover鏃跺彉涓烘墜鍨嬫寚閽�
@@ -345,14 +366,13 @@
let sprite = new PIXI.Sprite(this.graphicsRgv);
const deviceNo = this.getDeviceNo(item.value);
const taskNo = this.getTaskNo(item.value);
- const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#ffffff', stroke: '#000000', strokeThickness: 2 });
+ const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#000000', stroke: '#ffffff', strokeThickness: 1 });
const txt = taskNo > 0 ? (deviceNo + "(" + taskNo + ")") : String(deviceNo);
const text = new PIXI.Text(txt, style);
text.anchor.set(0.5);
text.position.set(sprite.width / 2, sprite.height / 2);
sprite.addChild(text);
sprite.textObj = text;
- sprite.zIndex = 1;
sprite.position.set(item.posX, item.posY);
sprite.interactive = true; // 蹇呴』瑕佽缃墠鑳芥帴鏀朵簨浠�
sprite.buttonMode = true; // 璁╁厜鏍囧湪hover鏃跺彉涓烘墜鍨嬫寚閽�
@@ -362,27 +382,40 @@
const id = parseInt(deviceNo, 10);
this.$emit('rgv-click', id);
});
+ let rowIndexForRgv = 0;
+ for (let r = 0; r < map.length; r++) {
+ if (map[r].length > 0) {
+ const rowY = map[r][0].posY;
+ if (Math.abs(rowY - item.posY) < 0.5) { rowIndexForRgv = r; break; }
+ }
+ }
+ sprite.rowIndex = rowIndexForRgv;
this.pixiRgvMap.set(parseInt(deviceNo), sprite);
this.objectsContainer2.addChild(sprite);
});
- const b1 = this.objectsContainer.getLocalBounds();
- const b2 = this.objectsContainer2.getLocalBounds();
- const minX = Math.min(b1.x, b2.x);
- const minY = Math.min(b1.y, b2.y);
- const maxX = Math.max(b1.x + b1.width, b2.x + b2.width);
- const maxY = Math.max(b1.y + b1.height, b2.y + b2.height);
- const contentW = Math.max(0, maxX - minX);
- const contentH = Math.max(0, maxY - minY);
+ let contentW = 0;
+ let contentH = 0;
+ for (let r = 0; r < map.length; r++) {
+ for (let c = 0; c < map[r].length; c++) {
+ const cell = map[r][c];
+ if (!cell || cell.type === 'merge') { continue; }
+ const right = cell.posX + cell.width;
+ const bottom = cell.posY + cell.height;
+ if (right > contentW) { contentW = right; }
+ if (bottom > contentH) { contentH = bottom; }
+ }
+ }
const vw = this.pixiApp.view.width;
const vh = this.pixiApp.view.height;
let scale = Math.min(vw / contentW, vh / contentH) * 0.95;
if (!isFinite(scale) || scale <= 0) { scale = 1; }
- const posX = (vw - contentW * scale) / 2 - minX * scale;
- const posY = (vh - contentH * scale) / 2 - minY * scale;
+ const posX = (vw - contentW * scale) / 2;
+ const posY = (vh - contentH * scale) / 2;
this.pixiApp.stage.setTransform(posX, posY, scale, scale, 0, 0, 0, 0, 0);
this.adjustLabelScale();
this.map = map;
+ this.isSwitchingFloor = false;
},
initWidth(map) {
let maxRow = map.length;
@@ -452,6 +485,7 @@
});
},
getCrnInfo() {
+ if (this.isSwitchingFloor) { return; }
$.ajax({
url: baseUrl + "/console/latest/data/crn",
headers: { 'token': localStorage.getItem('token') },
@@ -494,19 +528,24 @@
}
if (!targetCell) { continue; }
const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
- if (window.gsap) {
+ const dx = Math.abs(targetX - sprite.x);
+ if (dx < 1) {
+ } else if (dx < 5) {
+ sprite.x = targetX;
+ } else if (window.gsap) {
window.gsap.killTweensOf(sprite);
- window.gsap.to(sprite, { x: targetX, duration: 0.5, ease: "power1.inOut" });
+ window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
} else {
sprite.x = targetX;
}
}
}
- this.adjustLabelScale();
+ this.scheduleAdjustLabels();
}
});
},
getSiteInfo() {
+ if (this.isSwitchingFloor) { return; }
$.ajax({
url: baseUrl + "/console/latest/data/station",
headers: { 'token': localStorage.getItem('token') },
@@ -515,6 +554,7 @@
});
},
getRgvInfo() {
+ if (this.isSwitchingFloor) { return; }
$.ajax({
url: baseUrl + "/console/latest/data/rgv",
headers: { 'token': localStorage.getItem('token') },
@@ -532,14 +572,7 @@
this.updateRgvTextureColor(sprite, statusColor);
let trackSiteNo = parseInt(rgvs[i].trackSiteNo, 10);
if (!trackSiteNo || trackSiteNo <= 0) { continue; }
- let rowIndex = -1;
- for (let r = 0; r < this.map.length; r++) {
- if (this.map[r].length > 0) {
- const rowY = this.map[r][0].posY;
- if (Math.abs(rowY - sprite.y) < 0.5) { rowIndex = r; break; }
- }
- }
- if (rowIndex === -1) { rowIndex = 0; }
+ let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : 0;
let targetCell = null;
for (let c = 0; c < this.map[rowIndex].length; c++) {
const cell = this.map[rowIndex][c];
@@ -555,15 +588,19 @@
}
if (!targetCell) { continue; }
const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
- if (window.gsap) {
+ const dx = Math.abs(targetX - sprite.x);
+ if (dx < 1) {
+ } else if (dx < 5) {
+ sprite.x = targetX;
+ } else if (window.gsap) {
window.gsap.killTweensOf(sprite);
- window.gsap.to(sprite, { x: targetX, duration: 0.5, ease: "power1.inOut" });
+ window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
} else {
sprite.x = targetX;
}
}
}
- this.adjustLabelScale();
+ this.scheduleAdjustLabels();
}
});
},
@@ -762,12 +799,41 @@
return rt;
},
updateRgvTextureColor(sprite, color) {
- const tex = this.createRgvTextureColoredDevice(sprite.width, sprite.height, color);
+ const key = Math.round(sprite.width) + '-' + Math.round(sprite.height) + '-' + color;
+ let tex = this.pixiRgvColorTextureMap.get(key);
+ if (!tex) {
+ tex = this.createRgvTextureColoredDevice(Math.round(sprite.width), Math.round(sprite.height), color);
+ this.pixiRgvColorTextureMap.set(key, tex);
+ }
sprite.texture = tex;
+ if (sprite.textObj) {
+ const fill = this.getContrastColor(color);
+ sprite.textObj.style.fill = fill;
+ sprite.textObj.style.stroke = (fill === '#000000' ? '#ffffff' : '#000000');
+ sprite.textObj.style.strokeThickness = 1;
+ }
},
updateCrnTextureColor(sprite, color) {
- const tex = this.createCrnTextureColoredDevice(sprite.width, sprite.height, color);
+ const key = Math.round(sprite.width) + '-' + Math.round(sprite.height) + '-' + color;
+ let tex = this.pixiCrnColorTextureMap.get(key);
+ if (!tex) {
+ tex = this.createCrnTextureColoredDevice(Math.round(sprite.width), Math.round(sprite.height), color);
+ this.pixiCrnColorTextureMap.set(key, tex);
+ }
sprite.texture = tex;
+ if (sprite.textObj) {
+ const fill = this.getContrastColor(color);
+ sprite.textObj.style.fill = fill;
+ sprite.textObj.style.stroke = (fill === '#000000' ? '#ffffff' : '#000000');
+ sprite.textObj.style.strokeThickness = 1;
+ }
+ },
+ getContrastColor(color) {
+ const r = (color >> 16) & 0xFF;
+ const g = (color >> 8) & 0xFF;
+ const b = color & 0xFF;
+ const brightness = (r * 299 + g * 587 + b * 114) / 1000;
+ return brightness > 150 ? '#000000' : '#ffffff';
},
getCrnStatusColor(status) {
if (status === "machine-auto") { return 0x21BA45; }
@@ -790,14 +856,19 @@
let value = item.value;
if (item.type == 'shelf') {
sprite = this.createShelfSprite(item.width, item.height);
+ sprite._kind = 'shelf';
} else if (item.type == 'devp') {
- const graphics = this.getContainer('devp', item.width, item.height);
- const texture = this.pixiApp.renderer.generateTexture(graphics);
+ const key = Math.round(item.width) + '-' + Math.round(item.height) + '-' + 0x00ff7f;
+ let texture = this.pixiDevpTextureMap.get(key);
+ if (!texture) {
+ texture = this.createDevpTextureColoredRect(Math.round(item.width), Math.round(item.height), 0x00ff7f);
+ this.pixiDevpTextureMap.set(key, texture);
+ }
sprite = new PIXI.Sprite(texture);
sprite._kind = 'devp';
let siteId = this.getStationId(value);
if (siteId === -1) { siteId = item.data; }
- const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 10, fill: '#ffffff', stroke: '#000000', strokeThickness: 2 });
+ const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 10, fill: '#000000', stroke: '#ffffff', strokeThickness: 1 });
const text = new PIXI.Text(String(siteId), style);
text.anchor.set(0.5);
text.position.set(sprite.width / 2, sprite.height / 2);
@@ -814,19 +885,16 @@
});
} else if (item.type == 'crn') {
sprite = this.createTrackSprite(item.width, item.height);
- sprite.zIndex = 0;
+ sprite._kind = 'crn-track';
if (this.getDeviceNo(value) > 0) { this.crnList.push(item); }
} else if (item.type == 'rgv') {
sprite = this.createTrackSprite(item.width, item.height);
- sprite.zIndex = 0;
+ sprite._kind = 'rgv-track';
if (this.getDeviceNo(value) > 0) { this.rgvList.push(item); }
} else {
return null;
}
sprite.position.set(item.posX, item.posY);
- sprite.interactive = true;
- sprite.buttonMode = true;
- sprite.on('pointerdown', (e) => { pointerDownEvent(e) });
return sprite;
},
updateColor(sprite, color) {
@@ -842,6 +910,10 @@
if (textObj) {
if (textObj.parent !== sprite) { sprite.addChild(textObj); }
textObj.position.set(sprite.width / 2, sprite.height / 2);
+ const fill = this.getContrastColor(color);
+ textObj.style.fill = fill;
+ textObj.style.stroke = (fill === '#000000' ? '#ffffff' : '#000000');
+ textObj.style.strokeThickness = 1;
}
return;
}
@@ -865,6 +937,10 @@
adjustLabelScale() {
const s = this.pixiApp && this.pixiApp.stage ? (this.pixiApp.stage.scale.x || 1) : 1;
const minPx = 14;
+ const vw = this.pixiApp.view.width;
+ const vh = this.pixiApp.view.height;
+ const pos = this.pixiApp.stage.position;
+ const margin = 50;
this.pixiStaMap && this.pixiStaMap.forEach((sprite) => {
const textObj = sprite && sprite.textObj;
if (!textObj) { return; }
@@ -874,6 +950,10 @@
scale = Math.max(0.8, Math.min(scale, 3));
textObj.scale.set(scale);
textObj.position.set(sprite.width / 2, sprite.height / 2);
+ const sx = pos.x + sprite.x * s;
+ const sy = pos.y + sprite.y * s;
+ const on = sx >= -margin && sy >= -margin && sx <= vw + margin && sy <= vh + margin;
+ textObj.visible = (s >= 0.25) && on;
});
this.pixiCrnMap && this.pixiCrnMap.forEach((sprite) => {
const textObj = sprite && sprite.textObj;
@@ -884,6 +964,10 @@
scale = Math.max(0.8, Math.min(scale, 3));
textObj.scale.set(scale);
textObj.position.set(sprite.width / 2, sprite.height / 2);
+ const sx = pos.x + sprite.x * s;
+ const sy = pos.y + sprite.y * s;
+ const on = sx >= -margin && sy >= -margin && sx <= vw + margin && sy <= vh + margin;
+ textObj.visible = (s >= 0.25) && on;
});
this.pixiRgvMap && this.pixiRgvMap.forEach((sprite) => {
const textObj = sprite && sprite.textObj;
@@ -894,7 +978,18 @@
scale = Math.max(0.8, Math.min(scale, 3));
textObj.scale.set(scale);
textObj.position.set(sprite.width / 2, sprite.height / 2);
+ const sx = pos.x + sprite.x * s;
+ const sy = pos.y * s + pos.y;
+ const on = sx >= -margin && sy >= -margin && sx <= vw + margin && sy <= vh + margin;
+ textObj.visible = (s >= 0.25) && on;
});
+ },
+ scheduleAdjustLabels() {
+ if (this.adjustLabelTimer) { clearTimeout(this.adjustLabelTimer); }
+ this.adjustLabelTimer = setTimeout(() => {
+ this.adjustLabelScale();
+ this.adjustLabelTimer = null;
+ }, 20);
}
}
});
--
Gitblit v1.9.1