From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/LayerController/logic/WasteGas.js |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index e120cfa..99fee38 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -18,10 +18,13 @@
    * @param L leaflet瀵硅薄
    */
   this.init = async (layer, L) => {
-    this.animalService = new AnimalService({ L: L, layer: layer })
+    this.animalService = new AnimalService({
+      L: L,
+      layer: layer
+    })
     const res = await mapApi.GetWasteGas()
     const data = res.Result.DataInfo || {}
-    console.log(data)
+    // console.log(data)
     for (let i = 0; i < data.length; i++) {
       // 缁忕含搴� 浣嶇疆
       const positionX = data[i].Latitude
@@ -31,6 +34,7 @@
       var iconUrl = this.differentTypes(ContrLevel)
 
       const marker = L.marker.magic([positionX, positionY], {
+        test: data[i],
         icon: L.icon({
           iconUrl: iconUrl,
           iconSize: [50, 50],
@@ -43,8 +47,7 @@
   }
 
   this.bindTooltip = (layer) => {
-    console.log(layer)
-    return '搴熸皵鐐�'
+    return layer.options.test.Name
   }
 
   this.clickListener = async (e) => {

--
Gitblit v1.8.0