合并到master

src/views/home/index.vue

@@ -45,11 +45,7 @@
           </div>
 
           <div class="huoqing-box" v-if="reportlistShow">
-<<<<<<< HEAD
             <reportlist :mergeSuccessRandom="mergeSuccessRandom" @wuzi="wuzi" @shuiyuan="shuiyuan" @jiankong="jiankong" @renyuan="renyuan" @merge="mergeboxShow=true;" @changeCurrentInfo="changeCurrentInfo" :globalmap="globalmap" :checkList="checkList"></reportlist>
-=======
-            <reportlist :mergeSuccessRandom="mergeSuccessRandom" @wuzi="wuzi" @shuiyuan="shuiyuan" @jiankong="jiankong" @merge="mergeboxShow=true;" @changeCurrentInfo="changeCurrentInfo" :globalmap="globalmap" :checkList="checkList"></reportlist>
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
           </div>
 
           <div class="huoqing-box" v-if="mergeboxShow">
@@ -179,10 +175,7 @@ import taskbox from './widget/taskbox.vue';
 import gridbox from './widget/gridbox.vue';
 import LCmonitorbox from './widget/LCmonitorbox.vue'
 import HKmonitorbox from './widget/HKmonitorbox.vue'
-<<<<<<< HEAD
 import personnel from './widget/personnel.vue';
-=======
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
 import axios from 'axios';
 import jQuery from 'jquery';
 import { mask } from '@turf/turf';
@@ -206,12 +199,8 @@ export default {
     gridbox,
     LCmonitorbox,
     HKmonitorbox,
-<<<<<<< HEAD
     mergebox,
     personnel
-=======
-    mergebox
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
   },
 
   data() { 
@@ -338,7 +327,6 @@ export default {
       this.HKmonitorboxShow = true;
 
     },
-<<<<<<< HEAD
     renyuan(item){
       if(this.personVisible){
         this.personVisible = false
@@ -346,8 +334,6 @@ export default {
         this.personVisible = true;
       }
     },
-=======
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
     // 水源
     shuiyuan(item){
       this.waterCenter = item;

src/views/home/widget/reportlist.vue

@@ -71,10 +71,7 @@ import { parse } from '../lib/handleGeojson';
         window.wuzi = this.wuzi
         window.shuiyuan = this.shuiyuan
         window.jiankong = this.jiankong;
-<<<<<<< HEAD
         window.renyuan = this.renyuan
-=======
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
     },
     mounted(){
 
@@ -187,11 +184,7 @@ import { parse } from '../lib/handleGeojson';
                                 </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" title="中间状态">人员调度</span>
-=======
-                                        <span id="lablSBZT1"  class="label-tag data-value-status-1" title="人员调度">人员调度</span>
->>>>>>> db204fe98ead24f5ba150023a2da0b2e70e01a80
                                         <span id="lablSBZT2" onclick="wuzi([${item.lng},${item.lat}]);"  class="label-tag data-value-status-0" title="物资调度" >物资调度</span>
                                         <span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" title="附近水源">附近水源</span>
                                         <span id="lablSBZT1" onclick="jiankong([${item.lng},${item.lat}])" class="label-tag data-value-status-1" title="视频监控">视频监控</span>