diff --git a/src/views/screen/emergency-extend.vue b/src/views/screen/emergency-extend.vue
index edec418..9bdc1a6 100644
--- a/src/views/screen/emergency-extend.vue
+++ b/src/views/screen/emergency-extend.vue
@@ -121,7 +121,7 @@
                 <div style="width: 100%; height: 735px">
                     <div class="new-alarm-box">
                         <div class="new-alarm-title">预警设备</div>
-                        <div class="new-alarm-desc">预警IP</div>
+                        <div class="new-alarm-desc">预警类型</div>
                         <div class="new-alarm-desc">预警时间</div>
                         <div class="new-alarm-desc">预警信息</div>
                     </div>
@@ -151,7 +151,7 @@
                                     style="text-align: center; width: 20%"
                                     :data-index="index"
                                 >
-                                    {{ item.deviceIp }}
+                                    {{ item.type }}
                                 </div>
                                 <div
                                     class="alarm-record-title"
@@ -191,8 +191,8 @@
             </div>
         </div>
         <div class="page-bottom-bg"></div>
-<div class="page-left-bg"></div>
-<div class="page-right-bg"></div>
+        <div class="page-left-bg"></div>
+        <div class="page-right-bg"></div>
         <emergency-modal
             v-model="socState"
             width="988px"
@@ -221,7 +221,6 @@ import alarmDig from "@/views/screen/components/alarm/alarm-dig.vue";
 import BaseAlarmDig from "@/views/screen/components/alarm/baseAlarmDig.vue";
 import VideoOne from "./components/video-monitor/video-one.vue";
 
-
 export default {
     name: "EmergencyExtend",
     components: {
@@ -271,7 +270,7 @@ export default {
                 waitTime: 1000, // 单步运动停止的时间(默认值1000ms)
             },
             socState: false,
-            videoItem: {}
+            videoItem: {},
         };
     },
     computed: {},
@@ -292,7 +291,12 @@ export default {
             // 烟火预警
             this.sockets.subscribe("FIRE", (data) => {
                 console.log("烟火预警", data);
-                this.diaAlarmInfo = data.data;
+                this.diaAlarmInfo = data;
+                if (this.diaAlarmInfo.picture) {
+                    this.diaAlarmInfo.picture = JSON.parse(
+                        this.diaAlarmInfo.picture
+                    );
+                }
                 this.alarmInfoModal = false;
                 this.socState = true;
                 this.queryCount(this.videoList);
@@ -324,7 +328,7 @@ export default {
                         });
                         this.queryAlarmRecord(this.videoList);
                         this.queryCount(this.videoList);
-                        this.videoItem = this.videoList[0]
+                        this.videoItem = this.videoList[0];
                         this.videoUrl = this.videoList[0].url;
                         this.deviceIp = this.videoList[0].deviceIp;
                     }
@@ -333,15 +337,14 @@ export default {
         openAlarmModal(event) {
             console.log(event);
             let index = event.target.dataset.index;
-            if (index) {
-                this.diaAlarmInfo = this.alarmInfoList[index];
-                try {
-                    this.diaAlarmInfo.picture = JSON.parse(
-                        this.diaAlarmInfo.picture
-                    )[0];
-                } catch (error) {}
-                this.alarmInfoModal = true;
+            let data = this.alarmInfoList[index];
+            if (data.picture) {
+                data.picture = JSON.parse(data.picture);
             }
+
+            this.diaAlarmInfo = data;
+            console.log(index, data);
+            this.alarmInfoModal = true;
         },
         changeVideo(e) {
             let index = e.target.dataset.index;
diff --git a/src/views/screen/grid-manage.vue b/src/views/screen/grid-manage.vue
index bcf33c6..6a902f3 100644
--- a/src/views/screen/grid-manage.vue
+++ b/src/views/screen/grid-manage.vue
@@ -338,9 +338,9 @@ export default {
         clickTreeNode(data) {
             let _thisMap = this.$refs.gisMap;
             // 清除地图
-            if (_thisMap.map) {
-                _thisMap.map.clearMap();
-            }
+            // if (_thisMap.map) {
+            //     _thisMap.map.clearMap();
+            // }
             this.getAdmin(data.gridBasicId);
             this.getOwnerList(data.gridBasicId);
             this.getAreaMark(data.gridBasicId);
diff --git a/src/views/screen/person-warring.vue b/src/views/screen/person-warring.vue
index 6f94179..8e94e0b 100644
--- a/src/views/screen/person-warring.vue
+++ b/src/views/screen/person-warring.vue
@@ -310,6 +310,7 @@ export default {
             if (data.picture) {
                 data.picture = JSON.parse(data.picture)
             }
+            
             this.diaAlarmInfo = data
             console.log(index, data)
             this.alarmInfoModal = true
diff --git a/src/views/screen/smart-travel.vue b/src/views/screen/smart-travel.vue
index b6668ba..6103926 100644
--- a/src/views/screen/smart-travel.vue
+++ b/src/views/screen/smart-travel.vue
@@ -584,7 +584,7 @@ export default {
         queryDevice() {
             let params = {
                 pageNum: 1,
-                pageSize: 20,
+                pageSize: 10000,
                 deviceType: this.currentTreeItem.title,
             };
             if (this.currentTreeItem.title == "翠屏区全域") {