Merge branch 'develop' of gitadmin/tuoheng_lc_web into release

src/views/task-manage/all-task/components/DemandDrawer.vue

@@ -308,6 +308,9 @@ export default defineComponent({
 #history-map {
   width: 100%;
   height: 100%;
+  :deep(.ol-viewport){
+    position: absolute !important;
+  }
 }
 /* 视频 */
 .videobox {

src/views/task-manage/all-task/components/LiveDrawer.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, ref, reactive, toRefs, watch, nextTick, onBeforeUnmount, onMounted } from 'vue'
+import { defineComponent, computed, ref, reactive, toRefs, watch, nextTick, onBeforeUnmount } from 'vue'
 import { Map, View, Feature } from 'ol'
 import 'ol/ol.css'
 import { Tile, Vector as VectorLayer } from 'ol/layer'
@@ -195,6 +195,7 @@ export default defineComponent({
             initOriginPlayer()
           }
           if (!data.mapData) {
+            initMap()
             // 加载机场航线
             getLineData().then(({ trackList }) => {
               if (trackList.length > 0) {
@@ -367,10 +368,6 @@ export default defineComponent({
       data.videoShow = value
     }
 
-    onMounted(() => {
-      initMap()
-    })
-
     onBeforeUnmount(() => {
       liveStore.resetList()
       originRef.value?.disposeVideo()
@@ -404,10 +401,14 @@ export default defineComponent({
   height: 100%;
   position: relative;
   overflow: hidden;
+
 }
 #live-map {
   width: 100%;
   height: 100%;
+  :deep(.ol-viewport){
+    position: absolute !important;
+  }
 }
 /* 视频 */
 .videobox {