From 131ecfdbf0dd42ac052e8a15ad56a401b03ff4f8 Mon Sep 17 00:00:00 2001
From: h7ml <h7ml@qq.com>
Date: Wed, 29 Jun 2022 17:50:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(equipmentCloud):=20=E4=BF=AE=E5=BE=A9?=
 =?UTF-8?q?=E8=A8=AD=E5=82=99=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=E5=90=8Epagination=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.EN.md                             |  3 ++-
 CHANGELOG.ZH.md                             |  3 ++-
 CHANGELOG.md                                |  3 ++-
 src/views/DeviceCloud/manage/home_index.vue | 11 ++++++-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
index f772b2744a..9d25a578a7 100644
--- a/CHANGELOG.EN.md
+++ b/CHANGELOG.EN.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-27)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-28)
 
 
 ### Bug Fixes
@@ -14,6 +14,7 @@
 
 ### Features
 
+* **统计功能:** 添加友盟统计 ([b0cd74d](https://github.com/dgiot/dgiot-dashboard/commit/b0cd74d8ea9454da3dec28447c46a2287a8b08c9))
 * **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
index f772b2744a..9d25a578a7 100644
--- a/CHANGELOG.ZH.md
+++ b/CHANGELOG.ZH.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-27)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-28)
 
 
 ### Bug Fixes
@@ -14,6 +14,7 @@
 
 ### Features
 
+* **统计功能:** 添加友盟统计 ([b0cd74d](https://github.com/dgiot/dgiot-dashboard/commit/b0cd74d8ea9454da3dec28447c46a2287a8b08c9))
 * **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f772b2744a..9d25a578a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-27)
+## [4.5.4](https://github.com/dgiot/dgiot-dashboard/compare/v4.5.5...v4.5.4) (2022-06-28)
 
 
 ### Bug Fixes
@@ -14,6 +14,7 @@
 
 ### Features
 
+* **统计功能:** 添加友盟统计 ([b0cd74d](https://github.com/dgiot/dgiot-dashboard/commit/b0cd74d8ea9454da3dec28447c46a2287a8b08c9))
 * **cloudPressure:** 压测报告生成添加等待时间 优化loading ([2969b9b](https://github.com/dgiot/dgiot-dashboard/commit/2969b9b605b24507300bfcbb48515ec6fc4a1a80))
 * **components:** 百度地图 ([2028435](https://github.com/dgiot/dgiot-dashboard/commit/2028435e76e2a7de221266fa54b40d793c9495cb))
 * **components:** 设备管理 ([0a9756c](https://github.com/dgiot/dgiot-dashboard/commit/0a9756cadaa45a0796f345fa064c1f1f239af7ee))
diff --git a/src/views/DeviceCloud/manage/home_index.vue b/src/views/DeviceCloud/manage/home_index.vue
index 4397ad36ba..24e05e5502 100644
--- a/src/views/DeviceCloud/manage/home_index.vue
+++ b/src/views/DeviceCloud/manage/home_index.vue
@@ -563,11 +563,9 @@
           </el-button>
         </template>
       </el-table-column>
-      <template #empty>
-        <el-image class="dgiot-data-empty" />
-      </template>
     </el-table>
     <el-pagination
+      :key="paginationKey"
       background
       :current-page="queryForm.size"
       :layout="layout"
@@ -639,6 +637,7 @@
     },
     data() {
       return {
+        paginationKey: moment(new Date()).valueOf() + '',
         upkey: moment(new Date()).valueOf() + '',
         dialog_device: false,
         mapLabel: {
@@ -1168,9 +1167,11 @@
         this.queryForm.skip = Number(val - 1) * Number(this.queryForm.limit)
         this.fetchData()
       },
-      handleQuery() {
+      async handleQuery() {
         this.queryForm.limit = 20
-        this.fetchData()
+        this.queryForm.skip = 0
+        this.paginationKey = moment(new Date()).valueOf() + ''
+        await this.fetchData()
       },
       async fetchData() {
         console.log(this.queryForm)