From 350097e42a1640b26c8c3ec2a318c82bcc362f9f Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Fri, 15 Mar 2019 18:13:35 +0800
Subject: [PATCH] 调取接口

---
 .babelrc                           |   3 +++
 package-lock.json                  |  43 +++++++++++++++++++++++++++++++++++--------
 package.json                       |   2 ++
 src/components/VEquipment.vue      |  12 ++++++++++--
 src/components/VParking.vue        |  13 +++++++++++++
 src/components/base/AccountNum.vue |  10 +++++++++-
 src/components/base/PieEchart.vue  |   7 ++++++-
 src/main.js                        |   3 +++
 src/utils/api.js                   |  17 +++++++++++++++++
 src/utils/request.js               |   8 ++++----
 src/utils/variables.js             |   2 ++
 src/view/VHome.vue                 | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 12 files changed, 222 insertions(+), 38 deletions(-)
 create mode 100644 .babelrc
 create mode 100644 src/utils/api.js
 create mode 100644 src/utils/variables.js

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..85af630
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-object-rest-spread"]
+}
diff --git a/package-lock.json b/package-lock.json
index 2492cfe..1edc54d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -894,8 +894,7 @@
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
       "resolved": "http://registry.npm.taobao.org/babel-plugin-syntax-object-rest-spread/download/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
-      "dev": true
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
     },
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "6.22.0",
@@ -1199,7 +1198,6 @@
       "version": "6.26.0",
       "resolved": "http://registry.npm.taobao.org/babel-plugin-transform-object-rest-spread/download/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-      "dev": true,
       "requires": {
         "babel-plugin-syntax-object-rest-spread": "^6.8.0",
         "babel-runtime": "^6.26.0"
@@ -1292,6 +1290,38 @@
         }
       }
     },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "http://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
+      }
+    },
     "babel-preset-stage-2": {
       "version": "6.24.1",
       "resolved": "http://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz",
@@ -1336,7 +1366,6 @@
       "version": "6.26.0",
       "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -2379,8 +2408,7 @@
     "core-js": {
       "version": "2.6.5",
       "resolved": "http://registry.npm.taobao.org/core-js/download/core-js-2.6.5.tgz",
-      "integrity": "sha1-RLyNJJ5/sv9dAOA0Gn/7lPv2eJU=",
-      "dev": true
+      "integrity": "sha1-RLyNJJ5/sv9dAOA0Gn/7lPv2eJU="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -10019,8 +10047,7 @@
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=",
-      "dev": true
+      "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
     },
     "regenerator-transform": {
       "version": "0.10.1",
diff --git a/package.json b/package.json
index 7b1bd1d..10369fc 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "echarts": "^4.1.0",
     "vue": "^2.5.2"
   },
@@ -25,6 +26,7 @@
     "babel-plugin-transform-runtime": "^6.22.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-preset-env": "^1.3.2",
+    "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-2": "^6.22.0",
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
diff --git a/src/components/VEquipment.vue b/src/components/VEquipment.vue
index 9fb5524..030b1bc 100644
--- a/src/components/VEquipment.vue
+++ b/src/components/VEquipment.vue
@@ -4,7 +4,7 @@
         <ul class="theme-body" style="padding: 10px 20px 20px 0;">
             <li class="equipment-section">
                 <div class="normal-status front">
-                    <p class="text-blue">23.4%</p>
+                    <p class="text-blue">{{equipment.pdaper}}%</p>
                     <p>PDA在线率</p>
                 </div>
                 <div class="rotate-status back">
@@ -14,7 +14,7 @@
             </li>
             <li class="equipment-section">
                 <div class="normal-status front">
-                    <p class="text-blue">23.4%</p>
+                    <p class="text-blue">{{equipment.berthper}}%</p>
                     <p>地磁在线率</p>
                 </div>
                 <div class="rotate-status back">
@@ -62,6 +62,14 @@ export default {
   },
   mounted(){
   },
+  watch:{
+    equipment:{//深度监听，可监听到对象、数组的变化
+      handler(val){
+        console.log(val)
+      },
+      deep:true
+    }
+  },
   methods: {
 
   }
diff --git a/src/components/VParking.vue b/src/components/VParking.vue
index b6f89ce..0a7ff9c 100644
--- a/src/components/VParking.vue
+++ b/src/components/VParking.vue
@@ -31,7 +31,20 @@ export default {
   props:['total','rodeside','rodeclose'],
   data(){
     return{
+
     }
+  },
+  created(){
+
+
+  },
+  watch:{
+    // rodeside:function(val){
+    //   //console.log(val)
+    // },
+    // total:function (val) {
+    //   //console.log(val)
+    // }
   }
 }
 </script>
diff --git a/src/components/base/AccountNum.vue b/src/components/base/AccountNum.vue
index ed3460b..abf79b0 100644
--- a/src/components/base/AccountNum.vue
+++ b/src/components/base/AccountNum.vue
@@ -16,7 +16,15 @@ export default {
   props:['totalnum'],
   data(){
     return {
-      total: formaterTotal(this.totalnum)
+      //total: formaterTotal(this.totalnum)
+    }
+  },
+  created(){
+    //console.log(this.totalnum)
+  },
+  computed:{
+    total(){
+      return formaterTotal(this.totalnum)
     }
   }
 }
diff --git a/src/components/base/PieEchart.vue b/src/components/base/PieEchart.vue
index 956485d..964620a 100644
--- a/src/components/base/PieEchart.vue
+++ b/src/components/base/PieEchart.vue
@@ -68,7 +68,12 @@ export default {
   },
   methods: {
     setOptions({yData} = {}) {
-      let per = ((yData[0]/(yData[0]+yData[1]))*100).toFixed(2)+'%'
+      if(yData[0] == 0){
+        var  per = '0%'
+      }else{
+        var per = ((yData[0]/(yData[0]+yData[1]))*100).toFixed(2)+'%'
+      }
+
       this.chart.setOption(
         {
           tooltip: {
diff --git a/src/main.js b/src/main.js
index 7f4e7b0..1a34a29 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,6 +9,9 @@ Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
+import _global from './utils/variables'
+Vue.prototype.GLOBAL = _global
+
 Vue.config.productionTip = false
 
 /* eslint-disable no-new */
diff --git a/src/utils/api.js b/src/utils/api.js
new file mode 100644
index 0000000..1043109
--- /dev/null
+++ b/src/utils/api.js
@@ -0,0 +1,17 @@
+import {post} from './request'
+
+//....停车场总数
+export const parkAddress = p => post('urban/intelligence/park/queryParkNumInfoStatisticByOrgIds',p)
+
+//....收费员
+export const tollAddress = 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 equipmentAddress = p => post('urban/intelligence/device/queryDeviceStatistic',p)
diff --git a/src/utils/request.js b/src/utils/request.js
index 3caa2ed..3bdf67b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,11 +6,11 @@ const CancelToken = axios.CancelToken;
 //请求拦截器  // 在发送请求之前做些什么
 axios.interceptors.request.use(config => {
   //发起请求时，取消掉当前正在进行的相同请求
-  config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5'
-  //config.headers['x-auth-token'] = '6840160c-7c45-42c4-8736-805f13487565' //测试地址
+  // config.headers['x-auth-token'] = '18de1300-c3f2-4365-9f51-62f77614f8c5'
+  config.headers['x-auth-token'] = '6840160c-7c45-42c4-8736-805f13487565' //测试地址
   config.data = {
     ...config.data,
-    sysCode: '1001'
+   // sysCode: '1001'
   }
   // config.data = qs.stringify(config.data);
   return config
@@ -75,7 +75,7 @@ axios.interceptors.response.use(response => {
 //基础url前缀
 //axios.defaults.baseURL = '/api'
 
-axios.defaults.baseURL = 'http://bcp.service.renniting.cn/';
+axios.defaults.baseURL = 'http://39.98.54.240:8093/';
 //axios.defaults.baseURL = 'http://test.renniting.cn/bcp/';//测试地址
 //设置默认请求头
 // axios.defaults.withCredentials=true;//让ajax携带cookie
diff --git a/src/utils/variables.js b/src/utils/variables.js
new file mode 100644
index 0000000..250ad3b
--- /dev/null
+++ b/src/utils/variables.js
@@ -0,0 +1,2 @@
+const orignId = ['10078']
+export default  {orignId}
diff --git a/src/view/VHome.vue b/src/view/VHome.vue
index 5e6609b..69e8ec9 100644
--- a/src/view/VHome.vue
+++ b/src/view/VHome.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="main-content">
+    {{equipment.PDA}}
     <v-header></v-header>
     <ul class="main-wrap">
       <li class="main-left">
@@ -40,6 +41,9 @@ import VInout from '../components/VInout'
 import VIncome from '../components/VIncome'
 import VBerth from '../components/VBerth'
 import VEquipment from '../components/VEquipment'
+
+import { parkAddress, tollAddress, incomeAddress, berthAddress, equipmentAddress } from '../utils/api'
+
 export default {
   name: 'VHome',
   components: {
@@ -54,30 +58,32 @@ export default {
   },
   data(){
     return {
-      parkingTotal: 319706,
-      rodeside: 2345,
-      rodeclose: 23,
-      tollTotal: 23454,
-      tollsign: 12309,
-      tollnosign: 2130,
+      parkingTotal: 0,
+      rodeside: 0,
+      rodeclose: 0,
+      tollTotal: 0,
+      tollsign: 0,
+      tollnosign: 0,
       inoutmsg: '万达广场停车场1  京A231231',
       inouttime: '08:00',
       imgUrl: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1552297151876&di=fcc094f43d6caaf4b9526dabbefd1243&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20190124%2F1fc9d7e14be54986b9e2e055a2b5ccc1.jpeg',
-      incometotal:123213,
+      incometotal:0,
       barChartData:{
-        seriesData:[2000,200,300],
-        total:2500
+        seriesData:[0,0,0],
+        total:1
       },
-      bertotal:28839,
+      bertotal:0,
       pieChartData: {
-        yData: [21321,13311],
+        yData: [0,0],
         legendData: ['空余','占有']
       },
       equipment:{
         PDA:150,
         PDATotal:3000,
+        pdaper:100,
         berth:150,
         berthTotal:2300,
+        berthper:100,
         daozha:150,
         daozhaTotal:1300,
         ydp:150,
@@ -92,22 +98,112 @@ export default {
     }
   },
   mounted(){
-    // this.setmethod()
-    // this.$nextTick(function () {
-    //   this.setmethod()
-    // })
-    var self = this
-    var t =setInterval(()=>{
-      self.parkingTotal  ++
-      console.log(self.parkingTotal)
-    },1000)
+    //this.setmethod()
+    this.initView();
+    //this.setmethod()
+
 
   },
   methods:{
+    initView(){
+      parkAddress({//停车场
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.data
+        this.parkingTotal = data.allNum
+        this.rodeside = data.lcNum
+        this.rodeclose = data.fbNum
+      }).catch((response)=>{
+        console.log(response);
+      })
+      tollAddress({//收费员
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.data
+        this.tollTotal = data.allTollCollector
+        this.tollsign = data.signInTollCollector
+        this.tollnosign = data.unSignInTollCollector
+      }).catch((response)=>{
+        console.log(response);
+      })
+
+      incomeAddress({//收入
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.data
+        this.incometotal = data.totalPay
+        this.barChartData = {
+          seriesData:[data.aliPay,data.wxPay,data.otherPay],
+          total:1
+        }
+
+      }).catch((response)=>{
+        console.log(response);
+      })
+
+      berthAddress({//泊位
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.data
+        this.bertotal = data.allBerthNum
+        this.pieChartData = {
+          yData: [data.freeBerthNum,data.isOccupyBertnNum],
+
+        }
+
+      }).catch((response)=>{
+        console.log(response);
+      })
+
+      equipmentAddress({//设备
+        orgIds: this.GLOBAL.orignId
+      }).then((response)=>{
+        let  data = response.data.data
+        console.log(data[0].onNum)
+        // if(data[0].onNum == 0){
+        //   var PDAper = 0
+        // }else{
+        //   var PDAper = ((data[0].onNum/data[0].num)*100).toFixed(2)
+        // }
+        //
+        // if(data[1].onNum == 0){
+        //   var berthper = 0
+        // }else{
+        //   var berthper = ((data[1].onNum/data[1].num)*100).toFixed(2)
+        // }
+
+        this.$set(this.equipment,'PDA',data[0].onNum)
+        //this.$set(this.equipment,'PDATotal',data[0].num)
+        //this.$set(this.equipment,'pdaper',PDAper)
+
+        // this.$set(this.equipment,'berth',data[1].onNum)
+        // this.$set(this.equipment,'berthTotal',data[1].num)
+        // this.$set(this.equipment,'berthper',berthper)
+        // this.equipment = {
+        //   PDA:data[0].onNum,
+        //   PDATotal:data[0].num,
+        //   berth:150,
+        //   berthTotal:2300,
+        //   daozha:150,
+        //   daozhaTotal:1300,
+        //   ydp:150,
+        //   ydpTotal:300
+        // }
+        console.log(this.equipment)
+
+      }).catch((response)=>{
+        console.log(response);
+      })
+
+
+
+
+    },
     setmethod(){
+
       setInterval(()=>{
-        this.parkingTotal ++
-        console.log(this.parkingTotal)
+        this.parkingTotal++
+        this.rodeside++
       },1000)
     }
   }
--
libgit2 0.21.4