Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
27e59d25 by 刘远
Options

解决冲突

1 parent f82c53a4
Inline Side-by-side
Showing 7 changed files with 19 additions and 52 deletions
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>通视分析</span> 10 <span>通视分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 } 112 }
113 113
114 114
115 .title { 115 .title-bt {
116 display: flex; 116 display: flex;
117 justify-content: space-between; 117 justify-content: space-between;
118 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 118 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>视域分析</span> 10 <span>视域分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 } 143 }
144 144
145 145
146 .title { 146 .title-bt {
147 display: flex; 147 display: flex;
148 justify-content: space-between; 148 justify-content: space-between;
149 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 149 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>天际线分析</span> 10 <span>天际线分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 } 111 }
112 112
113 113
114 .title { 114 .title-bt {
115 display: flex; 115 display: flex;
116 justify-content: space-between; 116 justify-content: space-between;
117 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 117 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>可视域分析</span> 10 <span>可视域分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
152 } 152 }
153 153
154 154
155 .title { 155 .title-bt {
156 display: flex; 156 display: flex;
157 justify-content: space-between; 157 justify-content: space-between;
158 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 158 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>淹没分析</span> 10 <span>淹没分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
148 } 148 }
149 149
150 150
151 .title { 151 .title-bt {
152 display: flex; 152 display: flex;
153 justify-content: space-between; 153 justify-content: space-between;
154 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 154 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
...@@ -234,6 +234,9 @@ ...@@ -234,6 +234,9 @@
234 border: 1px solid rgba(23, 34, 38, 0.57); 234 border: 1px solid rgba(23, 34, 38, 0.57);
235 color: #fff; 235 color: #fff;
236 } 236 }
237 >>>.el-input__inner {
238 text-align: left !important;
239 }
237 240
238 >>>.el-input__suffix { 241 >>>.el-input__suffix {
239 color: #fff; 242 color: #fff;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>阴影分析</span> 10 <span>阴影分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
205 } 205 }
206 206
207 207
208 .title { 208 .title-bt {
209 display: flex; 209 display: flex;
210 justify-content: space-between; 210 justify-content: space-between;
211 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 211 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -31,45 +31,6 @@ ...@@ -31,45 +31,6 @@
31 @visualField='EvisualField' 31 @visualField='EvisualField'
32 @yyAnslysis='EyyAnslysis' 32 @yyAnslysis='EyyAnslysis'
33 @kgAnalusis='EkgAnalusis' 33 @kgAnalusis='EkgAnalusis'
34 <div class="rightFunc">
35 <rightFunc @isReturn='EisReturn'
36 @enlarge='Eenlarge'
37 @narrow='narrow'
38 @coordinate='Ecoordinate'
39 @distance='Edistance'
40 @area='Earea'
41 @marker='Emarker'
42 @rollerShutter='ErollerShutter'
43 @splitScreen='EsplitScreen'
44 @toNorth='EtoNorth'
45 @topSee='EtopSee'
46 @roundSee='EroundSee'
47 @horizon='Ehorizon'
48 @allSee='EallSee'
49
50 @ymAnslysis='EymAnslysis'
51 @tjxAnslysis='EtjxAnslysis'
52 @yyAnslysis='EyyAnslysis'
53 @kgAnalusis='EkgAnalusis'
54
55 :enlarge='enlarge'
56 :narrow='narrow'
57 :coordinate='coordinate'
58 :distance='distance'
59 :area='area'
60 :marker='marker'
61 :rollerShutter='rollerShutter'
62 :splitScreen='splitScreen'
63 :toNorth='toNorth'
64 :topSee='topSee'
65 :roundSee='roundSee'
66 :horizon='horizon'
67 :allSee='allSee'
68 :ymAnslysis='ymAnslysis'
69 :tjxAnslysis='tjxAnslysis'
70 :visualField='visualField'
71 :yyAnslysis='yyAnslysis'
72 :kgAnalusis='kgAnalusis'></rightFunc>
73 :enlarge='enlarge' 34 :enlarge='enlarge'
74 :narrow='narrow' 35 :narrow='narrow'
75 :coordinate='coordinate' 36 :coordinate='coordinate'
...@@ -94,7 +55,7 @@ ...@@ -94,7 +55,7 @@
94 <!-- <div class="leftAssert"> 55 <!-- <div class="leftAssert">
95 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert> 56 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
96 </div> --> 57 </div> -->
97 <!-- <div class="mapPop"> 58 <div class="mapPop">
98 <mapPop></mapPop> 59 <mapPop></mapPop>
99 </div> 60 </div>
100 <div class="allSee" v-if='allSee'> 61 <div class="allSee" v-if='allSee'>
...@@ -130,6 +91,9 @@ ...@@ -130,6 +91,9 @@
130 <div id="vertical-slider" style="display: none;"></div> 91 <div id="vertical-slider" style="display: none;"></div>
131 <div id="horizontal-slider" style="display: none;"></div> 92 <div id="horizontal-slider" style="display: none;"></div>
132 </div> 93 </div>
94
95
96
133 <!-- <div id="split_up" style="display: none;"></div> 97 <!-- <div id="split_up" style="display: none;"></div>
134 <div id="split_bottom" style="display: none;"></div> 98 <div id="split_bottom" style="display: none;"></div>
135 <div id="split_left" style="display: none;"></div> 99 <div id="split_left" style="display: none;"></div>
......