From 8155559d18295fa87902c62a62990c8c7ece50c3 Mon Sep 17 00:00:00 2001
From: 2183691628 <2183691628@qq.com>
Date: Thu, 16 Dec 2021 14:07:50 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  5 +++--
 .../off-limits-manage/alarm-query/index.vue   | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 2d6a97f..6cd0e1a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-16 10:22:58
+ * @LastEditTime: 2021-12-16 11:14:12
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -95,4 +95,5 @@ FEATURE
 ## v1.1.0F
 `2021年12月16日`
 FEATURE
-- 修改 用户例外搜索功能，可根据imei搜索
\ No newline at end of file
+- 修改 用户例外搜索功能，可根据imei搜索
+- 修改 告警分页查询页面功能
\ No newline at end of file
diff --git a/src/views/off-limits-manage/alarm-query/index.vue b/src/views/off-limits-manage/alarm-query/index.vue
index 774ef79..afd2652 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-14 09:22:56
+ * @LastEditTime: 2021-12-16 10:58:22
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue
  * @description:
 -->
@@ -72,9 +72,12 @@ export default {
             ],
             searchValue: "",
             columns: [
-                { prop: "alarmType", title: "告警类别", fixed: 'left' },
-                { prop: "imei", title: "设备IMEI" },
-                { prop: "alarmAddress", title: "告警地址/经纬度" },
+                /* { prop: "alarmType", title: "告警类别", fixed: 'left' }, */
+                { prop: "imei", title: "设备IMEI", fixed: 'left' },
+                { prop: "alarmAddress", title: "告警地址" },
+                { prop: "baiduLngLat", title: "百度经纬度" },
+                { prop: "gaodelngLat", title: "高德经纬度" },
+                { prop: "remarks", title: "告警内容" },
                 { prop: "createTime", title: "创建时间", fixed: 'right' }
                 /* {
                     action: true,
@@ -131,12 +134,14 @@ export default {
                 this.list = res.data.map(m => {
                     return {
                         imei: m.serialno,
-                        alarmType: m.typeId,
                         content: m.address,
                         createTime: m.createTime || "无",
-                        glat: m.glat,
-                        glng: m.glng,
-                        keyId: m.keyId
+                        alarmAddress: m.address,
+                        baiduLngLat: `${m.baiduLng}, ${m.baiduLat}`,
+                        gaodelngLat: `${m.glng}, ${m.glat}`,
+                        remarks: m.remarks,
+                        keyId: m.keyId,
+
                     };
                 });
                 this.total = res.count;