From 73c8d3f55d5a675174a61342f3cea712ed5bc0eb Mon Sep 17 00:00:00 2001
From: QibolinCzp <qibolin02429@126.com>
Date: 星期五, 14 五月 2021 10:49:54 +0800
Subject: [PATCH] 问题修改

---
 src/components/LayerController/logic/WasteGas.js |   53 +++++++++++++++++++++--------------------------------
 1 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bdc5e30..17706bc 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -11,7 +11,8 @@
 // const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
 
 const mapApi = require('../../../api/mapApi').default
-const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
+const WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').default
 // const WasteGasChats = require('./WasteGasChats').default
 module.exports = function () {
   /**
@@ -20,7 +21,10 @@
    */
   this.init = async (layer, L) => {
     // console.log(WasteGasChats)
-    this.animalService = new AnimalService({ L: L, layer: layer })
+    this.animalService = new AnimalService({
+      L: L,
+      layer: layer
+    })
     const res = await mapApi.getWasteGas()
     // console.log(res)
     const data = res.Result.DataInfo || {}
@@ -52,33 +56,25 @@
   }
 
   this.bindTooltip = (layer) => {
-    return layer.options.test.Name
+    return '<div class="company-bindTooltip-hover"><h3>澶╂触鐭冲寲</h3></div>' + layer.options.test.Name
   }
 
   this.clickListener = async (e) => {
-    // console.log(e)
+    console.log(e)
     this.animalService.pulseEffect(e.latlng)
-    const dataValue = {
-      StoragePlaceId: e.layer.options.test.StoragePlaceId
-    }
-    const GasOnlinedata = {
-      onLineMonEmissPointId: '23',
-      monItemId: '28,31',
-      beginTime: '2020-04-06 15:13:20',
-      endTime: '2020-04-07 15:13:20',
-      dataType: '1'
-    }
-    const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
-    console.log(Mondata)
-    const result = await mapApi.getWasteGasDetails(dataValue)
-    // console.log(result.Result.DataInfo)
-    const PublicBounced = window.Vue.extend(publicBounced)
-    const instance = new PublicBounced()
-    instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, 'feiqi')
-    // console.log(e.layer.options.test)
-    instance.$mount()
-    document.body.appendChild(instance.$el)
-    this.setPanTo(e.latlng, 80)
+    const title = e.layer.options.test.Name
+    const res = e.layer.options.test
+    window.$layer.open({
+      content: {
+        content: WasteGasIndex, // 缁勪欢
+        parent: this, // 鐖剁粍浠�
+        data: { // 浼犻�掔殑鍙傛暟
+          storagePlaceId: res
+        }
+      },
+      title: '澶╂触鐭冲寲' + title // 鏍囬
+    })
+    this.animalService.setPanTo(e.latlng, 150)
   }
   // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
   this.differentTypes = (ContrLevel) => {
@@ -95,12 +91,5 @@
     //   effectOfChange = ImgGray
     // }
     return effectOfChange
-  }
-  this.setPanTo = (pos, value) => {
-    var position = pos
-    position = window.map.latLngToLayerPoint(position)
-    position.y += value
-    position = window.map.layerPointToLatLng(position)
-    window.map.flyTo(position)
   }
 }

--
Gitblit v1.8.0