From 943f2c6e0343a74f376e9f0f2f7ebbfae2a30ce3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 15:35:12 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 9408f1b..fa9e530 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -112,7 +112,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,7 +122,6 @@
 
     function onClick(event) {
         setSpriteBySettings(sprite);
-        // setDidClickSprite(true);
     }
 }
 
@@ -194,7 +193,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);
@@ -205,7 +204,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;
@@ -328,10 +327,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) {
@@ -370,7 +369,7 @@
 
 }
 
-export const saveMapData = async (intl) => {
+export const saveMapData = async (intl, floor) => {
     if (!mapContainer) {
         return;
     }
@@ -397,7 +396,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();

--
Gitblit v1.9.1