Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
bd58608e by jikai
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/Home.vue
2 parents eba2a574 27e59d25
Inline Side-by-side
Showing 7 changed files with 106 additions and 17 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,7 +31,6 @@ ...@@ -31,7 +31,6 @@
31 @visualField='EvisualField' 31 @visualField='EvisualField'
32 @yyAnslysis='EyyAnslysis' 32 @yyAnslysis='EyyAnslysis'
33 @kgAnalusis='EkgAnalusis' 33 @kgAnalusis='EkgAnalusis'
34
35 :enlarge='enlarge' 34 :enlarge='enlarge'
36 :narrow='narrow' 35 :narrow='narrow'
37 :coordinate='coordinate' 36 :coordinate='coordinate'
...@@ -47,10 +46,8 @@ ...@@ -47,10 +46,8 @@
47 :allSee='allSee' 46 :allSee='allSee'
48 :ymAnslysis='ymAnslysis' 47 :ymAnslysis='ymAnslysis'
49 :tjxAnslysis='tjxAnslysis' 48 :tjxAnslysis='tjxAnslysis'
50 :visualField='visualField'
51 :yyAnslysis='yyAnslysis' 49 :yyAnslysis='yyAnslysis'
52 :kgAnalusis='kgAnalusis'></rightFunc> 50 :kgAnalusis='kgAnalusis'></rightFunc>
53
54 </div> 51 </div>
55 <div class="bottomNav"> 52 <div class="bottomNav">
56 <bottomNav></bottomNav> 53 <bottomNav></bottomNav>
...@@ -58,7 +55,7 @@ ...@@ -58,7 +55,7 @@
58 <!-- <div class="leftAssert"> 55 <!-- <div class="leftAssert">
59 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert> 56 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
60 </div> --> 57 </div> -->
61 <!-- <div class="mapPop"> 58 <div class="mapPop">
62 <mapPop></mapPop> 59 <mapPop></mapPop>
63 </div> 60 </div>
64 <div class="allSee" v-if='allSee'> 61 <div class="allSee" v-if='allSee'>
...@@ -94,6 +91,9 @@ ...@@ -94,6 +91,9 @@
94 <div id="vertical-slider" style="display: none;"></div> 91 <div id="vertical-slider" style="display: none;"></div>
95 <div id="horizontal-slider" style="display: none;"></div> 92 <div id="horizontal-slider" style="display: none;"></div>
96 </div> 93 </div>
94
95
96
97 <!-- <div id="split_up" style="display: none;"></div> 97 <!-- <div id="split_up" style="display: none;"></div>
98 <div id="split_bottom" style="display: none;"></div> 98 <div id="split_bottom" style="display: none;"></div>
99 <div id="split_left" style="display: none;"></div> 99 <div id="split_left" style="display: none;"></div>
...@@ -307,7 +307,93 @@ ...@@ -307,7 +307,93 @@
307 ,EtopSee() {} 307 ,EtopSee() {}
308 // 环视 308 // 环视
309 ,EroundSee() { 309 ,EroundSee() {
310 310 // var parentEntity = this.viewer.entities.add(new Cesium.Entity()), positions = [], cartesian, polyline;
311 // this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas)
312 // this.handler.setInputAction(evt => {
313
314 // cartesian = this.viewer.scene.pickPosition(evt.position);
315 // // cartesian = this.draw.getCatesian3FromPX(evt.position, this.viewer, []);
316 // positions.push(cartesian.clone());
317 // // addCompany.createPoint.call(this, {position: cartesian})
318
319 // if(positions.length === 1) {
320 // this.handler.setInputAction(moveEvent => {
321 // positions[1] = this.viewer.scene.pickPosition(moveEvent.endPosition);
322 // // positions[1] = this.draw.getCatesian3FromPX(moveEvent.endPosition, this.viewer, []);
323 // !polyline && (polyline = addCompany.createPolyline.call(this, positions));
324 // }, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
325 // return;
326 // }
327
328
329 // this.handler.destroy();
330 // // console.log(Cesium.Cartesian3.distance(positions[0], positions[1]));
331 // // var cartesian = this.draw.getCatesian3FromPX(evt.position, this.viewer, []);
332 // var viewPointEntity = this.viewer.entities.add({
333 // parent: parentEntity,
334 // position: positions[0],
335 // ellipsoid: {
336 // radii: new Cesium.Cartesian3(5, 5, 5),
337 // material: Cesium.Color.GREEN
338 // }
339 // });
340 // // // 世界坐标转换为投影坐标
341 // var webMercatorProjection = new Cesium.WebMercatorProjection(this.viewer.scene.globe.ellipsoid);
342 // var viewPointWebMercator = webMercatorProjection.project(Cesium.Cartographic.fromCartesian(positions[0]));
343 // // // 排除碰撞监测的对象
344 // var objectsToExclude = [viewPointEntity];
345
346 // // 目标点集合
347 // var destPoints = [];
348 // // 视域点和目标点的距离
349 // var radius = Cesium.Cartesian3.distance(positions[0], positions[1]); // 视距1000米
350 // // 计算一圈
351 // for (var i = 0; i <= 30; i++) {
352 // // 度数转弧度
353 // var radians = Cesium.Math.toRadians(i);
354 // // 计算目标点
355 // var toPoint = new Cesium.Cartesian3(viewPointWebMercator.x + radius * Math.cos(radians), viewPointWebMercator.y + radius * Math.sin(radians), 10);
356 // // 投影坐标转世界坐标
357 // toPoint = webMercatorProjection.unproject(toPoint);
358 // destPoints.push(Cesium.Cartographic.toCartesian(toPoint.clone()));
359 // }
360 // let viewer = this.viewer;
361 // // 绘制线
362 // function drawLine(leftPoint, secPoint, color) {
363 // viewer.entities.add({
364 // polyline: {
365 // positions: [leftPoint, secPoint],
366 // arcType: Cesium.ArcType.NONE,
367 // width: 5,
368 // material: color,
369 // depthFailMaterial: color
370 // }
371 // })
372 // }
373 // pickFromRay.call(this);
374 // function pickFromRay() {
375 // for (var i = 0; i < destPoints.length; i++) {
376 // // 计算射线的方向，目标点left 视域点right
377 // var direction = Cesium.Cartesian3.normalize(Cesium.Cartesian3.subtract(destPoints[i], positions[0], new Cesium.Cartesian3()), new Cesium.Cartesian3());
378 // console.log(direction);
379 // // 建立射线
380 // var ray = new Cesium.Ray(positions[0], direction);
381 // var result = viewer.scene.pickFromRay(ray, objectsToExclude); // 计算交互点，返回第一个
382 // showIntersection(result, destPoints[i], positions[0]);
383 // }
384 // }
385 // // 处理交互点
386 // function showIntersection(result, destPoint, cartesian) {
387 // // 如果是场景模型的交互点，排除交互点是地球表面
388 // if (Cesium.defined(result) && Cesium.defined(result.object)) {
389 // drawLine(result.position, cartesian, Cesium.Color.GREEN); // 可视区域
390 // drawLine(result.position, destPoint, Cesium.Color.RED); // 不可视区域
391 // } else {
392 // drawLine(cartesian, destPoint, Cesium.Color.GREEN);
393 // }
394 // }
395 // this.handler.destroy();
396 // }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
311 } 397 }
312 // 视域 398 // 视域
313 ,Ehorizon(val) { 399 ,Ehorizon(val) {
......