Merge branch 'bugfix-user-search' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-15 16:47:35
+ * @LastEditTime: 2021-12-16 10:22:58
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -89,4 +89,10 @@ FIX
 ## v1.0.9F
 `2021年12月15日`
 FEATURE
-- 修改 通用例外和用户例外状态选择方式
+- 修改 通用例外和用户例外状态选择方式
+
+
+## v1.1.0F
+`2021年12月16日`
+FEATURE
+- 修改 用户例外搜索功能，可根据imei搜索

src/utils/model.js

@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-14 09:28:08
+ * @LastEditTime: 2021-12-16 10:23:05
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.0.9';
+export const VersionModel = '1.1.0';

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-15 16:43:36
+ * @LastEditTime: 2021-12-16 10:20:45
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -202,14 +202,7 @@ export default {
             placeholder: '请输入内容'
         };
     },
-    watch: {
-        searchValue(value) {
-            if (value === "") {
-                this.form.imei = "";
-                this.getList();
-            }
-        }
-    },
+    watch: {},
     methods: {
         // 清空表单
         resetForm() {
@@ -380,8 +373,8 @@ export default {
                 pageNumber: this.page,
                 begNumber: this.limit,
                 type: "system",
-                imei: this.form.imei,
-                keyword: this.searchValue
+                imei: this.searchValue.length === 15 ? this.searchValue : "",
+                keyword: this.searchValue.length === 15 ? "" :this.searchValue
             };
             APIExceptionUser.getRecognitionUser(reqBody).then(res => {
                 this.list = res.data.map(m => {