Merge branch 'bugfix-alarm-query' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-22 18:29:36
+ * @LastEditTime: 2021-12-23 09:56:46
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -111,4 +111,10 @@ IMPROVEMENT
 ## v1.1.2F
 `2021年12月22日`
 IMPROVEMENT
-- 优化 通用和用户例外 状态显示方式
+- 优化 通用和用户例外 状态显示方式
+
+
+## v1.1.3F
+`2021年12月23日`
+IMPROVEMENT
+- 优化 用户例外和告警查询的搜索条件

src/utils/model.js

@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-22 18:29:45
+ * @LastEditTime: 2021-12-23 09:56:31
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.1.2';
+export const VersionModel = '1.1.3';

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-16 10:58:22
+ * @LastEditTime: 2021-12-23 09:53:54
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -128,7 +128,7 @@ export default {
             let reqBody = {
                 pageNumber: this.page,
                 begNumber: this.limit,
-                imei: this.searchValue
+                imei: this.checkIsNumber(this.searchValue) ? this.searchValue : this.searchValue,
             };
             APIAlarmQuery.getAlarmQuery(reqBody).then(res => {
                 this.list = res.data.map(m => {
@@ -151,6 +151,13 @@ export default {
         onClear() {
             this.$refs["pages"].currentPage = 1;
             this.getList();
+        },
+        // 判断是否是数字并且是15位
+        checkIsNumber(value) {
+            let reg = /^[0-9]+.?[0-9]*$/;
+            if(value.length >= 15 && reg.test(value)) {
+                return true
+            }
         }
     },
     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-22 18:26:48
+ * @LastEditTime: 2021-12-23 09:43:16
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -374,8 +374,8 @@ export default {
                 pageNumber: this.page,
                 begNumber: this.limit,
                 type: "system",
-                imei: this.searchValue.length === 15 ? this.searchValue : "",
-                keyword: this.searchValue.length === 15 ? "" :this.searchValue
+                imei: this.checkIsNumber(this.searchValue) ? this.searchValue : "",
+                keyword: this.checkIsNumber(this.searchValue) ? "" : this.searchValue
             };
             APIExceptionUser.getRecognitionUser(reqBody).then(res => {
                 this.list = res.data.map(m => {
@@ -419,6 +419,13 @@ export default {
         onClear() {
             this.$refs["pages"].currentPage = 1;
             this.getList();
+        },
+        // 判断是否是数字并且是15位
+        checkIsNumber(value) {
+            let reg = /^[0-9]+.?[0-9]*$/;
+            if(value.length >= 15 && reg.test(value)) {
+                return true
+            }
         }
     },
     mounted() {