解决冲突

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>通视分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -112,7 +112,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>视域分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -143,7 +143,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>天际线分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -111,7 +111,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>可视域分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -152,7 +152,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>淹没分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -148,7 +148,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);
@@ -234,6 +234,9 @@
         border: 1px solid rgba(23, 34, 38, 0.57);
         color: #fff;
     }
+    >>>.el-input__inner {
+        text-align: left !important;
+    }
 
     >>>.el-input__suffix {
         color: #fff;

@@ -6,7 +6,7 @@
             </div>
         </div>
         <div class="mian">
-            <div class="title">
+            <div class="title-bt">
                 <span>阴影分析</span>
                 <span @click="closePop" class="close">×</span>
             </div>
@@ -205,7 +205,7 @@
     }
 
 
-    .title {
+    .title-bt {
         display: flex;
         justify-content: space-between;
         border-bottom: 1px solid rgba(255, 255, 255, 0.15);

@@ -31,27 +31,6 @@
                 @visualField='EvisualField'
                 @yyAnslysis='EyyAnslysis'
                 @kgAnalusis='EkgAnalusis'
-        <div class="rightFunc">
-        <rightFunc @isReturn='EisReturn'
-            @enlarge='Eenlarge'
-            @narrow='narrow'
-            @coordinate='Ecoordinate'
-            @distance='Edistance'
-            @area='Earea'
-            @marker='Emarker'
-            @rollerShutter='ErollerShutter'
-            @splitScreen='EsplitScreen'
-            @toNorth='EtoNorth'
-            @topSee='EtopSee'
-            @roundSee='EroundSee'
-            @horizon='Ehorizon'
-            @allSee='EallSee'
-
-            @ymAnslysis='EymAnslysis'
-            @tjxAnslysis='EtjxAnslysis'
-            @yyAnslysis='EyyAnslysis'
-            @kgAnalusis='EkgAnalusis'
-
                 :enlarge='enlarge'
                 :narrow='narrow'
                 :coordinate='coordinate'
@@ -67,26 +46,8 @@
                 :allSee='allSee'
                 :ymAnslysis='ymAnslysis'
                 :tjxAnslysis='tjxAnslysis'
-                :visualField='visualField'
                 :yyAnslysis='yyAnslysis'
                 :kgAnalusis='kgAnalusis'></rightFunc>
-            :enlarge='enlarge'
-            :narrow='narrow'
-            :coordinate='coordinate'
-            :distance='distance'
-            :area='area'
-            :marker='marker'
-            :rollerShutter='rollerShutter'
-            :splitScreen='splitScreen'
-            :toNorth='toNorth'
-            :topSee='topSee'
-            :roundSee='roundSee'
-            :horizon='horizon'
-            :allSee='allSee'
-            :ymAnslysis='ymAnslysis'
-            :tjxAnslysis='tjxAnslysis'
-            :yyAnslysis='yyAnslysis'
-            :kgAnalusis='kgAnalusis'></rightFunc>
         </div>
         <div class="bottomNav">
             <bottomNav></bottomNav>
@@ -94,7 +55,7 @@
         <!-- <div class="leftAssert">
             <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
         </div> -->
-        <!-- <div class="mapPop">
+        <div class="mapPop">
             <mapPop></mapPop>
         </div>
         <div class="allSee" v-if='allSee'>
@@ -130,6 +91,9 @@
             <div id="vertical-slider" style="display: none;"></div>
             <div id="horizontal-slider" style="display: none;"></div>
         </div>
+
+
+
         <!-- <div id="split_up" style="display: none;"></div>
 		<div id="split_bottom" style="display: none;"></div>
 		<div id="split_left" style="display: none;"></div>