From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/LayerController/service/WfsLayerService.js |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index 0c601a2..b139a63 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -1,5 +1,5 @@
 /**
- * 鍔犺浇涓氬姟鏁版嵁鍥惧眰
+ * 鍔犺浇wfs鏈嶅姟鍥惧眰
  */
 import { STYLES } from '../../../conf/Constants'
 import AjaxUtils from '../../../utils/AjaxUtils'
@@ -63,8 +63,15 @@
             })
         },
         onEachFeature: (feature, layer) => {
+          const popupDatas = []
+          const properties = feature.properties
+          popupDatas.push({
+            title: properties.wellname || properties.devicename || properties.name,
+            name: feature.id,
+            content: properties
+          })
           layer.bindPopup((layer) => {
-            this.popupComp.setDatas(layer)
+            this.popupComp.setDatas(popupDatas)
             this.popupComp.setShow()
             return this.popupComp.$el
           }, {
@@ -127,4 +134,5 @@
     return name
   }
 }
+
 export default WfsLayerService

--
Gitblit v1.8.0