Merge branch 'master' of https://gitee.com/xianfuxing/Mosqkiller

src/main.js

@@ -18,27 +18,27 @@ import './permission' // permission control
 // import './mock' // simulation data
 
 import * as filters from './filters' // global filters
-import VueAMap from 'vue-amap'
+// import VueAMap from 'vue-amap'
-Vue.use(VueAMap)
+// Vue.use(VueAMap)
 
-VueAMap.initAMapApiLoader({
+// VueAMap.initAMapApiLoader({
-  key: '49842c6fe4d24df80871faec2e272a00',
+//   key: '49842c6fe4d24df80871faec2e272a00',
-  plugin: [
+//   plugin: [
-    'AMap.Geolocation',
+//     'AMap.Geolocation',
-    'AMap.Driving',
+//     'AMap.Driving',
-    'AMap.Walking',
+//     'AMap.Walking',
-    'AMap.Autocomplete',
+//     'AMap.Autocomplete',
-    'AMap.PlaceSearch',
+//     'AMap.PlaceSearch',
-    'AMap.Scale',
+//     'AMap.Scale',
-    'AMap.OverView',
+//     'AMap.OverView',
-    'AMap.ToolBar',
+//     'AMap.ToolBar',
-    'AMap.MapType',
+//     'AMap.MapType',
-    'AMap.PolyEditor',
+//     'AMap.PolyEditor',
-    'AMap.CircleEditor'
+//     'AMap.CircleEditor'
-  ],
+//   ],
-  // 默认高德 sdk 版本为 1.4.4
+//   // 默认高德 sdk 版本为 1.4.4
-  v: '1.4.4'
+//   v: '1.4.4'
-})
+// })
 
 Vue.use(Element, {
   size: 'medium', // set element-ui default size

src/views/dashboard/admin/components/PanelGroup.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">Monthly Mosquito</div>
-          <count-to class="card-panel-num" :startVal="0" :endVal="totalCount" :duration="2600"></count-to>
+          <count-to class="card-panel-num" :startVal="0" :endVal="monthAgoCount" :duration="2600"></count-to>
         </div>
       </div>
     </el-col>
@@ -23,7 +23,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="">
+      <div class="card-panel">
         <div class="card-panel-icon-wrapper icon-online">
           <svg-icon icon-class="online" class-name="card-panel-icon" />
         </div>
@@ -34,7 +34,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="">
+      <div class="card-panel">
         <div class="card-panel-icon-wrapper icon-offline">
           <svg-icon icon-class="offline" class-name="card-panel-icon" />
         </div>
@@ -52,7 +52,7 @@ import CountTo from 'vue-count-to'
 
 export default {
   props: {
-    totalCount: Number,
+    monthAgoCount: Number,
     dailyCount: Number,
     onlineCount: Number,
     offlineCount: Number

src/views/dashboard/admin/index.vue

@@ -4,7 +4,7 @@
 
     <panel-group 
       @handleSetLineChartData="handleSetLineChartData"
-      :totalCount="totalCount"
+      :monthAgoCount="monthAgoCount"
       :dailyCount="dailyCount"
       :onlineCount="onlineCount"
       :offlineCount="offlineCount"
@@ -102,7 +102,7 @@ export default {
   data() {
     return {
       lineChartData: lineChartData.total,
-      totalCount: 0,
+      monthAgoCount: 0,
       dailyCount: 0,
       onlineCount: 0,
       offlineCount: 0,
@@ -122,9 +122,9 @@ export default {
     },
     getDeviceLogStatistic() {
       fetchDeviceLogStatistic().then(response => {
-        const logData = response.data
+        const data = response.data
-        this.totalCount = logData['total_count']
+        this.monthAgoCount = data['month_ago_count']
-        this.dailyCount = logData['daily_count']
+        this.dailyCount = data['daily_count']
       })
     },
     handleHistoryLine(historyList) {