cc8568a9 by 刘远

jikai commit

1 parent 1c92db51
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 data:{username:'案件查处',password:'123'}, 51 data:{username:'案件查处',password:'123'},
52 success:(res) => { 52 success:(res) => {
53 // window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`) 53 // window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
54 window.open(`http://192.168.5.143:80/frontweb/index.jsp?type=${label}`) 54 window.open(`http://192.168.3.194:80/frontweb/index.jsp?type=${label}`)
55 }, 55 },
56 fail: () => { 56 fail: () => {
57 57
......
...@@ -31,27 +31,40 @@ ...@@ -31,27 +31,40 @@
31 })); 31 }));
32 let scene = viewer.scene 32 let scene = viewer.scene
33 scene.shadowMap.darkness = 1; //设置第二重烘焙纹理的效果(明暗程度) 33 scene.shadowMap.darkness = 1; //设置第二重烘焙纹理的效果(明暗程度)
34 scene.skyAtmosphere.brightnessShift=0.4; 34 scene.skyAtmosphere.brightnessShift = 0.4;
35 scene.debugShowFramesPerSecond = true; 35 scene.debugShowFramesPerSecond = true;
36 scene.hdrEnabled = false; 36 scene.hdrEnabled = false;
37 scene.sun.show = true; 37 scene.sun.show = true;
38 scene.lightSource.ambientLightColor = new Cesium.Color(0.65, 0.65, 0.65, 1);
39
38 this.$parent.draw = new createDraw(viewer); 40 this.$parent.draw = new createDraw(viewer);
39 this.$parent.viewer = viewer; 41 // this.$parent.viewer = viewer;
42 objectManage.viewer = viewer;
40 43
41 var promise = []; 44 var promise = [];
42 promise[0] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_BUILD, { 45 promise[0] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_BUILD, { name: 'build1' });
43 name: 'build1' 46 promise[1] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_BUILD, { name: 'build2' });
44 }); 47 promise[2] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_GROUND1, { name: 'ground' });
45 promise[1] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_BUILD, { 48 promise[3] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_LAKE, { name: 'lake' });
46 name: 'build2' 49 // promise[4] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_ROAD, { name: 'road' });
47 }); 50 // promise[5] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_BRIDGE, {name: 'bridge'});
48 promise[2] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_GROUND1, { 51 promise[4] = scene.addS3MTilesLayerByScp(URL_CONFIG.SCP_CBD_TREE, { name : 'tree'});
49 name: 'ground' 52 // promise[5] = scene.addS3MTilesLayerByScp(
50 }); 53 // 'http://localhost:8090/iserver/services/3D-scene/rest/realspace/datas/dcdata@dataSource/config',
54 // { name : 'dcdata'}
55 // );
56 // promise[6] = scene.addS3MTilesLayerByScp(
57 // 'http://localhost:8090/iserver/services/3D-scene/rest/realspace/datas/dcdata1@dataSource/config',
58 // { name : 'dcdata1'}
59 // );
51 60
52 Cesium.when.all(promise, layers => { 61 Cesium.when.all(promise, layers => {
62 layers[0].shadowType = 2;
53 layers[1].shadowType = 2; 63 layers[1].shadowType = 2;
54 layers[2].shadowType = 2; 64 layers[2].shadowType = 2;
65 layers[0].selectEnabled = false;
66 layers[1].selectEnabled = false;
67 layers[2].selectEnabled = false;
55 scene.camera.setView({ 68 scene.camera.setView({
56 destination : Cesium.Cartesian3.fromDegrees(116.44621857300415, 39.899281526734555, 216.7793905027196), 69 destination : Cesium.Cartesian3.fromDegrees(116.44621857300415, 39.899281526734555, 216.7793905027196),
57 orientation : { 70 orientation : {
......
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
83 return { 83 return {
84 step: 1, 84 step: 1,
85 num: 1, 85 num: 1,
86 direction: 1, // 方向 86 direction: 180, // 方向
87 pitch: 1, // 翻转 87 pitch: 1, // 翻转
88 distance: 1, // 距离 88 distance: 320, // 距离
89 horizontalFov: 1, // 水平视场角 89 horizontalFov: 120, // 水平视场角
90 verticalFov: 1, // 垂直视场角 90 verticalFov: 90, // 垂直视场角
91 visibleAreaColor: 'red', // 可见区域颜色 91 visibleAreaColor: 'red', // 可见区域颜色
92 hiddenAreaColor: 'rgba(255, 69, 0, 0.68)', // 不可见区域颜色 92 hiddenAreaColor: 'rgba(255, 69, 0, 0.68)', // 不可见区域颜色
93 isXmbj: true, 93 isXmbj: true,
......
...@@ -32,28 +32,20 @@ ...@@ -32,28 +32,20 @@
32 </div> 32 </div>
33 33
34 <!-- <div class="func-input"> 34 <!-- <div class="func-input">
35 <div class="btn-wrapper2" :class="[isCF?'add-bg2': '']" @click="handleIsXmbj('isCF')">
36 <span class="center">春分</span>
37 </div>
38 <div class="btn-wrapper2" :class="[isXZ?'add-bg2': '']" @click="handleIsXmbj('isXZ')">
39 <span class="center">夏至</span>
40 </div>
41 <div class="btn-wrapper2" :class="[isQF?'add-bg2': '']" @click="handleIsXmbj('isQF')">
42 <span class="center">秋分</span>
43 </div>
44 <div class="btn-wrapper2" :class="[isLD?'add-bg2': '']" @click="handleIsXmbj('isLD')">
45 <span class="center">立冬</span>
46 </div>
47 <div class="btn-wrapper2" :class="[isDZ?'add-bg2': '']" @click="handleIsXmbj('isDZ')">
48 <span class="center">冬至</span>
49 </div>
50 </div> -->
51
52 <div class="func-input">
53 <span>时间间隔 </span> 35 <span>时间间隔 </span>
54 <el-input-number v-model="timeS" controls-position="right" :min="0" :max="1000" 36 <el-input-number v-model="timeS" controls-position="right" :min="0" :max="1000"
55 style="margin:0 12px; width: 245px;"></el-input-number> 37 style="margin:0 12px; width: 245px;"></el-input-number>
56 <span>分钟</span> 38 <span>分钟</span>
39 </div> -->
40
41 <div class="func-input">
42 <span>底部高程 </span>
43 <el-input v-model="bottomHeight" style="margin:0 12px; width: 245px;"></el-input>
44 </div>
45
46 <div class="func-input">
47 <span>拉伸高度 </span>
48 <el-input v-model="extrudeHeight" style="margin:0 12px; width: 245px;"></el-input>
57 </div> 49 </div>
58 50
59 <div class="" style="padding: 18px 24px 0px 24px;"> 51 <div class="" style="padding: 18px 24px 0px 24px;">
...@@ -82,15 +74,18 @@ ...@@ -82,15 +74,18 @@
82 <script> 74 <script>
83 let maxW = 24 * 60 * 60 * 1000 - 1 * 60 * 1000 75 let maxW = 24 * 60 * 60 * 1000 - 1 * 60 * 1000
84 import shadow from "../assets/js/map/shadow"; 76 import shadow from "../assets/js/map/shadow";
77 import objectManage from '../assets/js/map/maputils';
85 export default { 78 export default {
86 name: 'yyAnslysis', 79 name: 'yyAnslysis',
87 components: {}, 80 components: {},
88 data() { 81 data() {
89 return { 82 return {
90 anslysisTime: '', 83 anslysisTime: new Date(),
91 timeS: 30, // 时间间隔 84 timeS: 30, // 时间间隔
92 time: 0 * 60 * 60 * 1000, // 滑块时间 85 time: new Date().getHours() * 60 * 60 * 1000, // 滑块时间
93 max: (24 * 60 * 60 * 1000 - 1 * 60 * 1000), 86 max: (24 * 60 * 60 * 1000 - 1 * 60 * 1000),
87 bottomHeight: 20,
88 extrudeHeight: 20,
94 marks: { 89 marks: {
95 0: '0:00', 90 0: '0:00',
96 [maxW]: '23:59', 91 [maxW]: '23:59',
...@@ -113,6 +108,12 @@ ...@@ -113,6 +108,12 @@
113 this.$emit('closePop', 'yyAnslysis') 108 this.$emit('closePop', 'yyAnslysis')
114 }, 109 },
115 startAnalysis() { 110 startAnalysis() {
111 Object.assign(this.shadow, {
112 anslysisTime: this.anslysisTime,
113 bottomHeight: Number(this.bottomHeight),
114 extrudeHeight: Number(this.extrudeHeight)
115 });
116 this.shadow.remove();
116 this.shadow.handlerPolygon.deactivate(); 117 this.shadow.handlerPolygon.deactivate();
117 this.shadow.handlerPolygon.activate(); 118 this.shadow.handlerPolygon.activate();
118 }, 119 },
...@@ -133,7 +134,8 @@ ...@@ -133,7 +134,8 @@
133 }) 134 })
134 }, 135 },
135 EtimeChange() { 136 EtimeChange() {
136 137 this.anslysisTime.setHours(Math.round(this.time / 1000 / 60 / 60));
138 objectManage.viewer.clock.currentTime = Cesium.JulianDate.fromDate(this.anslysisTime);
137 }, 139 },
138 formatTooltip(val) { 140 formatTooltip(val) {
139 let nowTime = this.commons.dateZhuan('yyyy-MM-dd 00:00:00', new Date()); 141 let nowTime = this.commons.dateZhuan('yyyy-MM-dd 00:00:00', new Date());
......