From 8dcd7f649e8c6f920c5a83ec71f6a8882d1aeb89 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 15 Jan 2019 15:03:23 +0800
Subject: [PATCH] api 接口封装  news

---
 src/api/api.js                        |  8 +++++++-
 src/components/berth/index.vue        | 60 +++++++++++++++++++++++++++---------------------------------
 src/components/orderMessage/index.vue | 53 ++++++++++++++---------------------------------------
 3 files changed, 48 insertions(+), 73 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index d20c5cb..91a1ccc 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -6,8 +6,14 @@ export const memberAddress = p => post('urban/intelligence/appuser/queryUserPers
 //....收费员
 export const tollmanAddress = p => post('urban/intelligence/employee/queryEmployeeStaByOrgIds',p)
 
-//....设备
+//....收入
 export const incomeAddress = p => post('urban/intelligence/income/queryIncomeStaByOrgIds',p)
 
+//....泊位
+export const berthAddress = p => post('urban/intelligence/berth/queryBerthStatisticByOrgIds',p)
+
 //....设备
 export const deviceAddress = p => post('urban/intelligence/device/queryDeviceStatistic',p)
+
+//....消息
+export const msgAddress = p => post('urban/intelligence/orderPark/queryLastOrderPark',p)
diff --git a/src/components/berth/index.vue b/src/components/berth/index.vue
index c1fefee..c40976a 100644
--- a/src/components/berth/index.vue
+++ b/src/components/berth/index.vue
@@ -24,56 +24,50 @@
 <script>
   import common from '../../api/common';
   import echarts from 'echarts'
+  import { berthAddress } from '../../api/api'
   export default {
     name: "berth",
     data() {
       return {
         demo:'',//示例
         berthTotal:"",//泊位总数
-        free:12345,//空余
-        have:23456,//占有
-        //color: this.$store.state.color,
+        free:'',//空余
+        have:'',//占有
         pieChart: {},
         name: '饼图',
         pieChartOption:{
           seriesData:[
-            {name:"占有",value:6000},
-            {name:"空余",value:4000}
+            {name:"占有",value:''},
+            {name:"空余",value:''}
           ]
         }
       }
     },
     mounted() {
-      this.axios.post('urban/intelligence/berth/queryBerthStatisticByOrgIds',{
-        orgIds: this.GLOBAL.paramsvariables
-      }).then((response)=>{
-        let  data = response.data.data
-        console.log(data)
-        this.berthTotal = common.formatNumToStr(data.allBerthNum)
-        this.free = data.freeBerthNum
-        this.have = data.isOccupyBertnNum
-
-        this.pieChartOption.seriesData[0].value = data.isOccupyBertnNum
-        this.pieChartOption.seriesData[1].value = data.freeBerthNum
-        let pieChartOption = this.pieChartOption
-        //占有率
-        this.pieChart=this.createPie(pieChartOption);
-        window.addEventListener('resize', function() {
-          this.pieChart.resize()
-        }.bind(this));
-      }).catch((response)=>{
-        console.log(response);
-      })
-      //this.createLine();
-      //总收入
-
+      this.onLoad()
     },
     methods: {
-      /*
-       * 格式化总泊位
-       * */
-      formatNumToStr:function(){
-        return common.formatNumToStr(this.$options.data().demo);
+      onLoad() {
+        berthAddress({
+          orgIds: this.GLOBAL.paramsvariables
+        }).then((response)=>{
+          let  data = response.data.data
+          console.log(data)
+          this.berthTotal = common.formatNumToStr(data.allBerthNum)
+          this.free = data.freeBerthNum
+          this.have = data.isOccupyBertnNum
+
+          this.pieChartOption.seriesData[0].value = data.isOccupyBertnNum
+          this.pieChartOption.seriesData[1].value = data.freeBerthNum
+          let pieChartOption = this.pieChartOption
+          //占有率
+          this.pieChart=this.createPie(pieChartOption);
+          window.addEventListener('resize', function() {
+            this.pieChart.resize()
+          }.bind(this));
+        }).catch((response)=>{
+          console.log(response);
+        })
       },
       /*
        * 泊位占比
diff --git a/src/components/orderMessage/index.vue b/src/components/orderMessage/index.vue
index ad7d8c3..19e4376 100644
--- a/src/components/orderMessage/index.vue
+++ b/src/components/orderMessage/index.vue
@@ -3,34 +3,7 @@
     <div class="theme-card">
       <div class="title"><span>订单消息</span></div>
       <div class="content">
-        <!--<table class="orderMessageTb">-->
-          <!--<tr>-->
-            <!--<td>-->
-              <!--<table class="tbHead">-->
-                <!--<tr><td><div class="orderImgCom orderNum"></div></td><td>订单编号</td></tr>-->
-              <!--</table>-->
-            <!--</td>-->
-            <!--<td>-->
-              <!--<table class="tbHead">-->
-                <!--<tr><td><div class="orderImgCom orderPark"></div></td><td>停车场</td></tr>-->
-              <!--</table>-->
-            <!--</td>-->
-            <!--<td>-->
-              <!--<table class="tbHead">-->
-                <!--<tr><td><div class="orderImgCom orderMoney"></div></td><td>收费金额</td></tr>-->
-              <!--</table>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td colspan="3">-->
-              <!--<div class="orderListBox" id="orderListBox">-->
-                <!--<marquee class="marqueeStyle"  direction="up" behavior="scroll" scrollamount="2" onMouseOut="this.start()" onMouseOver="this.stop()" scrolldelay="0" loop="-1"   >-->
-                  <!--<div class="orderListBox" v-html="orderList"></div>-->
-                <!--</marquee>-->
-              <!--</div>-->
-            <!--</td>-->
-          <!--</tr>-->
-        <!--</table>-->
+
         <ul class="news-wrap">
           <li class="orderNum">订单编号</li>
           <li class="orderPark">停车场</li>
@@ -51,7 +24,7 @@
 </template>
 
 <script>
-  import common from '../../api/common'
+  import { msgAddress } from '../../api/api'
   export default {
     name: "orderMessage",
     data() {
@@ -64,18 +37,20 @@
       }
     },
     created() {
-      this.axios.post('urban/intelligence/orderPark/queryLastOrderPark',{
-        orgIds: this.GLOBAL.paramsvariables
-      }).then((response)=>{
-        let  data = response.data.data
-        this.list = data;
-        setInterval(this.scroll, 2000)
-      }).catch((response)=>{
-        console.log(response);
-      })
-
+      this.onLoad()
     },
     methods: {
+      onLoad() {
+        msgAddress({
+          orgIds: this.GLOBAL.paramsvariables
+        }).then((response)=>{
+          let  data = response.data.data
+          this.list = data;
+          setInterval(this.scroll, 2000)
+        }).catch((response)=>{
+          console.log(response);
+        })
+      },
       scroll() {
         this.animate = !this.animate;
         var that = this; // 在异步函数中会出现this的偏移问题，此处一定要先保存好this的指向
--
libgit2 0.21.4