From 88181075299f3ebc0faa57b50192e761d0d9303a Mon Sep 17 00:00:00 2001
From: 2183691628 <2183691628@qq.com>
Date: Fri, 24 Dec 2021 17:46:08 +0800
Subject: [PATCH] =?UTF-8?q?FEA=20-=20=E5=A2=9E=E5=8A=A0=20=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E7=B1=BB=E5=88=AB=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20FIX=20-=20=E4=BF=AE=E5=A4=8D=20=E5=91=8A=E8=AD=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                             | 11 +++++++++--
 src/utils/model.js                                    |  4 ++--
 .../off-limits-main/off-limits-type/index.vue         |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3671d2d..ff88aa2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-23 17:45:46
+ * @LastEditTime: 2021-12-24 17:42:49
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -122,4 +122,11 @@ IMPROVEMENT
 - 修改 用户和通用例外状态选择显示
 - 修复 删除用户例外时同一个imei的例外会全部删除的问题
 - 增加 告警类别删除功能（todo 待接口调整发布可开放）
-- 增加 警告查询 内容中文查询功能
\ No newline at end of file
+- 增加 警告查询 内容中文查询功能
+
+## v1.1.4F
+`2021年12月24日`
+FEA
+- 增加 告警类别删除功能
+FIX
+- 修复 告警类别修改失败的问题
\ No newline at end of file
diff --git a/src/utils/model.js b/src/utils/model.js
index 2e40364..a9933e9 100644
--- a/src/utils/model.js
+++ b/src/utils/model.js
@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-23 09:56:31
+ * @LastEditTime: 2021-12-24 17:43:48
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.1.3';
\ No newline at end of file
+export const VersionModel = '1.1.4';
\ No newline at end of file
diff --git a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue b/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
index 7375b7d..188575b 100644
--- a/src/views/off-limits-manage/off-limits-main/off-limits-type/index.vue
+++ b/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 17:44:51
+ * @LastEditTime: 2021-12-24 17:39:59
  * @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: "danger" , icon: 'el-icon-delete'}, */ //todo 待接口发布可以开放
+            { fnName: "delete", title: "删除", type: "danger" , icon: 'el-icon-delete'},
           ],
         },
       ],