diff --git a/src/components/VEquipment.vue b/src/components/VEquipment.vue
index 92cb023..cd4a55f 100644
--- a/src/components/VEquipment.vue
+++ b/src/components/VEquipment.vue
@@ -66,8 +66,7 @@ export default {
   watch:{
     equipment:{//深度监听，可监听到对象、数组的变化
       handler(val){
-        this.equipvalue = val
-        console.log(val.PDA)
+
       },
       deep:true
     }
diff --git a/src/components/VMap.vue b/src/components/VMap.vue
index 768c16e..7f217c1 100644
--- a/src/components/VMap.vue
+++ b/src/components/VMap.vue
@@ -17,7 +17,18 @@ export default {
     }
   },
   mounted(){
-    this.drawMap()
+
+
+  },
+  watch:{
+    // mapdata:function (newVal) {
+    //   console.log(newVal)
+    // }
+    mapdata: function () {
+      this.$nextTick(()=>{
+        this.drawMap()
+      })
+    }
   },
   methods:{
     initMap(){
@@ -35,7 +46,7 @@ export default {
       // let data = this.data
       map = new BMap.Map('map', {enableMapClick: false})
       var point = new BMap.Point(mapData[0].lonId, mapData[0].latId)
-      map.centerAndZoom(point, 15)
+      map.centerAndZoom(point, 22)
       var mapStyle={  style : "midnight" }
       map.enableScrollWheelZoom(false);
       map.setMapStyle(mapStyle);
@@ -94,8 +105,8 @@ export default {
                     <li></li>
                     <li><div>${mapData[item].plBerthNum}</div><div>总数</div></li>
                   </ul>
-                  <div class="dislog-footer">停车场收入:1293847.00元</div>
-                  <div class="dislog-footer">停车场收入:1293847.00元</div>
+                  <div class="dislog-footer">停车场收入:${mapData[item].income}元</div>
+                  <div class="dislog-footer">停车场欠费:${mapData[item].arreageincome}元</div>
                 </div>`,
             {
               offset: new BMap.Size(-225, -55),   //label的偏移量，为了让label的中心显示在点上
diff --git a/src/view/VHome.vue b/src/view/VHome.vue
index 6fd1778..921c2be 100644
--- a/src/view/VHome.vue
+++ b/src/view/VHome.vue
@@ -91,9 +91,9 @@ export default {
         ydpper:100
       },
       ditudata:[
-        {Name:'万达停车场1',lonId:'111.742579',latId:'40.818675',status:0,freeBrethNum:0,plBerthNum:1000,plName:'万达广场停车场1',plAddress:'北京万达广场1'},
-        {Name:'万达停车场2',lonId:'111.622579',latId:'40.878675',status:1,freeBrethNum:100,plBerthNum:800,plName:'万达广场停车场2',plAddress:'北京万达广场2'},
-        {Name:'万达停车场333333',lonId:'111.782579',latId:'40.778675',status:2,freeBrethNum:300,plBerthNum:500,plName:'万达广场停车场3',plAddress:'北京万达广场3'}
+        {Name:'万达停车场1',lonId:'111.742579',latId:'40.818675',status:0,freeBrethNum:0,plBerthNum:1000,plName:'万达广场停车场1',plAddress:'北京万达广场1',income:123,arreageincome:100},
+        {Name:'万达停车场2',lonId:'111.622579',latId:'40.878675',status:1,freeBrethNum:100,plBerthNum:800,plName:'万达广场停车场2',plAddress:'北京万达广场2',income:123,arreageincome:100},
+        {Name:'万达停车场333333',lonId:'111.782579',latId:'40.778675',status:2,freeBrethNum:300,plBerthNum:500,plName:'万达广场停车场3',plAddress:'北京万达广场3',income:123,arreageincome:100}
       ]
 
     }
@@ -160,7 +160,40 @@ export default {
         orgIds: this.GLOBAL.orignId
       }).then((response)=>{
         let  data = response.data.data
-        console.log(response)
+        console.log(data)
+        var tempData = [];
+        for(var index in data){
+
+          var item = data[index];
+          var tempItem =
+
+
+            {
+              Name: item.parkInfo.plName,
+              lonId: item.parkInfo.lonId,
+              latId:item.parkInfo.latId,
+              status: 0,
+              freeBrethNum: item.realTimeInfoDTO.berthFreeNum,
+              plBerthNum: item.realTimeInfoDTO.berthNum,
+              plName: item.parkInfo.plName,
+              plAddress: item.parkInfo.plAddress,
+              income:(item.realTimeInfoDTO.allIncome/100).toFixed(2),
+              arreageincome:(item.realTimeInfoDTO.escapeFee).toFixed(2)
+            }
+
+          tempData.push(tempItem);
+
+        }
+
+        this.ditudata = tempData;
+        console.log(this.ditudata)
+        // ditudata:[
+        //   {Name:'万达停车场1',lonId:'111.742579',latId:'40.818675',status:0,freeBrethNum:0,plBerthNum:1000,plName:'万达广场停车场1',plAddress:'北京万达广场1'},
+        //   {Name:'万达停车场2',lonId:'111.622579',latId:'40.878675',status:1,freeBrethNum:100,plBerthNum:800,plName:'万达广场停车场2',plAddress:'北京万达广场2'},
+        //   {Name:'万达停车场333333',lonId:'111.782579',latId:'40.778675',status:2,freeBrethNum:300,plBerthNum:500,plName:'万达广场停车场3',plAddress:'北京万达广场3'}
+        // ]
+
+        //console.log(this.ditudata)
       }).catch((response)=>{
         console.log(response);
       })