From dddcf8840e52a212e7b49ec034aec7763b5917f5 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 10:56:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/logic/Company.js |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 7ccce20..8fda8d0 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -19,10 +19,10 @@
       layer: layer
     })
     const res = await mapApi.getCompany()
-    console.log(res)
+    // console.log(res)
     const data = res.Result.DataInfo || {}
     for (let i = 0; i < data.length; i++) {
-      console.log(data[i])
+      // console.log(data[i])
       // 缁忕含搴� 浣嶇疆
       const positionX = data[i].Latitude
       const positionY = data[i].Longitude
@@ -33,21 +33,39 @@
           iconUrl: iconUrl,
           iconSize: [50, 50],
           iconAnchor: [25, 25]
-        })
+        }),
+        test: data[i]
       })
-
+      marker.bindTooltip(data[i].name, {
+        permanent: true,
+        offset: [0, 14],
+        direction: 'bottom',
+        className: 'company-bindTooltip'
+      })
       layer.addLayer(marker)
     }
   }
-
+  /*
+  * 鐐逛綅榧犳爣绉诲叆寮规
+  * */
   this.bindTooltip = (layer) => {
     console.log(layer)
-    return '浼佷笟'
+    return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
+                '<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
+                '<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
+            '</ul></div>'// layer.options.test.name
   }
-
+  /*
+  * 鐐逛綅鐐瑰嚮浜嬩欢
+  *
+  * */
   this.clickListener = (e) => {
-    this.animalService.pulseEffect(e.latlng)
-    console.log(e)
-    return this.PublicBounced.$el
+    // this.animalService.pulseEffect(e.latlng)
+    const dataValue = {
+      StoragePlaceId: e.layer.options.test.name
+    }
+    debugger
+    console.log(dataValue)
+    // return this.PublicBounced.$el
   }
 }

--
Gitblit v1.8.0