From a5074b41b5e97e22c912e44350214a838f031831 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 14:52:00 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console2.html | 174 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 146 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/watch/console2.html b/src/main/webapp/views/watch/console2.html
index 5657f1c..429a839 100644
--- a/src/main/webapp/views/watch/console2.html
+++ b/src/main/webapp/views/watch/console2.html
@@ -149,13 +149,9 @@
that.getMap(this.currentLev)
}, 1000);
- // this.consoleInterval = setInterval(() => {
- // this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
- // this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
- // this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
- // this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- // // this.getCodeData()//鑾峰彇鏉＄爜
- // }, 1000)
+ this.consoleInterval = setInterval(() => {
+ this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
+ }, 1000)
},
initLev() {
@@ -227,7 +223,7 @@
// 浠嶨raphics瀵硅薄鍒涘缓涓�涓汗鐞�
// graphicsShelf = pixiApp.renderer.generateTexture(getContainer('shelf'));
// graphicsDevp = pixiApp.renderer.generateTexture(getContainer('devp'));
- graphicsCrn = createCrnTexture(25,25);
+ // graphicsCrn = createCrnTexture(40,40);
graphicsCrnTrack = createTrackTexture(25,25);
// 鍒涘缓涓�涓鍣ㄦ潵绠＄悊澶ф壒閲忕殑鏄剧ず瀵硅薄
@@ -352,7 +348,7 @@
map.forEach((item, index) => {
for(let idx = 0;idx < item.length;idx++){
- let val = item[idx];
+ let val = item[idx]
let cellWidth = val.cellWidth / 40;
let cellHeight = val.cellHeight / 8;
@@ -378,12 +374,11 @@
if(val.colSpan > 1) {
for(let i = 1;i < val.colSpan;i++){
let nextMerge = map[index][idx + i];
- if(nextMerge.type != 'merge'){
- continue;
- }
+ if (!nextMerge) { continue; }
let mergeCellWidth = nextMerge.cellWidth / 40;
mergeWidth += mergeCellWidth;
+ nextMerge.isMergedPart = true;
}
val.width = mergeWidth;
@@ -401,13 +396,31 @@
map.forEach((row, rowIndex) => {
let xCursor = 0;
+ let anchorX = 0;
for (let colIndex = 0; colIndex < row.length; colIndex++) {
let val = row[colIndex];
+
let cellWidth = val.width;
let cellHeight = val.height;
+ if (val.isMergedPart) {
+ val.posX = anchorX;
+ val.posY = yOffsets[rowIndex];
+ continue;
+ }
+
val.posX = xCursor;
val.posY = yOffsets[rowIndex];
+ anchorX = xCursor;
+
+ if (val.colSpan > 1) {
+ for (let i = 1; i < val.colSpan; i++) {
+ const next = row[colIndex + i];
+ if (!next) { break; }
+ next.posX = anchorX;
+ next.posY = yOffsets[rowIndex];
+ }
+ }
xCursor += cellWidth;
}
@@ -448,24 +461,39 @@
});
crnList.forEach((item) => {
- let sprite = new PIXI.Sprite(graphicsCrn);
- const deviceNo = getDeviceNo(item.value);
- const taskNo = getTaskNo(item.value);
- const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#ffffff', stroke: '#000000', strokeThickness: 2 });
- 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;
+ if(graphicsCrn == null) {
+ graphicsCrn = createCrnTexture(item.width * 0.9,item.height * 0.9);
+ }
+ let sprite = new PIXI.Sprite(graphicsCrn);
+ const deviceNo = getDeviceNo(item.value);
+ const taskNo = getTaskNo(item.value);
+ const style = new PIXI.TextStyle({ fontFamily: 'Arial', fontSize: 12, fill: '#ffffff', stroke: '#000000', strokeThickness: 2 });
+ 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鏃跺彉涓烘墜鍨嬫寚閽�
+ sprite.position.set(item.posX, item.posY);
+ sprite.interactive = true; // 蹇呴』瑕佽缃墠鑳芥帴鏀朵簨浠�
+ sprite.buttonMode = true; // 璁╁厜鏍囧湪hover鏃跺彉涓烘墜鍨嬫寚閽�
- pixiCrnMap.set(parseInt(deviceNo), sprite);
- objectsContainer2.addChild(sprite);
+ let rowIndexForCrn = 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) {
+ rowIndexForCrn = r;
+ break;
+ }
+ }
+ }
+ sprite.rowIndex = rowIndexForCrn;
+
+ pixiCrnMap.set(parseInt(deviceNo), sprite);
+ objectsContainer2.addChild(sprite);
})
@@ -713,6 +741,96 @@
}
})
},
+ getCrnInfo() {
+ let that = this
+ //鑾峰彇鍫嗗灈鏈烘暟鎹�
+ $.ajax({
+ url: baseUrl + "/console/latest/data/crn",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var crns = res.data;
+ for (var i = 0; i < crns.length; i++) {
+ const id = parseInt(crns[i].crnId);
+ const sprite = pixiCrnMap.get(id);
+ if (!sprite) { continue; }
+
+ const taskNo = crns[i].taskNo;
+ if (taskNo != null && taskNo > 0) {
+ sprite.textObj.text = id + "(" + taskNo + ")";
+ } else {
+ sprite.textObj.text = String(id);
+ }
+
+ const status = crns[i].crnStatus;
+ if (status === "machine-auto") {
+ sprite.tint = 0x21BA45;
+ } else if (status === "machine-un-auto") {
+ sprite.tint = 0xBBBBBB;
+ } else if (status === "machine-error") {
+ sprite.tint = 0xDB2828;
+ } else if (status === "machine-p-move") {
+ sprite.tint = 0xF2C037;
+ } else {
+ sprite.tint = 0xFFFFFF;
+ }
+
+ let bay = parseInt(crns[i].bay, 10);
+ if (isNaN(bay) || bay < 1 || bay === -2) {
+ bay = 1;
+ }
+
+ let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : -1;
+ if (rowIndex === -1) {
+ for (let r = 0; r < that.map.length; r++) {
+ if (that.map[r].length > 0) {
+ const rowY = that.map[r][0].posY;
+ if (Math.abs(rowY - sprite.y) < 0.5) {
+ rowIndex = r;
+ break;
+ }
+ }
+ }
+ if (rowIndex === -1) { rowIndex = 0; }
+ }
+
+ let targetCell = null;
+ let crnCount = 0;
+ for (let c = 0; c < that.map[rowIndex].length; c++) {
+ const cell = that.map[rowIndex][c];
+ if (cell && cell.type === 'crn') {
+ crnCount++;
+ if (crnCount === bay) {
+ targetCell = cell;
+ break;
+ }
+ }
+ }
+ if (!targetCell) {
+ for (let c = that.map[rowIndex].length - 1; c >= 0; c--) {
+ const cell = that.map[rowIndex][c];
+ if (cell && cell.type === 'crn') {
+ targetCell = cell;
+ break;
+ }
+ }
+ }
+ if (!targetCell) { continue; }
+
+ const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
+
+ gsap.killTweensOf(sprite);
+ gsap.to(sprite, { x: targetX, duration: 0.5, ease: "power1.inOut" });
+ }
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ });
+ },
}
})
--
Gitblit v1.9.1