From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |  180 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 134 insertions(+), 46 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3d68464..cefb134 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -6,8 +6,10 @@
 
 import agv from '/public/img/map/agv.svg'
 import shelf from '/public/img/map/shelf.png'
+import conveyor from '/public/img/map/conveyor.png'
 import point from '/public/img/map/point.svg'
 import shuttle from '/public/img/map/shuttle.svg'
+import { log } from 'three/examples/jsm/nodes/Nodes.js';
 
 let app = null;
 let mapContainer = null;
@@ -37,12 +39,15 @@
 export const SENSOR_TYPE = Object.freeze({
     SHELF: "SHELF",
     SHUTTLE: "SHUTTLE",
+    LIFT: "LIFT",
+    CONVEYOR: "CONVEYOR",
     POINT: "POINT",
     AGV: "AGV",
 })
 
 export const SENSOR_ZINDEX = Object.freeze({
     SHELF: 1,
+    CONVEYOR: 1,
     POINT: 1,
     TRAVEL_PATH: 80,
     SHUTTLE: 100,
@@ -52,7 +57,10 @@
 export const SHELF_TYPE = Object.freeze({
     STORE: 0,
     TRACK: 3,
-    DISABLE: 1,
+    LIFT: 67,
+    CHARGE: 5,
+    CONVEYOR: 4,
+    DISABLE: -1,
 })
 
 export const NOTIFY_TYPE = Object.freeze({
@@ -91,6 +99,12 @@
             sprite.width = 60;
             sprite.height = 60;
             sprite.zIndex = SENSOR_ZINDEX.SHELF;
+            break;
+        case SENSOR_TYPE.CONVEYOR:
+            sprite = new PIXI.Sprite(PIXI.Texture.from(conveyor, { resourceOptions: { scale: 5 } }));
+            sprite.width = 112;
+            sprite.height = 63;
+            sprite.zIndex = SENSOR_ZINDEX.CONVEYOR;
             break;
         case SENSOR_TYPE.POINT:
             sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 5 } }));
@@ -309,7 +323,7 @@
         return
     }
     const { width, height } = sprite;
-    const scale = sprite.scale.x;
+    const scale = sprite?.scale.x;
     const sideLen = (Math.max(width, height) + 10) * scale;
     const scaledWidth = sideLen * (1 / scale);
     const scaledHeight = sideLen * (1 / scale);
@@ -335,7 +349,6 @@
 }
 
 export const copySprite = (sprite) => {
-    // const copiedSprite = new PIXI.Sprite(sprite.texture);
     const copiedSprite = generateSprite(sprite.data.type)
     initSprite(copiedSprite);
     copiedSprite.position.set(sprite.position.x, sprite.position.y);
@@ -391,42 +404,6 @@
     return mapContainer?.children?.find(child => child?.data?.uuid === uuid);
 }
 
-export const sensorTypeSelectOptions = (intl) => {
-    let options = [];
-    Object.entries(SENSOR_TYPE).forEach(([key, value]) => {
-        switch (key) {
-            case SENSOR_TYPE.SHELF:
-                options.push({
-                    value: value,
-                    label: intl.formatMessage({ id: 'map.sensor.type.shelf', defaultMessage: '璐ф灦' })
-                })
-                break;
-            case SENSOR_TYPE.SHUTTLE:
-                options.push({
-                    value: value,
-                    label: intl.formatMessage({ id: 'map.sensor.type.shuttle', defaultMessage: '绌挎杞�' })
-                })
-                break;
-            case SENSOR_TYPE.AGV:
-                options.push({
-                    value: value,
-                    label: intl.formatMessage({ id: 'map.sensor.type.agv', defaultMessage: '鏃犱汉灏忚溅' })
-                })
-                break;
-            case SENSOR_TYPE.POINT:
-                options.push({
-                    value: value,
-                    label: intl.formatMessage({ id: 'map.sensor.type.point', defaultMessage: '瀹氫綅鐐�' })
-                })
-                break;
-            default:
-                break;
-        }
-
-    })
-    return options;
-}
-
 export const fetchMapFloor = async () => {
     const res = await Http.doPost('api/map/floor/list');
     if (res.code === 200) {
@@ -457,9 +434,11 @@
 
                     showSheflType(sprite);
                     // graph
-                    sprite.position.set(item.positionX, item.positionY);
-                    sprite.scale.set(item.scaleX, item.scaleY);
-                    sprite.rotation = rotationParseNum(item.rotation);
+                    setTimeout(() => {
+                        sprite.position.set(item.positionX, item.positionY);
+                        sprite.scale.set(item.scaleX, item.scaleY);
+                        sprite.rotation = rotationParseNum(item.rotation);
+                    }, 50);
 
                     mapContainer.addChild(sprite);
                 }
@@ -578,6 +557,15 @@
         case SHELF_TYPE.TRACK:
             showColor = '#faf6e9';
             break;
+        case SHELF_TYPE.LIFT:
+            showColor = '#EBDEF0';
+            break;
+        case SHELF_TYPE.CHARGE:
+            showColor = '#D4EFDF';
+            break;
+        case SHELF_TYPE.CONVEYOR:
+            showColor = '#54FF9F';
+            break;
         case SHELF_TYPE.DISABLE:
             showColor = '#ffc8c8';
             break;
@@ -635,6 +623,9 @@
         // shuttle
         showShuttle(shuttleVo, curFloor, setCurSPrite);
     }
+
+    showLockPath(mapVo.lockPath, curFloor, setCurSPrite);
+    showConveyorSta(mapVo.conveyorSta, curFloor, setCurSPrite);
 }
 
 export const drawTravelPath = (shuttleVo, curFloor) => {
@@ -650,14 +641,13 @@
 
     pathLine = new PIXI.Graphics();
     pathLine.name = pathLineName;
-    pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 1);
+    pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0x3498db, 0.8);
     pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
     let firstNode = true;
-    for (let i = path.indexOf(curLocNo) - 1; i < path.length; i++) {
+    for (let i = Math.max(0, path.indexOf(curLocNo)); i < path.length; i++) {
         const { row, bay, lev } = parseLocNo(path[i]);
         if (Number(lev) !== curFloor) { continue }
         const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
-
         if (!shelf) { continue };
         let position = shelf.position;
         let x = position.x;
@@ -690,11 +680,109 @@
         mapContainer.addChild(shuttle);
         viewFeature(shuttle, setCurSPrite);
     }
- 
+
     new TWEEDLE.Tween(shuttle?.position).easing(TWEEDLE.Easing.Linear.None).to({
         x: shelf.position.x,
         y: shelf.position.y
     }, 1000).onUpdate(() => {
         updateEffect(shuttle);
     }).start();
+}
+
+export const showLockPath = (lockPath, curFloor, setCurSPrite) => {
+    const pathLineName = 'lockPath';
+    let pathLine = mapContainer.getChildByName(pathLineName);
+    if (pathLine) {
+        mapContainer.removeChild(pathLine);
+    }
+
+    for (let i = 0; i < lockPath.length; i++) {
+        const item = lockPath[i]
+        if(item.lev != curFloor) {continue}
+        const nodes = item.path;
+
+        pathLine = new PIXI.Graphics();
+        pathLine.name = pathLineName;
+        pathLine.lineStyle(3 * (1 / mapContainer.scale.x), 0xff0000, 0.8);
+        pathLine.zIndex = SENSOR_ZINDEX.TRAVEL_PATH;
+        let firstNode = true;
+    
+        for (let i = 0; i < nodes.length; i++) {
+            const node = nodes[i];
+            const shelf = querySprite(SENSOR_TYPE.SHELF, node.x + '-' + node.y);
+            if (!shelf) { continue }
+    
+            let position = shelf.position;
+            let x = position.x;
+            let y = position.y;
+            if (firstNode) {
+                pathLine.moveTo(x, y);
+                firstNode = false;
+            } else {
+                pathLine.lineTo(x, y);
+            }
+    
+        }
+    
+        mapContainer.addChild(pathLine);
+    }
+}
+
+export const showConveyorSta = (conveyorSta, curFloor, setCurSPrite) => {
+    for (let i = 0; i < conveyorSta.length; i++) {
+        const sta = conveyorSta[i];
+        if (!sta.locNo) { continue }
+        const { row, bay, lev } = parseLocNo(sta.locNo);
+        if (Number(lev) !== curFloor) { continue }
+        const sprite = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
+        if (!sprite) { continue }
+        if (sprite.data.conveyorNo !== sta.siteNo) { continue }
+
+        const conveyorName = 'conveyorSta-' + sprite.data.conveyorNo;
+        let conveyorChild = sprite.getChildByName(conveyorName);
+        if (conveyorChild) {
+            sprite.removeChild(conveyorChild);
+        }
+
+        let textColor;
+        let staText;
+        let positionX = -11;
+        let positionY = -6;
+        if (sta.siteStatusType$ == 'site-auto-run') {
+            textColor = 0xfa51f6;
+            staText = sprite.data.conveyorNo;
+        } else if (sta.siteStatusType$ == 'site-unauto') {
+            textColor = 0xb8b8b8;
+            staText = sprite.data.conveyorNo;
+        } else if (sta.siteStatusType$ == 'site-auto-id') {
+            textColor = 0xc4c40;
+            staText = sprite.data.conveyorNo + '(' + sta.taskNo + ')';
+            positionX = -20;
+            positionY = -6;
+        } else if (sta.siteStatusType$ == 'site-auto-run-id') {
+            textColor = 0xfc3030;
+            staText = sprite.data.conveyorNo + '(' + sta.taskNo + ')';
+            positionX = -20;
+            positionY = -6;
+        }else {
+            textColor = '#54FF9F';
+            staText = sprite.data.conveyorNo;
+        }
+
+        const text = new PIXI.Text(staText, {
+            fill: 0x000000,
+            fontSize: 13,
+            fontFamily: 'MicrosoftYaHei',
+        });
+        text.name = conveyorName;
+        text.position.set(positionX, positionY);
+        sprite.addChild(text);
+        sprite.textObj = text;
+        sprite.tint = textColor;
+        // sprite.tint = showColor;
+        // let position = shelf.position;
+        // let x = position.x;
+        // let y = position.y;
+        // conveyorChild.lineTo(x, y);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1