From eb39a1f4521cf657cbf9e4a1e9d3729661a34a32 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 24 Jan 2024 16:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=AD=A6=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/index.vue                    | 8 ++++----
 src/views/alarmcenter/index.vue             | 5 +++++
 src/views/wirelessintrusion/warn/record.vue | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 7c67f24..b7d46f2 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -267,7 +267,7 @@
               return
             }else{
               console.log('已经存在报警信息')
-              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层发生报警：' + obj.content
+              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层' + obj.address + '发生报警：' + obj.content
               this.isLoop = true;
               dom.play()
             }
@@ -278,7 +278,7 @@
               return
             }else{
               console.log('已经存在报警信息')
-              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层发生报警：' + obj.content
+              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层' + obj.address + '发生报警：' + obj.content
               this.isLoop = true;
               dom.play()
             }
@@ -292,7 +292,7 @@
               return
             }else{
               console.log('已经存在报警信息')
-              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层发生报警：' + obj.content
+              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层' + obj.address + '发生报警：' + obj.content
               this.isLoop = true;
               dom.play()
             }
@@ -303,7 +303,7 @@
               return
             }else{
               console.log('已经存在报警信息')
-              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层发生报警：' + obj.content
+              this.alarmInfo =  obj.buildId + '号楼' + obj.floorNo + '层' + obj.address + '发生报警：' + obj.content
               this.isLoop = true;
               dom.play()
             }
diff --git a/src/views/alarmcenter/index.vue b/src/views/alarmcenter/index.vue
index 5c7bf36..0746222 100644
--- a/src/views/alarmcenter/index.vue
+++ b/src/views/alarmcenter/index.vue
@@ -114,6 +114,11 @@ export default {
             prop: "floorNo",
             width: 80
           },
+          {
+            label: "位置",
+            prop: "address",
+            width: 80
+          },
           {
             label: "经纬度",
             prop: "xy",
diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue
index d1d2681..6cd7ba6 100644
--- a/src/views/wirelessintrusion/warn/record.vue
+++ b/src/views/wirelessintrusion/warn/record.vue
@@ -141,6 +141,11 @@ export default {
             prop: "floorNo",
             width: 80
           },
+          {
+            label: "位置",
+            prop: "address",
+            width: 80
+          },
           {
             label: "经纬度",
             prop: "xy",