From fe0ce802d1773bb3cb5a99bdc794af0c844facbe Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Sat, 22 Jan 2022 11:38:59 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20-=20=E4=BF=AE=E6=94=B9=20=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=9F=A5=E8=AF=A2=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                         | 9 +++++++--
 src/utils/model.js                                | 4 ++--
 src/views/off-limits-manage/alarm-query/index.vue | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 561f644..f7b02d1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-01-12 17:34:32
+ * @LastEditTime: 2022-01-22 11:37:01
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -182,4 +182,9 @@ FIX
 FIX
 - 修复 登录过期没有跳转到登录界面的问题
 - 修复 登录过期错误提示两次的问题
-- 修改 用户例外转通用弹窗大小
\ No newline at end of file
+- 修改 用户例外转通用弹窗大小
+
+## v1.2.3F
+`2021年1月22日`
+FIX
+- 修改 告警查询创建时间显示
\ No newline at end of file
diff --git a/src/utils/model.js b/src/utils/model.js
index 1d5dff0..deffd2e 100644
--- a/src/utils/model.js
+++ b/src/utils/model.js
@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-01-12 09:18:47
+ * @LastEditTime: 2022-01-22 11:37:12
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.2.2';
\ No newline at end of file
+export const VersionModel = '1.2.3';
diff --git a/src/views/off-limits-manage/alarm-query/index.vue b/src/views/off-limits-manage/alarm-query/index.vue
index c1833dc..19f4521 100644
--- a/src/views/off-limits-manage/alarm-query/index.vue
+++ b/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 14:15:59
+ * @LastEditors: JinxChen
+ * @LastEditTime: 2022-01-22 11:38:03
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -136,7 +136,7 @@ export default {
                     return {
                         imei: m.serialno,
                         content: m.address,
-                        createTime: m.createTime || "无",
+                        createTime: m.deviceTime || "无",
                         alarmAddress: m.address,
                         baiduLngLat: `${m.baiduLng}, ${m.baiduLat}`,
                         gaodelngLat: `${m.glng}, ${m.glat}`,