Merge branch 'master' of http://124.222.8.13:3000/revisit/DSDSWeb

src/views/statistics/AuvStatistics.vue

@@ -139,7 +139,16 @@ export default {
     });
   },
   beforeDestroy() {
-
+    const unitMap = Vue.config.maps && Vue.config.maps['workUnitMap_auv']
+    if (unitMap) {
+      unitMap.remove()
+      delete Vue.config.maps['workUnitMap_auv']
+    }
+    const voyageMap = Vue.config.maps && Vue.config.maps['voyageMap_auv']
+    if (voyageMap) {
+      voyageMap.remove()
+      delete Vue.config.maps['voyageMap_auv']
+    }
   },
   methods: {
     // 无人航行潜水器数据

src/views/statistics/HovStatistics.vue

@@ -137,7 +137,16 @@ export default {
     });
   },
   beforeDestroy() {
-
+    const unitMap = Vue.config.maps && Vue.config.maps['workUnitMap_hov']
+    if (unitMap) {
+      unitMap.remove()
+      delete Vue.config.maps['workUnitMap_hov']
+    }
+    const voyageMap = Vue.config.maps && Vue.config.maps['voyageMap_hov']
+    if (voyageMap) {
+      voyageMap.remove()
+      delete Vue.config.maps['voyageMap_hov']
+    }
   },
   methods: {
     // 载人潜水器数据

src/views/statistics/RovStatistics.vue

@@ -139,7 +139,16 @@ export default {
     });
   },
   beforeDestroy() {
-
+    const unitMap = Vue.config.maps && Vue.config.maps['workUnitMap_rov']
+    if (unitMap) {
+      unitMap.remove()
+      delete Vue.config.maps['workUnitMap_rov']
+    }
+    const voyageMap = Vue.config.maps && Vue.config.maps['voyageMap_rov']
+    if (voyageMap) {
+      voyageMap.remove()
+      delete Vue.config.maps['voyageMap_rov']
+    }
   },
   methods: {
     // 遥控潜水器数据

src/views/statistics/ShipStatistics.vue

@@ -149,7 +149,16 @@ export default {
     })
   },
   beforeDestroy() {
-
+    const unitMap = Vue.config.maps && Vue.config.maps['workUnitMap_ship']
+    if (unitMap) {
+      unitMap.remove()
+      delete Vue.config.maps['workUnitMap_ship']
+    }
+    const voyageMap = Vue.config.maps && Vue.config.maps['voyageMap_ship']
+    if (voyageMap) {
+      voyageMap.remove()
+      delete Vue.config.maps['voyageMap_ship']
+    }
   },
   methods: {
     // 科考船数据

src/views/statistics/UuvUnitStatistics.vue

@@ -27,7 +27,7 @@
         <div class="map-title">参航单位</div>
         <div id="workUnitMap_uuv" ref="workUnitMap_uuv" style="height: 100%;width:100%;" />
       </div>
-      <div class="bezel">
+      <!-- <div class="bezel">
         <div class="map-title">航次地图</div>
         <div class="map-year-panel">
           <span class="map-year-label">年份</span>
@@ -35,7 +35,7 @@
             format="yyyy" @change="selectVoyageYear" />
         </div>
         <div id="voyageMap_uuv" ref="voyageMap_uuv" style="height: 100%;width:100%;" />
-      </div>
+      </div> -->
     </div>
     <!-- echarts板块-->
     <div class="echarts-module">
@@ -155,17 +155,17 @@ export default {
     initMapbox('workUnitMap_uuv', {
       tileKey: 'gaode',
       zoom: 3,
-      center: [110, 31],
+      center: [110, 33],
-      minZoom: 2,
-      maxZoom: 29
-    })
-    initMapbox('voyageMap_uuv', {
-      tileKey: 'GEBCO_basemap_NCEI',
-      zoom: 3,
-      center: [113, 15],
       minZoom: 2,
       maxZoom: 29
     })
+    // initMapbox('voyageMap_uuv', {
+    //   tileKey: 'GEBCO_basemap_NCEI',
+    //   zoom: 3,
+    //   center: [113, 15],
+    //   minZoom: 2,
+    //   maxZoom: 29
+    // })
   },
   beforeDestroy() {
     const unitMap = Vue.config.maps && Vue.config.maps['workUnitMap_uuv']