From e562c9e75f82703ae1e3a5f90d85c95ad528ce80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 10:38:47 +0800
Subject: [PATCH] #

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

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index ce6acf7..b45a4cf 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -38,6 +38,12 @@
     AGV: "AGV",
 })
 
+export const SHELF_TYPE = Object.freeze({
+    STORE: 0,
+    TRACK: 3,
+    DISABLE: 1,
+})
+
 export const getRealPosition = (x, y, mapContainer) => {
     const rect = app.view.getBoundingClientRect();
     return {
@@ -72,7 +78,7 @@
 }
 
 // sprite be movable from sprite click event
-export const beMovable = (sprite, setDidClickSprite) => {
+export const beMovable = (sprite) => {
     sprite.off('pointerup');
     sprite.off('pointermove');
     sprite.off('pointerdown');
@@ -83,7 +89,6 @@
     let dragTarget;
     function onDragStart(event) {
         if (event.button === 0) {
-            setDidClickSprite(true);
             dragTarget = event.currentTarget;
             mapContainer.parent.off('pointermove');
             mapContainer.parent.on('pointermove', onDragMove, dragTarget);
@@ -101,7 +106,6 @@
 
     function onDragEnd() {
         if (dragTarget) {
-            setDidClickSprite(false);
             this.parent.off('pointermove');
             this.parent.off('pointerup');
             dragTarget.alpha = 1;
@@ -112,7 +116,7 @@
 }
 
 // sprite be beSettings from sprite click event
-export const beSettings = (sprite, setSpriteBySettings, setDidClickSprite) => {
+export const beSettings = (sprite, setSpriteBySettings) => {
     sprite.off('pointerup');
     sprite.off('pointermove');
     sprite.off('pointerdown');
@@ -122,18 +126,18 @@
 
     function onClick(event) {
         setSpriteBySettings(sprite);
-        // setDidClickSprite(true);
     }
 }
 
 // sprites be movable from select box
 // the scale was dynamic
-export const spriteListBeMovable = (selectedSprites, scale, resetFn) => {
+export const spriteListBeMovable = (selectedSprites, resetFn) => {
     if (selectedSprites && selectedSprites.length > 0) {
         let batchMove = false;
         let batchMoveStartPos = null;
 
         const batchMoving = (event) => {
+            const scale = mapContainer.scale.x;
             if (batchMove && batchMoveStartPos) {
                 // offset move val
                 var mouseMovement = {
@@ -141,8 +145,8 @@
                     y: (event.global.y - batchMoveStartPos.y) / scale
                 };
                 for (let sprite of selectedSprites) {
-                    sprite.position.x = sprite.data.batchMoveStartPos.x + mouseMovement.x;
-                    sprite.position.y = sprite.data.batchMoveStartPos.y + mouseMovement.y;
+                    sprite.position.x = sprite.batchMoveStartPos.x + mouseMovement.x;
+                    sprite.position.y = sprite.batchMoveStartPos.y + mouseMovement.y;
                 }
             }
         }
@@ -158,13 +162,15 @@
             mapContainer.parent.off('mousemove');
             mapContainer.parent.off('mouseup');
 
-            resetFn();
+            if (resetFn) {
+                resetFn();
+            }
         }
 
         const batchMoveStart = (event) => {
             batchMoveStartPos = { x: event.data.global.clone().x, y: event.data.global.clone().y };
             selectedSprites.forEach(child => {
-                child.data.batchMoveStartPos = { x: child.position.x, y: child.position.y };
+                child.batchMoveStartPos = { x: child.position.x, y: child.position.y };
             })
 
             batchMove = true;
@@ -253,6 +259,7 @@
     copiedSprite.rotation = sprite.rotation;
     copiedSprite.data = deepCopy(sprite.data);
     copiedSprite.data.uuid = generateID();
+    showSheflType(copiedSprite);
     return copiedSprite;
 }
 
@@ -331,7 +338,7 @@
 export const fetchMapData = async (curFloor) => {
     clearMapData();
     await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
-        const mapItemList = res.data.itemList;
+        const mapItemList = eval(res.data);
         mapItemList.forEach(item => {
             let sprite;
             switch (item.type) {
@@ -356,10 +363,13 @@
                 // dynamical data
                 Object.assign(sprite.data, item.property);
 
+                showSheflType(sprite);
                 // graph
                 sprite.position.set(item.positionX, item.positionY);
                 sprite.scale.set(item.scaleX, item.scaleY);
                 sprite.rotation = rotationParseNum(item.rotation);
+
+                // sprite.tint = '#000';
                 mapContainer.addChild(sprite);
             }
         })
@@ -370,7 +380,7 @@
 
 }
 
-export const saveMapData = async (intl) => {
+export const saveMapData = async (intl, floor) => {
     if (!mapContainer) {
         return;
     }
@@ -397,7 +407,10 @@
     })
 
     const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
-    await Http.doPostPromise('api/map/save', { itemList: mapItemList }, (res) => {
+    await Http.doPostPromise('api/map/save', {
+        itemList: mapItemList,
+        floor: floor
+    }, (res) => {
         closeLoading();
     }).catch((error) => {
         closeLoading();
@@ -459,4 +472,24 @@
         closeIcon: false,
         onClick: () => { }
     });
+}
+
+export const showSheflType = (sprite) => {
+    let showColor;
+    switch (sprite.data.shelfType) {
+        case SHELF_TYPE.STORE:
+            break;
+        case SHELF_TYPE.TRACK:
+            showColor = '#faf6e9';
+            break;
+        case SHELF_TYPE.DISABLE:
+            showColor = '#ffc8c8';
+            break;
+        default:
+            break;
+    }
+    if (showColor) {
+        sprite.tint = showColor;
+    }
+    return showColor;
 }
\ No newline at end of file

--
Gitblit v1.9.1