From b41c6ca44111844bb96f3daffe2e61a0e9824f60 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:02:35 +0800
Subject: [PATCH] 废水弹框内容加载

---
 src/components/BaseNav/WasteWater/WasteWater.js |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/BaseNav/WasteWater/WasteWater.js b/src/components/BaseNav/WasteWater/WasteWater.js
index af1d4fb..c2f3d6b 100644
--- a/src/components/BaseNav/WasteWater/WasteWater.js
+++ b/src/components/BaseNav/WasteWater/WasteWater.js
@@ -16,9 +16,10 @@
   }
 
   // 璇锋眰鏁版嵁 data 涓哄弬鏁帮紝 璇锋眰鍚庡彴鏁版嵁鏃� 鎼哄甫data鍙傛暟
-  requestData () {
-    requestWasteWater().then(res => {
-      this.DrawTheWasteWaterContent(res.Result.DataInfo)
+  requestData (data) {
+    requestWasteWater(data).then(res => {
+      console.log(res)
+      this.DrawWasteWaterContent(res.Result.DataInfo)
       // console.log(res)
     }).catch(err => {
       console.log(err)
@@ -26,7 +27,7 @@
   }
 
   // 鏍规嵁鑾峰彇鏁版嵁 鐢诲嚭 鍐呭
-  DrawTheWasteWaterContent (data) {
+  DrawWasteWaterContent (data) {
     // 鍥炬爣鏍峰紡鎵╁睍
     const WasteWaterIcon = this.WasteWaterIcon()
 
@@ -36,8 +37,8 @@
     }
     for (let i = 0; i < data.length; i++) {
       // 缁忕含搴� 浣嶇疆
-      const positionX = data[i].positionX
-      const positionY = data[i].positionY
+      const positionX = data[i].Latitude
+      const positionY = data[i].Longitude
 
       // 鍒ゆ柇 缁忕含搴︿綅缃俊鎭槸鍚﹀瓨鍦�
       // if (positionX != null && positionY != null) {
@@ -62,7 +63,7 @@
         autoClose: false
       })
       // 鍒掕繃鍑虹幇 灞曠ず鏁版嵁
-      marker.bindTooltip(data[i].StoragePlaceName, {
+      marker.bindTooltip(data[i].Name, {
         permanent: true,
         offset: [0, -16],
         direction: 'top',
@@ -74,6 +75,7 @@
           // console.log(e)
           this.EffectOfPulse(e.target.getLatLng())
           this.WasteWaterPopup.setDate(data[i])
+          return this.WasteWaterPopup.$el
         } catch (error) {
           console.log(error)
         }

--
Gitblit v1.8.0