From e19156211ff07d024cbc3adc92a4ca53dc0ab5a9 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Fri, 15 Mar 2019 19:22:37 +0800
Subject: [PATCH] 调取接口

---
 src/components/VEquipment.vue | 20 +++++++++++---------
 src/view/VHome.vue            | 35 ++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/components/VEquipment.vue b/src/components/VEquipment.vue
index 030b1bc..892f1d5 100644
--- a/src/components/VEquipment.vue
+++ b/src/components/VEquipment.vue
@@ -1,20 +1,21 @@
 <template>
     <div class="theme-wrap">
         <card-title> <span>设备监控消息</span></card-title>
+        {{equipment.PDA}}/{{equipment.PDATotal}}
         <ul class="theme-body" style="padding: 10px 20px 20px 0;">
             <li class="equipment-section">
                 <div class="normal-status front">
-                    <p class="text-blue">{{equipment.pdaper}}%</p>
+                    <div class="text-blue">{{equipment.pdaper}}%</div>
                     <p>PDA在线率</p>
                 </div>
                 <div class="rotate-status back">
-                    <p class="text-blue">{{equipment.PDA}}/{{equipment.PDATotal}}</p>
+                    <div class="text-blue">{{equipment.PDA}}/{{equipment.PDATotal}}</div>
                     <p>PDA/PDA在线</p>
                 </div>
             </li>
             <li class="equipment-section">
                 <div class="normal-status front">
-                    <p class="text-blue">{{equipment.berthper}}%</p>
+                    <div class="text-blue">{{equipment.berthper}}%</div>
                     <p>地磁在线率</p>
                 </div>
                 <div class="rotate-status back">
@@ -24,11 +25,11 @@
             </li>
             <li class="equipment-section">
                 <div class="normal-status front">
-                    <p class="text-orange">23.4%</p>
+                    <div class="text-orange">23.4%</div>
                     <p>道闸在线率</p>
                 </div>
                 <div class="rotate-status back">
-                    <p class="text-orange">{{equipment.daozha}}/{{equipment.daozhaTotal}}</p>
+                    <div class="text-orange">{{equipment.daozha}}/{{equipment.daozhaTotal}}</div>
                     <p>道闸/道闸在线</p>
                 </div>
             </li>
@@ -57,7 +58,7 @@ export default {
   props:['equipment'],
   data() {
     return {
-
+        equipvalue:''
     }
   },
   mounted(){
@@ -65,7 +66,8 @@ export default {
   watch:{
     equipment:{//深度监听，可监听到对象、数组的变化
       handler(val){
-        console.log(val)
+        this.equipvalue = val
+        console.log(val.PDA)
       },
       deep:true
     }
@@ -99,7 +101,7 @@ export default {
         transform-style:preserve-3d;
         /*transition:1s;*/
         animation:myfirst  6s  linear  infinite;
-        div{
+        >div{
             width: 95%;
             height: 95%;
             position: absolute;
@@ -108,7 +110,7 @@ export default {
             padding: 15px 0 10px 0;
             text-align: center;
 
-            p{
+            p,div{
                 height: 50%;
                 display: flex;
                 align-items: center;
diff --git a/src/view/VHome.vue b/src/view/VHome.vue
index 69e8ec9..da908ec 100644
--- a/src/view/VHome.vue
+++ b/src/view/VHome.vue
@@ -86,6 +86,7 @@ export default {
         berthper:100,
         daozha:150,
         daozhaTotal:1300,
+        daozhaper:100,
         ydp:150,
         ydpTotal:300
       },
@@ -159,26 +160,26 @@ export default {
         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)
-        // }
+        console.log(data)
+        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,'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.$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,
--
libgit2 0.21.4