diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8f91643..df9665b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -175,6 +175,7 @@
     <div class="goods-container" v-if="goodsVisible" v-drag>
       <goodsbox
         :endLngLat="endLngLat"
+        :firePopup = 'firePopupClosed'
         @close="goodsVisible = false"
       ></goodsbox>
     </div>
diff --git a/src/views/home/widget/goodsbox.vue b/src/views/home/widget/goodsbox.vue
index 6d3326e..c42e909 100644
--- a/src/views/home/widget/goodsbox.vue
+++ b/src/views/home/widget/goodsbox.vue
@@ -73,7 +73,7 @@ import { getMethodCommon } from "../../../api/common";
 const areaName = localStorage.getItem("areaName");
 export default {
   name: "monitorbox",
-  props: ["endLngLat"],
+  props: ["endLngLat",'firePopup'],
   data() {
     return {
       startLngLat: null,
@@ -95,6 +95,13 @@ export default {
     endLngLat: function (e) {
       this.getWuziList();
     },
+    firePopup: {
+      handler(newVal, oldVal) {
+        if (newVal == true) {
+          this.close();
+        }
+      },
+    },
   },
   created() {
     this.getWuziList();
@@ -156,9 +163,10 @@ export default {
       getMethodCommon("/FirePrevention/Loadwuzichubei", this.listQuery).then(
         (res) => {
           this.goodsListData = res.data;
-          this.nestWuziPoints = this.getNestPoint(this.endLngLat[0], this.endLngLat[1]);
-          console.log('this.nestWuziPoints : ', this.nestWuziPoints );
-          this.radioChange();
+          this.getNestPoint(this.endLngLat[0], this.endLngLat[1]).then(wz=>{
+            this.nestWuziPoints = wz
+            this.radioChange();
+          })
         }
       );
     },
diff --git a/src/views/home/widget/reportlist.vue b/src/views/home/widget/reportlist.vue
index 02aaf9d..3a03b80 100644
--- a/src/views/home/widget/reportlist.vue
+++ b/src/views/home/widget/reportlist.vue
@@ -265,15 +265,9 @@ export default {
                                     </div>
                                     <div class="data-li">
                                         <div class="data-value">
-<<<<<<< HEAD
                                             <span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" >人员调度</span>
                                             <span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" >附近水源</span>
                                             <span id="lablCSFM3" onclick="wuzi([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" >周边物资</span>
-=======
-                                            <span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" title="中间状态">人员调度</span>
-                                            <span id="lablCSFM2" onclick="wuzi([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" title="附近物资">附近物资</span>
-                                            <span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" title="附近水源">附近水源</span>
->>>>>>> 7d08eed0e10dd0cb32b78e668b31c45956f1ce0a
                                             <span id="lablSBZT1" onclick="jiankong('${item.createId}')" style="display:${jiankongDisplay}" class="label-tag data-value-status-1" title="视频监控">视频监控</span>
                                         </div>
                                     </div>