From bcaa1de4805147e8d0962d0bf5465bb0abcd9a99 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 09:52:58 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index bf7a16f..6fef781 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() {
@@ -188,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);
@@ -199,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;
@@ -308,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;
         }
@@ -329,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;
             }
@@ -337,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);
@@ -360,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,
@@ -428,4 +448,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