Merge branch 'bugfix-status' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-23 10:23:10
+ * @LastEditTime: 2021-12-23 11:34:51
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -118,4 +118,5 @@ IMPROVEMENT
 `2021年12月23日`
 IMPROVEMENT
 - 优化 用户例外和告警查询的搜索条件
-- 修复 用户例外弹窗标题显示错误的问题
+- 修复 用户例外弹窗标题显示错误的问题
+- 修改 用户和通用例外状态选择显示

src/utils/checkout-status-to-num.js

@@ -1,16 +1,16 @@
 /*
  * @Date: 2021-12-07 10:45:23
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-22 17:47:00
+ * @LastEditTime: 2021-12-23 11:23:00
  * @FilePath: \GpsCardAdmin\src\utils\checkout-status-to-num.js
  * @description: 将接口里面的kindId转化为文字
  */
 exports.install = function (Vue, options) {
   Vue.prototype.checkoutStatusToNum = function (value) {
     if (value === true) {
-      return 2
-    } else if (value === false) {
       return 1
+    } else if (value === false) {
+      return 0
     }
   }
 }

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-14 09:24:43
+ * @LastEditTime: 2021-12-23 11:21:28
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue
  * @description:
 -->
@@ -102,7 +102,7 @@
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>
-                    <el-switch v-model="form.status"  active-text="打开" inactive-text="关闭"></el-switch>
+                    <el-switch v-model="form.status"  active-text="启用" inactive-text="关闭"></el-switch>
                 </el-form-item>
                 <!-- 创建时间 -->
                 <el-form-item label="创建时间" prop="timestamp" v-show="false">

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-22 18:19:16
+ * @LastEditTime: 2021-12-23 11:24:24
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue
  * @description:
 -->
@@ -104,7 +104,7 @@
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>
-                    <el-switch v-model="form.status" active-text="例外" inactive-text="启用"></el-switch>
+                    <el-switch v-model="form.status" active-text="启用" inactive-text="关闭"></el-switch>
                     <!-- <el-radio-group v-model="form.status" size="medium">
                         <el-radio border :label="0">未启用</el-radio>
                         <el-radio border :label="1">黑名单</el-radio>
@@ -206,7 +206,7 @@ export default {
                 content: "",
                 createTime: "",
                 categoryId: "",
-                status: false
+                status: true
             };
         },
         // 添加
@@ -266,7 +266,7 @@ export default {
             this.form.model = row.categoryId;
             this.form.id = row.id;
             this.form.content = row.content;
-            this.form.status = row.status === '启用' ? false : true;
+            this.form.status = row.status === '启用' ? true : false;
         },
         update(formName) {
             console.log("update");
@@ -345,7 +345,7 @@ export default {
                         createTime: m.createTime,
                         kindId: m.kindId,
                         categoryId: m.categoryId,
-                        status: m.status === 1 ? '启用' : '例外',
+                        status: m.status === 0 ? '关闭' : '启用',
                         id: m.id
                     };
                 });

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 10:25:04
+ * @LastEditTime: 2021-12-23 11:29:20
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -81,7 +81,7 @@
                 </el-form-item>
                 <!-- 状态 -->
                 <el-form-item label="状态" prop="status" required>
-                    <el-switch v-model="form.status" active-text="例外" inactive-text="启用"></el-switch>
+                    <el-switch v-model="form.status" active-text="启用" inactive-text="关闭"></el-switch>
                     <!-- <el-radio-group v-model="form.status" size="medium">
                         <el-radio border :label="0">未启用</el-radio>
                         <el-radio border :label="1">黑名单</el-radio>
@@ -210,7 +210,7 @@ export default {
                 content: "",
                 createTime: "",
                 categoryId: "",
-                status: false
+                status: true
             };
         },
         // 增加
@@ -266,7 +266,7 @@ export default {
             this.dialogTitle = "修改用户例外";
             this.form = Object.assign({}, row); // copy obj
             this.form.createTime = new Date(this.form.createTime);
-            this.form.status = row.status === '启用' ? false : true;
+            this.form.status = row.status === '启用' ? true : false;
         },
         update(formName) {
             let reqBody = {
@@ -335,7 +335,7 @@ export default {
             console.log("row", row);
             this.dialogTrans = true;
             this.content = row.content;
-            this.form.status = row.status === '启用' ? 1 : 2;
+            this.form.status = row.status === '启用' ? 1 : 0;
         },
         // 确定转通用例外
         onTransConfirm() {
@@ -386,7 +386,7 @@ export default {
                         glat: m.glat,
                         glng: m.glng,
                         keyId: m.keyId,
-                        status: m.status === 1 ? '启用' : '例外'
+                        status: m.status === 0 ? '关闭' : '启用'
                     };
                 });
                 this.total = res.count;