From 0c71a89748fb4e4cd433e8e9883d460033a3b996 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:39:55 +0800
Subject: [PATCH] 固废废水废气弹框问题修改

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

diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index cd3d48a..6ca9dea 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -11,7 +11,8 @@
 // 浣跨敤灏佽鏂规硶
 const AnimalService = require('../service/AnimalService').default
 
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const PublicVideo = require('../../BaseNav/PublicVideo').default
 
 module.exports = function () {
   /**
@@ -72,26 +73,37 @@
   // 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
   this.requestSolidWasteData = async (e) => {
     // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
-    const dataValue = {
-      StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
-    }
+    // 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)
+    // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
     // 璇︾粏淇℃伅灞曠ず table
-    const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+    // 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')
+    // // 缁戝畾寮规瀹炰緥
+    // 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)
+    window.$layer.open({
+      content: {
+        content: PublicVideo, // 缁勪欢
+        parent: this, // 鐖剁粍浠�
+        data: { // 浼犻�掔殑鍙傛暟
+          info: this.info,
+          storagePlaceId: e.layer.options.totransferData.StoragePlaceId
+        }
+      },
+      title: title // 鏍囬
+    })
   }
 
   // flayTo() 寮规鐨勫彲婊戝姩浜嬩欢

--
Gitblit v1.8.0