From 93ff2951408cb54f1f08acffbd4281ad632a3c43 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 12 Mar 2019 14:55:19 +0800
Subject: [PATCH] 设备监控信息

---
 src/components/VEquipment.vue | 50 ++++----------------------------------------------
 src/view/VHome.vue            |  8 ++++++--
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/components/VEquipment.vue b/src/components/VEquipment.vue
index cc0d9ce..d833ca6 100644
--- a/src/components/VEquipment.vue
+++ b/src/components/VEquipment.vue
@@ -2,43 +2,24 @@
     <div class="theme-wrap">
         <card-title> <span>设备监控消息</span></card-title>
         <div class="theme-body">
-            <account-num>
-                <span>总计</span>
-            </account-num>
-            <ul class="income-echart">
-                <li>
-                    <pie-echart :chart-data="pieChartData"></pie-echart>
-                </li>
-                <li class="berth-inf">
-                    <p><span class="free-berth">11834</span><span>空余</span></p>
-                    <p><span class="buss-berth">4496</span><span>占有</span></p>
-                </li>
-            </ul>
+
         </div>
     </div>
 </template>
 
 <script>
 import CardTitle from './base/CardTitle'
-import AccountNum from './base/AccountNum'
-import PieEchart from './base/PieEchart'
 export default {
   name: 'VEquipment',
   components: {
-    CardTitle,
-    AccountNum,
-    PieEchart
+    CardTitle
   },
   data() {
     return {
-      pieChartData: {
-        yData: [1,1],
-        legendData: ['空余','占有']
-      },
+
     }
   },
   mounted(){
-    //this.drawBar();
   },
   methods: {
 
@@ -54,29 +35,6 @@ export default {
         height: calc(100% - 30px);
         margin-left: 20px;
     }
-    .income-echart{
-        height: 70%;
-        display: flex;
-        >li{
-            flex: 1;
-        }
-        .berth-inf{
-            p{
-                height: 50%;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-                padding-right: 20px;
-            }
-            .free-berth{
-                @include fontStyle(24px);
-                background-image: $fontBlue;
-            }
-            .buss-berth{
-                @include fontStyle(24px);
-                background-image: $fontOrange;
-            }
-        }
-    }
+
 
 </style>
diff --git a/src/view/VHome.vue b/src/view/VHome.vue
index 8dbabeb..93bec17 100644
--- a/src/view/VHome.vue
+++ b/src/view/VHome.vue
@@ -23,7 +23,9 @@
         <div class="frame-wrap frame-wrap-center">
           <v-berth></v-berth>
         </div>
-        <div class="frame-wrap"></div>
+        <div class="frame-wrap">
+          <v-equipment></v-equipment>
+        </div>
       </li>
     </ul>
   </div>
@@ -37,6 +39,7 @@ import VToll from '../components/VToll'
 import VInout from '../components/VInout'
 import VIncome from '../components/VIncome'
 import VBerth from '../components/VBerth'
+import VEquipment from '../components/VEquipment'
 export default {
   name: 'VHome',
   components: {
@@ -46,7 +49,8 @@ export default {
     VToll,
     VInout,
     VIncome,
-    VBerth
+    VBerth,
+    VEquipment
   }
 }
 </script>
--
libgit2 0.21.4