Merge branch 'test' of http://gitlab.renniting.cn/web_developers/lzsandtable into test

Andy
2 parents f1414ff7 04d7be6d
Showing 6 changed files with 118 additions and 19 deletions
src/components/VEquipment.vue
src/components/VInout.vue
src/components/VMap.vue
src/utils/api.js
src/utils/date.js
src/view/VHome.vue
@@ -66,8 +66,7 @@ export default {
   watch:{
     equipment:{//深度监听，可监听到对象、数组的变化
       handler(val){
-        this.equipvalue = val
-        console.log(val.PDA)
+
       },
       deep:true
     }
@@ -3,7 +3,7 @@
         <card-title> <span>进出场消息</span></card-title>
         <div class="theme-body">
             <div class="access-title">
-                <p><span><span class="access-icon"></span>{{inoutmsg}} 进场</span> <span>{{inouttime}}</span></p>
+                <p><span><span class="access-icon"></span>{{inoutmsg}} </span> <span>{{inouttime|formatDate}}</span></p>
             </div>
             <div class="access-img" :style="{backgroundImage:'url('+imgUrl+')'}"></div>
         </div>
@@ -13,6 +13,8 @@
 <script>
 import CardTitle from './base/CardTitle'
 import AccountNum from './base/AccountNum'
+import { formatDate } from '../utils/date'
+
 export default {
   name: 'VInout',
   components: {
@@ -23,6 +25,12 @@ export default {
   data(){
     return{
     }
+  },
+  filters:{
+    formatDate(time){
+      var date = new Date(time)
+      return formatDate(date, 'yyyy-MM-dd hh:mm');
+    }
   }
 }
 </script>
@@ -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的中心显示在点上
@@ -15,3 +15,9 @@ export const berthAddress = p =&gt; post(&#39;urban/intelligence/berth/queryBerthStatis
  
 //....设备
 export const equipmentAddress = p => post('urban/intelligence/device/queryDeviceStatistic',p)
+
+//....地图
+export const mapAddress = p => post('urban/intelligence/park/queryParkDetailInfoByOrgIds',p)
+
+//....进出场
+export const inoutAddress = p => post('urban/intelligence/orderPark/queryLastOrderPark',p)
+export function formatDate (date, fmt) {
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds()
+  };
+  for (let k in o) {
+    if (new RegExp(`(${k})`).test(fmt)) {
+      let str = o[k] + '';
+      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+    }
+  }
+  return fmt;
+};
+function padLeftZero (str) {
+  return ('00' + str).substr(str.length);
+};
@@ -41,7 +41,7 @@ import VIncome from &#39;../components/VIncome&#39;
 import VBerth from '../components/VBerth'
 import VEquipment from '../components/VEquipment'
  
-import { parkAddress, tollAddress, incomeAddress, berthAddress, equipmentAddress } from '../utils/api'
+import { parkAddress, tollAddress, incomeAddress, berthAddress, equipmentAddress, mapAddress, inoutAddress } from '../utils/api'
  
 export default {
   name: 'VHome',
@@ -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}
       ]
  
     }
@@ -101,7 +101,7 @@ export default {
   mounted(){
     //this.setmethod()
     this.initView();
-    //this.setmethod()
+    this.setmethod()
  
  
   },
@@ -128,6 +128,27 @@ export default {
         console.log(response);
       })
  
+      inoutAddress({//进出场
+        orgIds: ['10078','10003']
+      }).then((response)=>{
+        let  data = response.data.data
+        console.log(response)
+        let inoutdata = data[0]
+        if(inoutdata.parkState == 10){
+          inoutdata.parkState = "进场"
+          this.inouttime = inoutdata.parkInTime
+          this.imgUrl = inoutdata.inCarUrl
+        }else{
+          inoutdata.parkState = "出场"
+          this.inouttime = inoutdata.parkOutTime
+          this.imgUrl = inoutdata.outCarUrl
+        }
+        this.inoutmsg = inoutdata.plName+'   '+inoutdata.carNumber +' '+inoutdata.parkState
+
+      }).catch((response)=>{
+        console.log(response);
+      })
+
       incomeAddress({//收入
         orgIds: this.GLOBAL.orignId
       }).then((response)=>{
@@ -137,7 +158,6 @@ export default {
           seriesData:[data.aliPay,data.wxPay,data.otherPay],
           total:1
         }
-
       }).catch((response)=>{
         console.log(response);
       })
@@ -149,18 +169,52 @@ export default {
         this.bertotal = data.allBerthNum
         this.pieChartData = {
           yData: [data.freeBerthNum,data.isOccupyBertnNum],
+        }
  
+      }).catch((response)=>{
+        console.log(response);
+      })
+
+      mapAddress({//地图
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.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'}
+        // ]
       }).catch((response)=>{
         console.log(response);
       })
  
+
+
       equipmentAddress({//设备
         orgIds: this.GLOBAL.orignId
       }).then((response)=>{
         let  data = response.data.data
-        console.log(data)
         if(data[0].onNum == 0){
           var PDAper = 0
         }else{
@@ -211,7 +265,6 @@ export default {
         //   ydp:150,
         //   ydpTotal:300
         // }
-        console.log(this.equipment)
  
       }).catch((response)=>{
         console.log(response);
@@ -224,11 +277,11 @@ export default {
     setmethod(){
  
       setInterval(()=>{
-        this.parkingTotal++
-        this.rodeside++
-      },1000)
+        this.initView()
+      },10000)
     }
-  }
+  },
+
 }
 </script>