遗漏冲突解决

src/views/Home/components/map.vue

@@ -83,11 +83,7 @@
     </div>
     <div class="map-img">
       <!-- 宁夏地图总览 -->
-<<<<<<< HEAD
       <SvgMapNX v-if="mapName === 'nx'" :show="showType" :data="sourceMap" :xtData="xtMap" @clickLabel="clickLabel"></SvgMapNX>
-=======
-      <SvgMapNX v-show="mapName === 'nx'" :show="showType" :data="sourceMap" @clickLabel="clickLabel"></SvgMapNX>
->>>>>>> bfc4edf45d549e1e9421d734942de23c8d00d8fc
       <!-- 麻黄山风电场 -->
       <MHSFDC v-if="mapName === 'MHS_FDC'" :data="sourceMap" @clickFj="clickFj"></MHSFDC>
     </div>