From 53f4cc4d271fc723f7a9a2f3de89c4ea8ede49a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 13:30:01 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/utils.js | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index e77f217..07585aa 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -613,11 +613,12 @@
return row + '-' + bay + '-' + lev;
}
-export const updateMapStatusInRealTime = (data) => {
+export const updateMapStatusInRealTime = (data, curFloorGetter) => {
+ const curFloor = curFloorGetter();
+ if (isNullOfUndefined(curFloor)) { return; }
const mapVo = JSON.parse(data);
// shuttle
for (const shuttleVo of mapVo.shuttleVos) {
-
const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleVo.shuttleNo);
if (!shuttle && !shuttleVo.curLocNo) { continue; }
const { row, bay, lev } = parseLocNo(shuttleVo.curLocNo);
@@ -641,13 +642,13 @@
return;
}
- let graphics = mapContainer.getChildByName('preTravelPath');
- if (graphics) mapContainer.removeChild(graphics);
+ let pathLine = mapContainer.getChildByName('preTravelPath');
+ if (pathLine) mapContainer.removeChild(pathLine);
- graphics = new PIXI.Graphics();
- graphics.name = 'preTravelPath';
- graphics.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
- graphics.zIndex = 9999;
+ pathLine = new PIXI.Graphics();
+ pathLine.name = 'preTravelPath';
+ pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
+ pathLine.zIndex = 9999;
for (let i = 0; i < path.length; i++) {
const { row, bay, lev } = parseLocNo(path[i]);
const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
@@ -657,10 +658,10 @@
let x = position.x;
let y = position.y;
if (i === 0) {
- graphics.moveTo(x, y);
+ pathLine.moveTo(x, y);
} else {
- graphics.lineTo(x, y);
+ pathLine.lineTo(x, y);
}
}
- mapContainer.addChild(graphics);
+ mapContainer.addChild(pathLine);
}
\ No newline at end of file
--
Gitblit v1.9.1