Merge remote-tracking branch 'origin/master'

src/assets/styles/base.scss

@@ -1150,7 +1150,16 @@ div::-webkit-scrollbar {
 //一体化弹层
 
 //覆盖elementUI
-
+.el-steps--horizontal{
+	margin-top: .5rem;
+}
+.el-step__main{
+	position: relative;
+	left: -.8rem;
+}
+.el-step__title.is-process{
+	color: #10c0ff!important;
+}
 .el-dialog:not(.is-fullscreen) {
     margin-top: 15vh !important;
 }

src/components/vBottomMenu.vue

@@ -57,7 +57,7 @@
     left: 50%;
     transform: translateX(-50%);
     bottom: 0;
-    z-index: 100000;
+    z-index: 999;
     border-radius: 5px;
     display: flex;
     justify-content: center;

src/views/forest.vue

@@ -294,8 +294,9 @@
           </el-tab-pane>
           <el-tab-pane label="地理位置" name="point" style="height: 1000px;">
             视频联动  矢量标记 测面 测距
+						          <supermapNotProcessed ref="supermapNotProcessed"  style="width:100% ;z-index: 1000000000000;position: absolute;height: 100vh;top: 0;left: 0;	" :mapDiv="'forestWarmSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" @preview="preview" :isSideBySide="false"></supermapNotProcessed>
           </el-tab-pane>
-          <supermapNotProcessed ref="supermapNotProcessed"  style="width: 1000px;height: 1000px;" :mapDiv="'forestWarmSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" @preview="preview" :isSideBySide="false"></supermapNotProcessed>
+          <!-- <supermapNotProcessed ref="supermapNotProcessed"  style="width: 1000px;height: 1000px;" :mapDiv="'forestWarmSuperMap'" :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" @preview="preview" :isSideBySide="false"></supermapNotProcessed> -->
         </el-tabs>
       </el-dialog>
 			<el-dialog title="事件信息-处理中" :visible.sync="eventInfoVisible_Processed"  v-if="eventInfoVisible_Processed" width="80%" @close="cancelEventShow()">