Merge branch 'bugfix-user-delete' into develop

.env.test

@@ -1,4 +1,4 @@
-NODE_ENV = production
+NODE_ENV = test
 
 # just a flag
 ENV = 'test'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-23 11:34:51
+ * @LastEditTime: 2021-12-23 17:45:46
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -119,4 +119,7 @@ IMPROVEMENT
 IMPROVEMENT
 - 优化 用户例外和告警查询的搜索条件
 - 修复 用户例外弹窗标题显示错误的问题
-- 修改 用户和通用例外状态选择显示
+- 修改 用户和通用例外状态选择显示
+- 修复 删除用户例外时同一个imei的例外会全部删除的问题
+- 增加 告警类别删除功能（todo 待接口调整发布可开放）
+- 增加 警告查询 内容中文查询功能

src/api/area-category.js

@@ -1,15 +1,16 @@
 /*
  * @Author: gg
  * @Date: 2021-12-07 11:39:21
- * @LastEditTime: 2021-12-07 11:48:22
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-12-23 14:22:25
+ * @LastEditors: JinxuChen
  * @Description:    新增/编辑自动报警分类 自动报警分类查询（分页）
  * @FilePath: \GpsCardAdmin\src\api\area-category.js
  */
 import request from '@/utils/request'
 export const APILimits = {
     AreaCategoryQuery,
-    AddAreaCategory
+    AddAreaCategory,
+    DeleteAreaCategory, //删除告警分类
 };
 export default APILimits;
 
@@ -21,7 +22,7 @@ export function AreaCategoryQuery(data) {
       data
     })
   }
-  
+
   export function AddAreaCategory(data) {
     return request({
       url: '/api/v1/Fence/AddAreaCategory',
@@ -29,5 +30,11 @@ export function AreaCategoryQuery(data) {
       data
     })
   }
+  export function DeleteAreaCategory(params) {
+    return request({
+      url: '/api/v1/Fence/DeleteAreaAlarmFilter',
+      method: 'post',
+      data: params
+    })
+  }
 
-   

src/components/Pagination/index.vue

@@ -105,7 +105,6 @@ export default {
     watch: {
         // 监听浏览器可视窗口变化
         screenWidth(val){
-            console.log(val);
             const IWIDTH = 991;
             if(val - 1 < IWIDTH) {
                 this.isMobile = true;

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-23 09:53:54
+ * @LastEditTime: 2021-12-23 14:15:59
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -128,7 +128,8 @@ export default {
             let reqBody = {
                 pageNumber: this.page,
                 begNumber: this.limit,
-                imei: this.checkIsNumber(this.searchValue) ? this.searchValue : this.searchValue,
+                imei: this.checkIsNumber(this.searchValue) ? this.searchValue : "",
+                keyword: this.checkIsNumber(this.searchValue) ? "": this.searchValue
             };
             APIAlarmQuery.getAlarmQuery(reqBody).then(res => {
                 this.list = res.data.map(m => {

src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-07 15:14:51
- * @LastEditTime: 2021-12-23 10:28:30
+ * @LastEditTime: 2021-12-23 17:44:51
  * @LastEditors: JinxuChen
  * @Description:  自动报警分类
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue
@@ -121,7 +121,7 @@ export default {
           title: "操作",
           actions: [
             { fnName: "update", title: "修改", type: "primary", icon: 'el-icon-edit' },
-            //{ fnName: "delete", title: "删除", type: "error" },
+            /* { fnName: "delete", title: "删除", type: "danger" , icon: 'el-icon-delete'}, */ //todo 待接口发布可以开放
           ],
         },
       ],
@@ -237,6 +237,25 @@ export default {
     // 删除
     onDelete(row) {
       console.log("删除", row);
+      this.$confirm("是否删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+        }).then(() => {
+            let reqBody = {
+                id: row.keyId,
+                type: "category"
+            };
+            CategoryAPI.DeleteAreaCategory(reqBody).then(res => {
+                if (res.code === 0) {
+                    this.$message({
+                        type: "success",
+                        message: "删除成功!"
+                    });
+                    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-23 11:43:25
+ * @LastEditTime: 2021-12-23 15:45:42
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -311,7 +311,7 @@ export default {
                 .then(() => {
                     let reqBody = {
                         keyId: row.keyId,
-                        imei: row.imei
+                        imei: ""
                     };
                     APIExceptionUser.delRecognitionUser(reqBody).then(res => {
                         if (res.code === 0) {
@@ -330,7 +330,7 @@ export default {
                 })
                 .catch(() => {});
         },
-        // 转通用例外 todo 待接口说明
+        // 转通用例外
         onTransform(row) {
             console.log("row", row);
             this.dialogTrans = true;