From 5a7109a50d697a9ecca83012836376a000b71184 Mon Sep 17 00:00:00 2001
From: chenyibo <p-honggang.li@pcitc.com>
Date: 星期五, 02 四月 2021 14:21:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/logic/SolidWaste.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index bb980a5..3ea18d7 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -43,12 +43,12 @@
           iconAnchor: [25, 25]
         })
       })
-      marker.bindTooltip(getSolidWasteData[i].Name, {
+      /*  marker.bindTooltip(getSolidWasteData[i].Name, {
         permanent: true,
         offset: [0, 14],
         direction: 'bottom',
         className: 'company-bindTooltip'
-      })
+      }) */
       layer.addLayer(marker)
     }
   }
@@ -89,7 +89,7 @@
     const instance = new PublicBounced()
     instance.$mount()
     document.body.appendChild(instance.$el)
-    instance.setData(resultBasic.Result.DataInfo, resultDetailed, 'gufei')
+    instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
     /* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
     this.setPanTo(e.latlng, 200)
   }

--
Gitblit v1.8.0