From af4966f51a946130059ab6be7520c699c7994da7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 14:43:02 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 58fb2b2..ec2a53f 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -5,9 +5,11 @@
 import { API_TIMEOUT } from '@/config/setting'
 import agv from '/public/img/map/agv.svg'
 import shelf from '/public/img/map/shelf.png'
+import point from '/public/img/map/point.svg'
 
 let app = null;
 let mapContainer = null;
+let notify = null;
 let effectTick, effectHalfCircle, effectRectangle;
 
 export function syncApp(param) {
@@ -16,6 +18,10 @@
 
 export function syncMapContainer(param) {
     mapContainer = param;
+}
+
+export function syncNotify(param) {
+    notify = param;
 }
 
 export function getMapContainer() {
@@ -28,6 +34,7 @@
 
 export const SENSOR_TYPE = Object.freeze({
     SHELF: "SHELF",
+    POINT: "POINT",
     AGV: "AGV",
 })
 
@@ -187,7 +194,7 @@
     const { width, height } = sprite;
     const scale = sprite.scale.x;
     const sideLen = (Math.max(width, height) + 10) * scale;
-    const color = 0x273c75;
+    const color = app.renderer.backgroundColor === '#f1f2f6' ? 0x273c75 : 0xffffff;
 
     effectHalfCircle = new PIXI.Graphics();
     effectHalfCircle.beginFill(color);
@@ -198,7 +205,7 @@
     effectHalfCircle.scale.set(1 / scale);
 
     effectRectangle = new PIXI.Graphics();
-    effectRectangle.lineStyle(2 * scale, color, 1);
+    effectRectangle.lineStyle(5 * scale, color, 1);
     effectRectangle.drawRoundedRect(0, 0, sideLen, sideLen, 16 * scale);
     effectRectangle.endFill();
     effectRectangle.mask = effectHalfCircle;
@@ -307,6 +314,12 @@
                     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;
         }
@@ -315,10 +328,10 @@
     return options;
 }
 
-export const fetchMapData = async (intl) => {
+export const fetchMapData = async (curFloor) => {
     clearMapData();
-    await Http.doPostPromise('api/map/list', {}, (res) => {
-        const mapItemList = res.data.itemList;
+    await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
+        const mapItemList = eval(res.data);
         mapItemList.forEach(item => {
             let sprite;
             switch (item.type) {
@@ -328,6 +341,9 @@
                 case SENSOR_TYPE.AGV:
                     sprite = PIXI.Sprite.from(agv);
                     break;
+                case SENSOR_TYPE.POINT:
+                    sprite = PIXI.Sprite.from(point);
+                    break;
                 default:
                     break;
             }
@@ -336,6 +352,9 @@
                 // data
                 sprite.data.uuid = item.uuid;
                 sprite.data.no = item.no;
+
+                // dynamical data
+                Object.assign(sprite.data, item.property);
 
                 // graph
                 sprite.position.set(item.positionX, item.positionY);
@@ -351,7 +370,7 @@
 
 }
 
-export const saveMapData = async (intl) => {
+export const saveMapData = async (intl, floor) => {
     if (!mapContainer) {
         return;
     }
@@ -359,11 +378,13 @@
     let mapItemList = [];
     mapContainer?.children.forEach(child => {
         if (child.data?.uuid) {
+            const { type, uuid, no, ...property } = child.data;
             mapItemList.push({
                 // data
-                type: child.data.type,
-                uuid: child.data.uuid,
-                no: child.data.no,
+                type: type,
+                uuid: uuid,
+                no: no,
+                property: property,
 
                 // graph
                 positionX: child.position.x,
@@ -376,7 +397,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();
@@ -427,4 +451,15 @@
 
     new TWEEDLE.Tween(mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
         .to(targetPos, 500).start();
+}
+
+export const mapNotify = (msg) => {
+    notify.open({
+        description: msg,
+        duration: 1.5,
+        style: { width: 300 },
+        placement: 'bottom',
+        closeIcon: false,
+        onClick: () => { }
+    });
 }
\ No newline at end of file

--
Gitblit v1.9.1