Merge branch 'bugfix-page' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 14:55:21
+ * @LastEditTime: 2021-12-08 15:18:14
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -50,4 +50,6 @@ FEATURE
 ## v1.0.5F
 `2021年12月8日`
 FEATURE
-- 完成 1.告警识别内容 2.通用例外 3.用户例外 4.告警信息查询 模块功能接口调试对接
+- 完成 1.告警识别内容 2.通用例外 3.用户例外 4.告警信息查询 模块功能接口调试对接
+FIX
+- 修复 搜索时页码错误的问题

src/views/off-limits-manage/alarm-query/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 14:57:44
+ * @LastEditTime: 2021-12-08 15:15:42
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -15,6 +15,8 @@
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
+                clearable
+                @clear="onClear"
             />
             <el-button
                 class="filter-item"
@@ -96,9 +98,20 @@ export default {
             limit: 10
         };
     },
+    watch: {
+        searchValue(value) {
+            if (value === "") {
+                this.$refs['pages'].currentPage = 1;
+                this.getList();
+            }
+        }
+    },
     methods: {
         // 搜索
-        onSearch() {},
+        onSearch() {
+            this.$refs['pages'].currentPage = 1;
+            this.getList();
+        },
         // 修改
         onUpdate(row) {
             console.log("修改", row);
@@ -128,6 +141,11 @@ export default {
                 });
                 this.total = res.count;
             });
+        },
+        // 点击清除按钮时
+        onClear() {
+            this.$refs["pages"].currentPage = 1;
+            this.getList();
         }
     },
     mounted() {

src/views/off-limits-manage/alarm-recognition/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 10:37:15
+ * @LastEditTime: 2021-12-08 15:16:20
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue
  * @description:
 -->
@@ -31,6 +31,7 @@
                 style="width: 130px; margin-left: 10px;"
                 filterable
                 @change="outSelecChange"
+                @clear="onClear"
                 clearable
             >
                 <el-option
@@ -209,11 +210,13 @@ export default {
     watch: {
         model(value) {
             if (value === "") {
+                this.$refs['pages'].currentPage = 1;
                 this.getList();
             }
         },
         searchValue(value) {
             if (value === "") {
+                this.$refs['pages'].currentPage = 1;
                 this.getList();
             }
         }
@@ -421,6 +424,11 @@ export default {
         // 页面选择框变化
         outSelecChange(value) {
             this.model = value;
+        },
+        // 点击清除按钮时
+        onClear() {
+            this.$refs["pages"].currentPage = 1;
+            this.getList();
         }
     },
     mounted() {

src/views/off-limits-manage/common-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 14:14:18
+ * @LastEditTime: 2021-12-08 15:16:43
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue
  * @description:
 -->
@@ -40,6 +40,7 @@
                 style="width: 200px; margin-left: 10px;"
                 class="filter-item"
                 @keyup.enter.native="onSearch"
+                @clear="onClear"
                 clearable
             />
             <el-button
@@ -373,6 +374,11 @@ export default {
         // 页面选择框变化
         outSelecChange(value) {
             this.model = value;
+        },
+        // 点击清除按钮时
+        onClear() {
+            this.$refs["pages"].currentPage = 1;
+            this.getList();
         }
     },
     mounted() {

src/views/off-limits-manage/user-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-08 14:45:22
+ * @LastEditTime: 2021-12-08 15:13:12
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -23,6 +23,7 @@
                 class="filter-item"
                 @keyup.enter.native="onSearch"
                 clearable
+                @clear="onClear"
             />
             <el-button
                 class="filter-item"
@@ -410,6 +411,11 @@ export default {
         outSelecChange(value) {
             this.model = value;
             console.log("model", this.model);
+        },
+        // 点击清除按钮时
+        onClear() {
+            this.$refs["pages"].currentPage = 1;
+            this.getList();
         }
     },
     mounted() {