Merge branch 'bugfxi-common' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-23 09:56:46
+ * @LastEditTime: 2021-12-23 10:23:10
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -117,4 +117,5 @@ IMPROVEMENT
 ## v1.1.3F
 `2021年12月23日`
 IMPROVEMENT
-- 优化 用户例外和告警查询的搜索条件
+- 优化 用户例外和告警查询的搜索条件
+- 修复 用户例外弹窗标题显示错误的问题

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-21 11:49:06
+ * @LastEditTime: 2021-12-23 10:28:30
  * @LastEditors: JinxuChen
  * @Description:  自动报警分类
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue
@@ -25,7 +25,7 @@
           :rules="[{ required: true, message: '类别不能为空' }]"
         >
           <el-input
-            :xs="6" :sm="6" :lg="6"
+            :xs="24" :sm="24" :lg="8"
             v-model="currentAddType.typeLabel"
             placeholder="请输入类别"
           ></el-input>

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 09:43:16
+ * @LastEditTime: 2021-12-23 10:25:04
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -216,7 +216,7 @@ export default {
         // 增加
         onAdd() {
             this.resetForm();
-            this.dialogTitle = "添加通用例外";
+            this.dialogTitle = "添加用户例外";
             this.dialogPvVisible = true;
             this.dialogStatus = "add";
         },