Merge branch 'feature-alarm-query' into develop

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搜索
+- 修改 用户例外搜索功能，可根据imei搜索
+- 修改 告警分页查询页面功能

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;