From e9c09ac836092502cd77c6e12367f08d5adf7b1c Mon Sep 17 00:00:00 2001
From: xianfuxing <xianfuxing@126.com>
Date: Wed, 1 Aug 2018 15:46:44 +0800
Subject: [PATCH] # up count view

---
 src/api/counter.js           |  8 ++++
 src/views/counter/count.vue  | 88 +++++++++++++++++++++++++++++++++++-
 src/views/counter/device.vue |  3 ++
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/api/counter.js b/src/api/counter.js
index b136857..188dc37 100644
--- a/src/api/counter.js
+++ b/src/api/counter.js
@@ -7,3 +7,11 @@ export function fetchDeviceList(query) {
     params: query
   })
 }
+
+export function fetchDeviceCount(query) {
+  return request({
+    url: '/api/counter/count/',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/counter/count.vue b/src/views/counter/count.vue
index 60aa2ec..2e59aae 100644
--- a/src/views/counter/count.vue
+++ b/src/views/counter/count.vue
@@ -3,15 +3,99 @@
     <p class="warn-content">
       智能模块消息推送列表
     </p>
+    <el-table
+     v-loading="listLoading"
+    :data="deviceCount"
+    style="width: 100%"
+    :default-sort = "{prop: 'calc_time', order: 'descending'}"
+    >
+    <el-table-column
+      prop="device_id"
+      label="设备ID"
+      sortable
+      min-width="100">
+    </el-table-column>
+    <el-table-column
+      prop="signal"
+      label="信号强度"
+      min-width="100">
+    </el-table-column>
+    <el-table-column
+      sortable
+      prop="mosq_count"
+      label="灭蚊数量"
+      min-width="100">
+    </el-table-column>
+    <el-table-column
+      prop="energy"
+      label="电量"
+      min-width="100">
+    </el-table-column>
+    <el-table-column
+      prop="coordinate"
+      label="坐标"
+      min-width="100"
+      :formatter="formatter">
+    </el-table-column>
+    <el-table-column
+      prop="calc_time"
+      label="时间"
+      min-width="100">
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    class="pagination"
+    background
+    layout="prev, pager, next"
+    @current-change="handleCurrentChange"
+    :total="total">
+  </el-pagination>
   </div>
 </template>
 
 <script>
+import { fetchDeviceCount } from '@/api/counter'
 export default {
-  name: 'count'
+  name: 'count',
+  data() {
+    return {
+      deviceCount: [],
+      listLoading: true,
+      total: 0
+    }
+  },
+  methods: {
+    getDeviceCount(params) {
+      fetchDeviceCount(params).then(response => {
+        this.deviceCount = response.data.results
+        // 页码
+        // this.total = Math.ceil(response.data.count / 8) * 10
+        this.total = response.data.count
+        // console.log(this.total)
+        this.listLoading = false
+      })
+    },
+    formatter(row, column) {
+      return row.longitude + ', ' + row.latitude
+    },
+    handleCurrentChange(page) {
+      // console.log(page)
+      this.listLoading = true
+      this.getDeviceCount({ page })
+    }
+  },
+  created() {
+    this.getDeviceCount()
+  },
+  deactivated() {
+    this.$destroy(true)
+  }
 }
 </script>
 
 <style lang="scss">
-
+  .pagination {
+    float: right;
+    padding: 20px 50px 0 0;
+  }
 </style>
diff --git a/src/views/counter/device.vue b/src/views/counter/device.vue
index 64b329e..fd5d092 100644
--- a/src/views/counter/device.vue
+++ b/src/views/counter/device.vue
@@ -61,6 +61,9 @@ export default {
   },
   created() {
     this.getDevices()
+  },
+  deactivated() {
+    this.$destroy(true)
   }
 }
 </script>