From fe044e84d18dee6ebf1244e622b2ad0c918872cb Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 23:57:55 +0800
Subject: [PATCH] 固废弹框数据传递

---
 src/components/LayerController/logic/WasteSolid.js |   33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index cd3d48a..977eaac 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -1,7 +1,7 @@
 /**
  * 鍥哄簾
  */
-
+const WasteSolidIndex = require('@components/BaseNav/WasteSolid/WasteSolidIndex').default
 // 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
 const defaultImg = '/assets/images/map/solidwaste/voc.png'
 const setting = '/assets/images/map/solidwaste/gf_green2.png'
@@ -10,8 +10,6 @@
 const mapApi = require('../../../api/mapApi').default
 // 浣跨敤灏佽鏂规硶
 const AnimalService = require('../service/AnimalService').default
-
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
 
 module.exports = function () {
   /**
@@ -71,27 +69,22 @@
 
   // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
   this.requestSolidWasteData = async (e) => {
-    // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
-    const dataValue = {
-      StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
-    }
-    // console.log(e.layer.options.totransferData.Name)
     // 寮规鏍囬
     const title = e.layer.options.totransferData.Name
-    // 鍩烘湰淇℃伅 tabs
-    const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
-    // 璇︾粏淇℃伅灞曠ず table
-    const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
-
-    // 缁戝畾寮规瀹炰緥
-    const PublicBounced = window.Vue.extend(publicBounced)
-    const instance = new PublicBounced().$mount()
-    document.body.appendChild(instance.$el)
-    // document.body.removeChild(instance.$el)
-    // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
-    instance.setData(title, resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
     /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
     this.setPanTo(e.latlng, 300)
+
+    // console.log(e.layer.options.totransferData.StoragePlaceId)
+    window.$layer.open({
+      content: {
+        content: WasteSolidIndex, // 缁勪欢
+        parent: this, // 鐖剁粍浠�
+        data: { // 浼犻�掔殑鍙傛暟
+          storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+        }
+      },
+      title: title // 鏍囬
+    })
   }
 
   // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢

--
Gitblit v1.8.0