4b82e36f by chiangbt

20191205

1 parent 479c22f1
...@@ -6315,7 +6315,8 @@ ...@@ -6315,7 +6315,8 @@
6315 "ansi-regex": { 6315 "ansi-regex": {
6316 "version": "2.1.1", 6316 "version": "2.1.1",
6317 "bundled": true, 6317 "bundled": true,
6318 "dev": true 6318 "dev": true,
6319 "optional": true
6319 }, 6320 },
6320 "aproba": { 6321 "aproba": {
6321 "version": "1.2.0", 6322 "version": "1.2.0",
...@@ -6336,12 +6337,14 @@ ...@@ -6336,12 +6337,14 @@
6336 "balanced-match": { 6337 "balanced-match": {
6337 "version": "1.0.0", 6338 "version": "1.0.0",
6338 "bundled": true, 6339 "bundled": true,
6339 "dev": true 6340 "dev": true,
6341 "optional": true
6340 }, 6342 },
6341 "brace-expansion": { 6343 "brace-expansion": {
6342 "version": "1.1.11", 6344 "version": "1.1.11",
6343 "bundled": true, 6345 "bundled": true,
6344 "dev": true, 6346 "dev": true,
6347 "optional": true,
6345 "requires": { 6348 "requires": {
6346 "balanced-match": "^1.0.0", 6349 "balanced-match": "^1.0.0",
6347 "concat-map": "0.0.1" 6350 "concat-map": "0.0.1"
...@@ -6356,17 +6359,20 @@ ...@@ -6356,17 +6359,20 @@
6356 "code-point-at": { 6359 "code-point-at": {
6357 "version": "1.1.0", 6360 "version": "1.1.0",
6358 "bundled": true, 6361 "bundled": true,
6359 "dev": true 6362 "dev": true,
6363 "optional": true
6360 }, 6364 },
6361 "concat-map": { 6365 "concat-map": {
6362 "version": "0.0.1", 6366 "version": "0.0.1",
6363 "bundled": true, 6367 "bundled": true,
6364 "dev": true 6368 "dev": true,
6369 "optional": true
6365 }, 6370 },
6366 "console-control-strings": { 6371 "console-control-strings": {
6367 "version": "1.1.0", 6372 "version": "1.1.0",
6368 "bundled": true, 6373 "bundled": true,
6369 "dev": true 6374 "dev": true,
6375 "optional": true
6370 }, 6376 },
6371 "core-util-is": { 6377 "core-util-is": {
6372 "version": "1.0.2", 6378 "version": "1.0.2",
...@@ -6483,7 +6489,8 @@ ...@@ -6483,7 +6489,8 @@
6483 "inherits": { 6489 "inherits": {
6484 "version": "2.0.3", 6490 "version": "2.0.3",
6485 "bundled": true, 6491 "bundled": true,
6486 "dev": true 6492 "dev": true,
6493 "optional": true
6487 }, 6494 },
6488 "ini": { 6495 "ini": {
6489 "version": "1.3.5", 6496 "version": "1.3.5",
...@@ -6495,6 +6502,7 @@ ...@@ -6495,6 +6502,7 @@
6495 "version": "1.0.0", 6502 "version": "1.0.0",
6496 "bundled": true, 6503 "bundled": true,
6497 "dev": true, 6504 "dev": true,
6505 "optional": true,
6498 "requires": { 6506 "requires": {
6499 "number-is-nan": "^1.0.0" 6507 "number-is-nan": "^1.0.0"
6500 } 6508 }
...@@ -6509,6 +6517,7 @@ ...@@ -6509,6 +6517,7 @@
6509 "version": "3.0.4", 6517 "version": "3.0.4",
6510 "bundled": true, 6518 "bundled": true,
6511 "dev": true, 6519 "dev": true,
6520 "optional": true,
6512 "requires": { 6521 "requires": {
6513 "brace-expansion": "^1.1.7" 6522 "brace-expansion": "^1.1.7"
6514 } 6523 }
...@@ -6516,12 +6525,14 @@ ...@@ -6516,12 +6525,14 @@
6516 "minimist": { 6525 "minimist": {
6517 "version": "0.0.8", 6526 "version": "0.0.8",
6518 "bundled": true, 6527 "bundled": true,
6519 "dev": true 6528 "dev": true,
6529 "optional": true
6520 }, 6530 },
6521 "minipass": { 6531 "minipass": {
6522 "version": "2.3.5", 6532 "version": "2.3.5",
6523 "bundled": true, 6533 "bundled": true,
6524 "dev": true, 6534 "dev": true,
6535 "optional": true,
6525 "requires": { 6536 "requires": {
6526 "safe-buffer": "^5.1.2", 6537 "safe-buffer": "^5.1.2",
6527 "yallist": "^3.0.0" 6538 "yallist": "^3.0.0"
...@@ -6540,6 +6551,7 @@ ...@@ -6540,6 +6551,7 @@
6540 "version": "0.5.1", 6551 "version": "0.5.1",
6541 "bundled": true, 6552 "bundled": true,
6542 "dev": true, 6553 "dev": true,
6554 "optional": true,
6543 "requires": { 6555 "requires": {
6544 "minimist": "0.0.8" 6556 "minimist": "0.0.8"
6545 } 6557 }
...@@ -6620,7 +6632,8 @@ ...@@ -6620,7 +6632,8 @@
6620 "number-is-nan": { 6632 "number-is-nan": {
6621 "version": "1.0.1", 6633 "version": "1.0.1",
6622 "bundled": true, 6634 "bundled": true,
6623 "dev": true 6635 "dev": true,
6636 "optional": true
6624 }, 6637 },
6625 "object-assign": { 6638 "object-assign": {
6626 "version": "4.1.1", 6639 "version": "4.1.1",
...@@ -6632,6 +6645,7 @@ ...@@ -6632,6 +6645,7 @@
6632 "version": "1.4.0", 6645 "version": "1.4.0",
6633 "bundled": true, 6646 "bundled": true,
6634 "dev": true, 6647 "dev": true,
6648 "optional": true,
6635 "requires": { 6649 "requires": {
6636 "wrappy": "1" 6650 "wrappy": "1"
6637 } 6651 }
...@@ -6717,7 +6731,8 @@ ...@@ -6717,7 +6731,8 @@
6717 "safe-buffer": { 6731 "safe-buffer": {
6718 "version": "5.1.2", 6732 "version": "5.1.2",
6719 "bundled": true, 6733 "bundled": true,
6720 "dev": true 6734 "dev": true,
6735 "optional": true
6721 }, 6736 },
6722 "safer-buffer": { 6737 "safer-buffer": {
6723 "version": "2.1.2", 6738 "version": "2.1.2",
...@@ -6753,6 +6768,7 @@ ...@@ -6753,6 +6768,7 @@
6753 "version": "1.0.2", 6768 "version": "1.0.2",
6754 "bundled": true, 6769 "bundled": true,
6755 "dev": true, 6770 "dev": true,
6771 "optional": true,
6756 "requires": { 6772 "requires": {
6757 "code-point-at": "^1.0.0", 6773 "code-point-at": "^1.0.0",
6758 "is-fullwidth-code-point": "^1.0.0", 6774 "is-fullwidth-code-point": "^1.0.0",
...@@ -6772,6 +6788,7 @@ ...@@ -6772,6 +6788,7 @@
6772 "version": "3.0.1", 6788 "version": "3.0.1",
6773 "bundled": true, 6789 "bundled": true,
6774 "dev": true, 6790 "dev": true,
6791 "optional": true,
6775 "requires": { 6792 "requires": {
6776 "ansi-regex": "^2.0.0" 6793 "ansi-regex": "^2.0.0"
6777 } 6794 }
...@@ -6815,12 +6832,14 @@ ...@@ -6815,12 +6832,14 @@
6815 "wrappy": { 6832 "wrappy": {
6816 "version": "1.0.2", 6833 "version": "1.0.2",
6817 "bundled": true, 6834 "bundled": true,
6818 "dev": true 6835 "dev": true,
6836 "optional": true
6819 }, 6837 },
6820 "yallist": { 6838 "yallist": {
6821 "version": "3.0.3", 6839 "version": "3.0.3",
6822 "bundled": true, 6840 "bundled": true,
6823 "dev": true 6841 "dev": true,
6842 "optional": true
6824 } 6843 }
6825 } 6844 }
6826 }, 6845 },
......
1 <!--
2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:52:56
4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-04 22:23:44
6 * @FilePath: \superglobevue\src\components\viewer.vue
7 -->
8 <template>
9 <div>
10 <div id="cesiumContainer" v-bind:style="styleObject"></div>
11 <div id='loadingbar' class="spinner">
12 <div class="spinner-container container1">
13 <div class="circle1"></div>
14 <div class="circle2"></div>
15 <div class="circle3"></div>
16 <div class="circle4"></div>
17 </div>
18 <div class="spinner-container container2">
19 <div class="circle1"></div>
20 <div class="circle2"></div>
21 <div class="circle3"></div>
22 <div class="circle4"></div>
23 </div>
24 <div class="spinner-container container3">
25 <div class="circle1"></div>
26 <div class="circle2"></div>
27 <div class="circle3"></div>
28 <div class="circle4"></div>
29 </div>
30 </div>
31 </div>
32 </template>
33
34 <script>
35 import URL_CONFIG from "./../config/urlConfig.vue";
36 const Cesium = window.Cesium;
37 export default {
38 data: function() {
39 return {
40 styleObject: {
41 width: "100%",
42 position: "absolute",
43 top: "0px",
44 bottom: "0px",
45 left: "0px",
46 backgroundColor: "#000000"
47 },
48 smviewer: {}
49 };
50 },
51 mounted: function() {
52 this.viewer = new Cesium.Viewer("cesiumContainer", {});
53 // 隐藏logo
54 $(".cesium-widget-credits")[0].style.visibility = "hidden";
55 // 隐藏导航工具
56 // $(".cesium-viewer-navigationContainer")[0].style.visibility="hidden";
57
58 // 添加OSM地图
59 let osm = Cesium.createOpenStreetMapImageryProvider({
60 url: "https://tile-a.openstreetmap.fr/hot",
61 fileExtension:"png"
62 });
63 this.viewer.imageryLayers.addImageryProvider(osm);
64
65 var scene = this.viewer.scene;
66 var widget = this.viewer.cesiumWidget;
67 try {
68 // 添加倾斜摄影模型图层
69 var promise = scene.addS3MTilesLayerByScp('http://localhost:8090/iserver/services/3D-wz_qidu_qx1/rest/realspace/datas/%E4%B8%83%E9%83%BD_%E5%80%BE%E6%96%9C/config');
70 Cesium.when(promise, function(layer) {
71 layer.setQueryParameter({
72 url: 'http://localhost:8090/iserver/services/data-wz_qidu_qx1/rest/data',
73 dataSourceName: 'qidu',
74 dataSetName: 'New_Region'
75 });
76 scene.camera.setView({
77 destination : Cesium.Cartesian3.fromDegrees(120.7630995515332, 28.006422239411936, 100.0),
78 orientation:{
79 heading:160.4816371653797,
80 pitch:-0.515,
81 roll:0
82 }
83 });
84 }, function() {
85 var title = '加载SCP失败,请检查网络连接状态或者url地址是否正确?';
86 widget.showErrorPanel(title, undefined, e);
87 });
88 } catch (e) {
89 if (widget._showRenderLoopErrors) {
90 var title = '渲染时发生错误,已停止渲染。';
91 widget.showErrorPanel(title, undefined, e);
92 }
93 }
94
95 $("#loadingbar").remove();
96 }
97 };
98 </script>
99
100 <style>
101
102 </style>
...@@ -27,6 +27,7 @@ const TOKEN_TIANDITU = "394404c8b901574fdc4cdf8c18a98448"; ...@@ -27,6 +27,7 @@ const TOKEN_TIANDITU = "394404c8b901574fdc4cdf8c18a98448";
27 const SCENE_SY = "http://220.189.229.13:8090/iserver/services/3D-ShangYuBuShu/rest/realspace/"; 27 const SCENE_SY = "http://220.189.229.13:8090/iserver/services/3D-ShangYuBuShu/rest/realspace/";
28 const SCP_SRSB = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace/datas/srsb/config"; 28 const SCP_SRSB = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace/datas/srsb/config";
29 const SCENE_SRSB = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace"; 29 const SCENE_SRSB = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace";
30 const SCENE_WZ_QD = 'http://localhost:8090/iserver/services/3D-wz_qidu_qx/rest/realspace/';
30 const SCP_SRSB_WATER = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace/datas/%E6%B0%B4%E9%9D%A2@vector/config"; 31 const SCP_SRSB_WATER = "http://www.supermapol.com/realspace/services/3D-srsb/rest/realspace/datas/%E6%B0%B4%E9%9D%A2@vector/config";
31 const SCENE_XGPARK = "http://www.supermapol.com/realspace/services/3D-yanmofenxi/rest/realspace"; 32 const SCENE_XGPARK = "http://www.supermapol.com/realspace/services/3D-yanmofenxi/rest/realspace";
32 export default 33 export default
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </template> 12 </template>
13 13
14 <script> 14 <script>
15 import viewer from "@/components/viewer_tdt.vue"; 15 import viewer from "@/components/viewer_s3m_single.vue";
16 16
17 export default { 17 export default {
18 name: "home", 18 name: "home",
......