170128ce by unknown

'20191207'

1 parent 71a13815
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:52 3 * @Date: 2019-12-03 22:31:52
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-04 08:14:45 5 * @LastEditTime: 2019-12-07 14:05:19
6 * @FilePath: \superglobevue\README.md 6 * @FilePath: \superglobevue\README.md
7 --> 7 -->
8 # superglobevue 8 # superglobevue
...@@ -11,13 +11,22 @@ ...@@ -11,13 +11,22 @@
11 11
12 SuperGlobeVue是基于vue-cli3和supermap cesium 的一款Globe地球视图。 12 SuperGlobeVue是基于vue-cli3和supermap cesium 的一款Globe地球视图。
13 13
14 系统通过vue.config.js进行了eslint的配置。不用担心vue写法中的一系列配置和语法问题。
14 15
15 - 数据配置文件为config/urlConfig.vue 16 - 数据配置文件为config/urlConfig.vue
16 - 修改显示组件主要为views/Home.vue中的第15行 17 - 修改显示组件主要为views/Home.vue中的第15行
17 - Globe的主要视图是src/componnets/viewer.vue 18 - Globe的主要视图是src/componnets/viewer.vue
18 -
19 19
20 系统通过vue.config.js进行了eslint的配置。 20 ## 2、功能组件
21
22 - viewer_ymo.vue 淹没分析
23 - viewer_tdt.vue 加载天地图数据
24 - viewer_s3m.vue 加载倾斜摄影数据+矢量面(构成水面)
25 - viewer_s3m_single.vue 添加铁岭倾斜摄影数据+矢量面数据+矢量单体化查询效果
26 - viewer_s3m_wz.vue 自定义添加温州倾斜摄影数据+矢量面数据+单体化查询
27 - viewer_ms3m.vue 通过scene和addS3MTilesLayerByScp两种方式添加倾斜摄影场景和图层
28 - viewer_ming.vue 多个栅格图层面的动画效果
29 - viewer_changeview.vue 地图视图效果,在10000米以上不能改变角度,10000米以下能够改动视角
21 30
22 ## 2、设置 31 ## 2、设置
23 ### 项目依赖库安装 32 ### 项目依赖库安装
......
...@@ -4,28 +4,6 @@ ...@@ -4,28 +4,6 @@
4 "lockfileVersion": 1, 4 "lockfileVersion": 1,
5 "requires": true, 5 "requires": true,
6 "dependencies": { 6 "dependencies": {
7 "@ant-design/colors": {
8 "version": "3.2.2",
9 "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
10 "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
11 "requires": {
12 "tinycolor2": "^1.4.1"
13 }
14 },
15 "@ant-design/icons": {
16 "version": "2.1.1",
17 "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
18 "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
19 },
20 "@ant-design/icons-vue": {
21 "version": "2.0.0",
22 "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-2.0.0.tgz",
23 "integrity": "sha512-2c0QQE5hL4N48k5NkPG5sdpMl9YnvyNhf0U7YkdZYDlLnspoRU7vIA0UK9eHBs6OpFLcJB6o8eJrIl2ajBskPg==",
24 "requires": {
25 "@ant-design/colors": "^3.1.0",
26 "babel-runtime": "^6.26.0"
27 }
28 },
29 "@babel/code-frame": { 7 "@babel/code-frame": {
30 "version": "7.5.5", 8 "version": "7.5.5",
31 "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz", 9 "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
...@@ -2158,14 +2136,6 @@ ...@@ -2158,14 +2136,6 @@
2158 "integrity": "sha1-Ejy487hMIXHx9/slJhWxx4prGow=", 2136 "integrity": "sha1-Ejy487hMIXHx9/slJhWxx4prGow=",
2159 "dev": true 2137 "dev": true
2160 }, 2138 },
2161 "add-dom-event-listener": {
2162 "version": "1.1.0",
2163 "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
2164 "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
2165 "requires": {
2166 "object-assign": "4.x"
2167 }
2168 },
2169 "address": { 2139 "address": {
2170 "version": "1.1.2", 2140 "version": "1.1.2",
2171 "resolved": "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz", 2141 "resolved": "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz",
...@@ -2245,48 +2215,6 @@ ...@@ -2245,48 +2215,6 @@
2245 "color-convert": "^1.9.0" 2215 "color-convert": "^1.9.0"
2246 } 2216 }
2247 }, 2217 },
2248 "ant-design-vue": {
2249 "version": "1.4.8",
2250 "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.4.8.tgz",
2251 "integrity": "sha512-CVcJZP76q03h7/PSgMMPBzJXijS3UcVnOthWiYVAMP9zC6nVMBpaZsUGywa71muWBYbdGOFUVsI8VCyDxlzpjg==",
2252 "requires": {
2253 "@ant-design/icons": "^2.1.1",
2254 "@ant-design/icons-vue": "^2.0.0",
2255 "add-dom-event-listener": "^1.0.2",
2256 "array-tree-filter": "^2.1.0",
2257 "async-validator": "^3.0.3",
2258 "babel-helper-vue-jsx-merge-props": "^2.0.3",
2259 "babel-runtime": "6.x",
2260 "classnames": "^2.2.5",
2261 "component-classes": "^1.2.6",
2262 "dom-align": "^1.7.0",
2263 "dom-closest": "^0.2.0",
2264 "dom-scroll-into-view": "^1.2.1",
2265 "enquire.js": "^2.1.6",
2266 "intersperse": "^1.0.0",
2267 "is-negative-zero": "^2.0.0",
2268 "ismobilejs": "^0.5.1",
2269 "json2mq": "^0.2.0",
2270 "lodash": "^4.17.5",
2271 "moment": "^2.21.0",
2272 "mutationobserver-shim": "^0.3.2",
2273 "node-emoji": "^1.10.0",
2274 "omit.js": "^1.0.0",
2275 "raf": "^3.4.0",
2276 "resize-observer-polyfill": "^1.5.1",
2277 "shallow-equal": "^1.0.0",
2278 "shallowequal": "^1.0.2",
2279 "vue-ref": "^1.0.4",
2280 "warning": "^3.0.0"
2281 },
2282 "dependencies": {
2283 "async-validator": {
2284 "version": "3.2.3",
2285 "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.2.3.tgz",
2286 "integrity": "sha512-yMJ4i3x5qEGVgEMowZiBkx+rjDrsXf64BWdHENCtHLgyPiEE+2r8jvqMF1cghCgdGo4sWVLJ7MDwPQgGSPDCcw=="
2287 }
2288 }
2289 },
2290 "any-promise": { 2218 "any-promise": {
2291 "version": "1.3.0", 2219 "version": "1.3.0",
2292 "resolved": "https://registry.npm.taobao.org/any-promise/download/any-promise-1.3.0.tgz", 2220 "resolved": "https://registry.npm.taobao.org/any-promise/download/any-promise-1.3.0.tgz",
...@@ -2375,11 +2303,6 @@ ...@@ -2375,11 +2303,6 @@
2375 "es-abstract": "^1.7.0" 2303 "es-abstract": "^1.7.0"
2376 } 2304 }
2377 }, 2305 },
2378 "array-tree-filter": {
2379 "version": "2.1.0",
2380 "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
2381 "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
2382 },
2383 "array-union": { 2306 "array-union": {
2384 "version": "1.0.2", 2307 "version": "1.0.2",
2385 "resolved": "https://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz", 2308 "resolved": "https://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz",
...@@ -2613,11 +2536,6 @@ ...@@ -2613,11 +2536,6 @@
2613 "resolve": "^1.12.0" 2536 "resolve": "^1.12.0"
2614 } 2537 }
2615 }, 2538 },
2616 "babel-helper-vue-jsx-merge-props": {
2617 "version": "2.0.3",
2618 "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
2619 "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
2620 },
2621 "babel-jest": { 2539 "babel-jest": {
2622 "version": "24.9.0", 2540 "version": "24.9.0",
2623 "resolved": "https://registry.npm.taobao.org/babel-jest/download/babel-jest-24.9.0.tgz?cache=0&sync_timestamp=1566444289086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-jest%2Fdownload%2Fbabel-jest-24.9.0.tgz", 2541 "resolved": "https://registry.npm.taobao.org/babel-jest/download/babel-jest-24.9.0.tgz?cache=0&sync_timestamp=1566444289086&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-jest%2Fdownload%2Fbabel-jest-24.9.0.tgz",
...@@ -2720,6 +2638,7 @@ ...@@ -2720,6 +2638,7 @@
2720 "version": "6.26.0", 2638 "version": "6.26.0",
2721 "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", 2639 "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
2722 "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", 2640 "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
2641 "dev": true,
2723 "requires": { 2642 "requires": {
2724 "core-js": "^2.4.0", 2643 "core-js": "^2.4.0",
2725 "regenerator-runtime": "^0.11.0" 2644 "regenerator-runtime": "^0.11.0"
...@@ -2728,12 +2647,14 @@ ...@@ -2728,12 +2647,14 @@
2728 "core-js": { 2647 "core-js": {
2729 "version": "2.6.10", 2648 "version": "2.6.10",
2730 "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.10.tgz?cache=0&sync_timestamp=1575309477270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.10.tgz", 2649 "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.10.tgz?cache=0&sync_timestamp=1575309477270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.10.tgz",
2731 "integrity": "sha1-iluDkfjMcBPacDQRzltYVwYwDX8=" 2650 "integrity": "sha1-iluDkfjMcBPacDQRzltYVwYwDX8=",
2651 "dev": true
2732 }, 2652 },
2733 "regenerator-runtime": { 2653 "regenerator-runtime": {
2734 "version": "0.11.1", 2654 "version": "0.11.1",
2735 "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz", 2655 "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
2736 "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=" 2656 "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=",
2657 "dev": true
2737 } 2658 }
2738 } 2659 }
2739 }, 2660 },
...@@ -3533,11 +3454,6 @@ ...@@ -3533,11 +3454,6 @@
3533 } 3454 }
3534 } 3455 }
3535 }, 3456 },
3536 "classnames": {
3537 "version": "2.2.6",
3538 "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
3539 "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
3540 },
3541 "clean-css": { 3457 "clean-css": {
3542 "version": "4.2.1", 3458 "version": "4.2.1",
3543 "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz", 3459 "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.1.tgz",
...@@ -3900,25 +3816,12 @@ ...@@ -3900,25 +3816,12 @@
3900 "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", 3816 "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
3901 "dev": true 3817 "dev": true
3902 }, 3818 },
3903 "component-classes": {
3904 "version": "1.2.6",
3905 "resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
3906 "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
3907 "requires": {
3908 "component-indexof": "0.0.3"
3909 }
3910 },
3911 "component-emitter": { 3819 "component-emitter": {
3912 "version": "1.3.0", 3820 "version": "1.3.0",
3913 "resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz", 3821 "resolved": "https://registry.npm.taobao.org/component-emitter/download/component-emitter-1.3.0.tgz",
3914 "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=", 3822 "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=",
3915 "dev": true 3823 "dev": true
3916 }, 3824 },
3917 "component-indexof": {
3918 "version": "0.0.3",
3919 "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
3920 "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
3921 },
3922 "compressible": { 3825 "compressible": {
3923 "version": "2.0.17", 3826 "version": "2.0.17",
3924 "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.17.tgz?cache=0&sync_timestamp=1561981219831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompressible%2Fdownload%2Fcompressible-2.0.17.tgz", 3827 "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.17.tgz?cache=0&sync_timestamp=1561981219831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompressible%2Fdownload%2Fcompressible-2.0.17.tgz",
...@@ -4937,19 +4840,6 @@ ...@@ -4937,19 +4840,6 @@
4937 "isarray": "^1.0.0" 4840 "isarray": "^1.0.0"
4938 } 4841 }
4939 }, 4842 },
4940 "dom-align": {
4941 "version": "1.10.2",
4942 "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.10.2.tgz",
4943 "integrity": "sha512-AYZUzLepy05E9bCY4ExoqHrrIlM49PEak9oF93JEFoibqKL0F7w5DLM70/rosLOawerWZ3MlepQcl+EmHskOyw=="
4944 },
4945 "dom-closest": {
4946 "version": "0.2.0",
4947 "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
4948 "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
4949 "requires": {
4950 "dom-matches": ">=1.0.1"
4951 }
4952 },
4953 "dom-converter": { 4843 "dom-converter": {
4954 "version": "0.2.0", 4844 "version": "0.2.0",
4955 "resolved": "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz", 4845 "resolved": "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz",
...@@ -4965,16 +4855,6 @@ ...@@ -4965,16 +4855,6 @@
4965 "integrity": "sha1-WDCgop4b+Df+UKcM2ApZcjKBPK4=", 4855 "integrity": "sha1-WDCgop4b+Df+UKcM2ApZcjKBPK4=",
4966 "dev": true 4856 "dev": true
4967 }, 4857 },
4968 "dom-matches": {
4969 "version": "2.0.0",
4970 "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
4971 "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
4972 },
4973 "dom-scroll-into-view": {
4974 "version": "1.2.1",
4975 "resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
4976 "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4="
4977 },
4978 "dom-serializer": { 4858 "dom-serializer": {
4979 "version": "0.2.2", 4859 "version": "0.2.2",
4980 "resolved": "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1573447907918&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz", 4860 "resolved": "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1573447907918&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz",
...@@ -5201,11 +5081,6 @@ ...@@ -5201,11 +5081,6 @@
5201 } 5081 }
5202 } 5082 }
5203 }, 5083 },
5204 "enquire.js": {
5205 "version": "2.1.6",
5206 "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
5207 "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
5208 },
5209 "entities": { 5084 "entities": {
5210 "version": "2.0.0", 5085 "version": "2.0.0",
5211 "resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz", 5086 "resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.0.tgz",
...@@ -7715,11 +7590,6 @@ ...@@ -7715,11 +7590,6 @@
7715 } 7590 }
7716 } 7591 }
7717 }, 7592 },
7718 "intersperse": {
7719 "version": "1.0.0",
7720 "resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz",
7721 "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE="
7722 },
7723 "invariant": { 7593 "invariant": {
7724 "version": "2.2.4", 7594 "version": "2.2.4",
7725 "resolved": "https://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finvariant%2Fdownload%2Finvariant-2.2.4.tgz", 7595 "resolved": "https://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finvariant%2Fdownload%2Finvariant-2.2.4.tgz",
...@@ -7919,11 +7789,6 @@ ...@@ -7919,11 +7789,6 @@
7919 "is-extglob": "^2.1.1" 7789 "is-extglob": "^2.1.1"
7920 } 7790 }
7921 }, 7791 },
7922 "is-negative-zero": {
7923 "version": "2.0.0",
7924 "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
7925 "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
7926 },
7927 "is-number": { 7792 "is-number": {
7928 "version": "3.0.0", 7793 "version": "3.0.0",
7929 "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz", 7794 "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
...@@ -8070,11 +7935,6 @@ ...@@ -8070,11 +7935,6 @@
8070 "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", 7935 "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
8071 "dev": true 7936 "dev": true
8072 }, 7937 },
8073 "ismobilejs": {
8074 "version": "0.5.2",
8075 "resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-0.5.2.tgz",
8076 "integrity": "sha512-ta9UdV60xVZk/ZafFtSFslQaE76SvNkcs1r73d2PVR21zVzx9xuYv9tNe4MxA1NN7WoeCc2RjGot3Bz1eHDx3Q=="
8077 },
8078 "isobject": { 7938 "isobject": {
8079 "version": "3.0.1", 7939 "version": "3.0.1",
8080 "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz", 7940 "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
...@@ -8857,7 +8717,8 @@ ...@@ -8857,7 +8717,8 @@
8857 "js-tokens": { 8717 "js-tokens": {
8858 "version": "4.0.0", 8718 "version": "4.0.0",
8859 "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz", 8719 "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz",
8860 "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=" 8720 "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
8721 "dev": true
8861 }, 8722 },
8862 "js-yaml": { 8723 "js-yaml": {
8863 "version": "3.13.1", 8724 "version": "3.13.1",
...@@ -8961,14 +8822,6 @@ ...@@ -8961,14 +8822,6 @@
8961 "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", 8822 "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
8962 "dev": true 8823 "dev": true
8963 }, 8824 },
8964 "json2mq": {
8965 "version": "0.2.0",
8966 "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
8967 "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
8968 "requires": {
8969 "string-convert": "^0.2.0"
8970 }
8971 },
8972 "json3": { 8825 "json3": {
8973 "version": "3.3.3", 8826 "version": "3.3.3",
8974 "resolved": "https://registry.npm.taobao.org/json3/download/json3-3.3.3.tgz", 8827 "resolved": "https://registry.npm.taobao.org/json3/download/json3-3.3.3.tgz",
...@@ -9191,7 +9044,8 @@ ...@@ -9191,7 +9044,8 @@
9191 "lodash": { 9044 "lodash": {
9192 "version": "4.17.15", 9045 "version": "4.17.15",
9193 "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz", 9046 "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz",
9194 "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=" 9047 "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
9048 "dev": true
9195 }, 9049 },
9196 "lodash.defaultsdeep": { 9050 "lodash.defaultsdeep": {
9197 "version": "4.6.1", 9051 "version": "4.6.1",
...@@ -9223,11 +9077,6 @@ ...@@ -9223,11 +9077,6 @@
9223 "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", 9077 "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
9224 "dev": true 9078 "dev": true
9225 }, 9079 },
9226 "lodash.toarray": {
9227 "version": "4.4.0",
9228 "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
9229 "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
9230 },
9231 "lodash.transform": { 9080 "lodash.transform": {
9232 "version": "4.6.0", 9081 "version": "4.6.0",
9233 "resolved": "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz", 9082 "resolved": "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz",
...@@ -9259,6 +9108,7 @@ ...@@ -9259,6 +9108,7 @@
9259 "version": "1.4.0", 9108 "version": "1.4.0",
9260 "resolved": "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz", 9109 "resolved": "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz",
9261 "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=", 9110 "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=",
9111 "dev": true,
9262 "requires": { 9112 "requires": {
9263 "js-tokens": "^3.0.0 || ^4.0.0" 9113 "js-tokens": "^3.0.0 || ^4.0.0"
9264 } 9114 }
...@@ -9648,11 +9498,6 @@ ...@@ -9648,11 +9498,6 @@
9648 } 9498 }
9649 } 9499 }
9650 }, 9500 },
9651 "moment": {
9652 "version": "2.24.0",
9653 "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
9654 "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
9655 },
9656 "move-concurrently": { 9501 "move-concurrently": {
9657 "version": "1.0.1", 9502 "version": "1.0.1",
9658 "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", 9503 "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
...@@ -9689,11 +9534,6 @@ ...@@ -9689,11 +9534,6 @@
9689 "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", 9534 "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
9690 "dev": true 9535 "dev": true
9691 }, 9536 },
9692 "mutationobserver-shim": {
9693 "version": "0.3.3",
9694 "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
9695 "integrity": "sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ=="
9696 },
9697 "mute-stream": { 9537 "mute-stream": {
9698 "version": "0.0.7", 9538 "version": "0.0.7",
9699 "resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz", 9539 "resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz",
...@@ -9788,14 +9628,6 @@ ...@@ -9788,14 +9628,6 @@
9788 } 9628 }
9789 } 9629 }
9790 }, 9630 },
9791 "node-emoji": {
9792 "version": "1.10.0",
9793 "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
9794 "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
9795 "requires": {
9796 "lodash.toarray": "^4.4.0"
9797 }
9798 },
9799 "node-forge": { 9631 "node-forge": {
9800 "version": "0.9.0", 9632 "version": "0.9.0",
9801 "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz", 9633 "resolved": "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz",
...@@ -9979,7 +9811,8 @@ ...@@ -9979,7 +9811,8 @@
9979 "object-assign": { 9811 "object-assign": {
9980 "version": "4.1.1", 9812 "version": "4.1.1",
9981 "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz", 9813 "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
9982 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" 9814 "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
9815 "dev": true
9983 }, 9816 },
9984 "object-copy": { 9817 "object-copy": {
9985 "version": "0.1.0", 9818 "version": "0.1.0",
...@@ -10094,14 +9927,6 @@ ...@@ -10094,14 +9927,6 @@
10094 "integrity": "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=", 9927 "integrity": "sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4=",
10095 "dev": true 9928 "dev": true
10096 }, 9929 },
10097 "omit.js": {
10098 "version": "1.0.2",
10099 "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
10100 "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
10101 "requires": {
10102 "babel-runtime": "^6.23.0"
10103 }
10104 },
10105 "on-finished": { 9930 "on-finished": {
10106 "version": "2.3.0", 9931 "version": "2.3.0",
10107 "resolved": "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz", 9932 "resolved": "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz",
...@@ -10514,7 +10339,8 @@ ...@@ -10514,7 +10339,8 @@
10514 "performance-now": { 10339 "performance-now": {
10515 "version": "2.1.0", 10340 "version": "2.1.0",
10516 "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz", 10341 "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz",
10517 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" 10342 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
10343 "dev": true
10518 }, 10344 },
10519 "pify": { 10345 "pify": {
10520 "version": "4.0.1", 10346 "version": "4.0.1",
...@@ -11311,14 +11137,6 @@ ...@@ -11311,14 +11137,6 @@
11311 "integrity": "sha1-YOWl/WSn+L+k0qsu1v30yFutFU4=", 11137 "integrity": "sha1-YOWl/WSn+L+k0qsu1v30yFutFU4=",
11312 "dev": true 11138 "dev": true
11313 }, 11139 },
11314 "raf": {
11315 "version": "3.4.1",
11316 "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
11317 "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
11318 "requires": {
11319 "performance-now": "^2.1.0"
11320 }
11321 },
11322 "randombytes": { 11140 "randombytes": {
11323 "version": "2.1.0", 11141 "version": "2.1.0",
11324 "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz", 11142 "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz",
...@@ -11658,11 +11476,6 @@ ...@@ -11658,11 +11476,6 @@
11658 "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", 11476 "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
11659 "dev": true 11477 "dev": true
11660 }, 11478 },
11661 "resize-observer-polyfill": {
11662 "version": "1.5.1",
11663 "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
11664 "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
11665 },
11666 "resolve": { 11479 "resolve": {
11667 "version": "1.13.1", 11480 "version": "1.13.1",
11668 "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.13.1.tgz", 11481 "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.13.1.tgz",
...@@ -12079,16 +11892,6 @@ ...@@ -12079,16 +11892,6 @@
12079 "kind-of": "^6.0.2" 11892 "kind-of": "^6.0.2"
12080 } 11893 }
12081 }, 11894 },
12082 "shallow-equal": {
12083 "version": "1.2.1",
12084 "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
12085 "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
12086 },
12087 "shallowequal": {
12088 "version": "1.1.0",
12089 "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
12090 "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
12091 },
12092 "shebang-command": { 11895 "shebang-command": {
12093 "version": "1.2.0", 11896 "version": "1.2.0",
12094 "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz", 11897 "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
...@@ -12601,11 +12404,6 @@ ...@@ -12601,11 +12404,6 @@
12601 "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", 12404 "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
12602 "dev": true 12405 "dev": true
12603 }, 12406 },
12604 "string-convert": {
12605 "version": "0.2.1",
12606 "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
12607 "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
12608 },
12609 "string-length": { 12407 "string-length": {
12610 "version": "2.0.0", 12408 "version": "2.0.0",
12611 "resolved": "https://registry.npm.taobao.org/string-length/download/string-length-2.0.0.tgz", 12409 "resolved": "https://registry.npm.taobao.org/string-length/download/string-length-2.0.0.tgz",
...@@ -12982,11 +12780,6 @@ ...@@ -12982,11 +12780,6 @@
12982 "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", 12780 "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
12983 "dev": true 12781 "dev": true
12984 }, 12782 },
12985 "tinycolor2": {
12986 "version": "1.4.1",
12987 "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
12988 "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
12989 },
12990 "tmp": { 12783 "tmp": {
12991 "version": "0.0.33", 12784 "version": "0.0.33",
12992 "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", 12785 "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
...@@ -13585,11 +13378,6 @@ ...@@ -13585,11 +13378,6 @@
13585 "vue-style-loader": "^4.1.0" 13378 "vue-style-loader": "^4.1.0"
13586 } 13379 }
13587 }, 13380 },
13588 "vue-ref": {
13589 "version": "1.0.6",
13590 "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-1.0.6.tgz",
13591 "integrity": "sha512-UzD8t1CG+aoWVOOpGd5KcaCNtCgUc0byaKhJMH+6N7H/p1ThVkYl/VCt7DmCrdhUlzZK+hT5JPTKAdrbWi0nNw=="
13592 },
13593 "vue-router": { 13381 "vue-router": {
13594 "version": "3.1.3", 13382 "version": "3.1.3",
13595 "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.1.3.tgz", 13383 "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.1.3.tgz",
...@@ -13650,14 +13438,6 @@ ...@@ -13650,14 +13438,6 @@
13650 "makeerror": "1.0.x" 13438 "makeerror": "1.0.x"
13651 } 13439 }
13652 }, 13440 },
13653 "warning": {
13654 "version": "3.0.0",
13655 "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
13656 "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
13657 "requires": {
13658 "loose-envify": "^1.0.0"
13659 }
13660 },
13661 "watchpack": { 13441 "watchpack": {
13662 "version": "1.6.0", 13442 "version": "1.6.0",
13663 "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz", 13443 "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz",
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
9 "lint": "vue-cli-service lint" 9 "lint": "vue-cli-service lint"
10 }, 10 },
11 "dependencies": { 11 "dependencies": {
12 "ant-design-vue": "^1.4.8",
13 "core-js": "^3.4.3", 12 "core-js": "^3.4.3",
14 "vue": "^2.6.10", 13 "vue": "^2.6.10",
15 "vue-router": "^3.1.3" 14 "vue-router": "^3.1.3"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 * 添加倾斜摄影场景和倾斜摄影图层 3 * 添加倾斜摄影场景和倾斜摄影图层
4 * @Date: 2019-12-02 09:05:50 4 * @Date: 2019-12-02 09:05:50
5 * @LastEditors: jiangbotao 5 * @LastEditors: jiangbotao
6 * @LastEditTime: 2019-12-04 20:20:18 6 * @LastEditTime: 2019-12-07 14:03:39
7 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue 7 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
8 --> 8 -->
9 <template> 9 <template>
......
1 <!-- 1 <!--
2 * 1、加载倾斜摄影模块
3 * 2、加载一个矢量面对象并将其设置为水面效果
2 * @Author: jiangbotao 4 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:52:56 5 * @Date: 2019-12-03 22:52:56
4 * @LastEditors: jiangbotao 6 * @LastEditors: jiangbotao
...@@ -105,12 +107,12 @@ export default { ...@@ -105,12 +107,12 @@ export default {
105 pointer-events: auto; 107 pointer-events: auto;
106 position: absolute; 108 position: absolute;
107 right: 10px; 109 right: 10px;
108 top: 70px; 110 top: 10px;
109 width: 128px; 111 width: 128px;
110 height: 128px; 112 height: 128px;
111 overflow: hidden; 113 overflow: hidden;
112 } 114 }
113 .sm-zoom { 115 .sm-zoom {
114 top: 190px; 116 top: 130px;
115 } 117 }
116 </style> 118 </style>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 * 3、使用Popup来弹出倾斜摄影覆盖面的信息 6 * 3、使用Popup来弹出倾斜摄影覆盖面的信息
7 * @Date: 2019-12-03 22:52:56 7 * @Date: 2019-12-03 22:52:56
8 * @LastEditors: jiangbotao 8 * @LastEditors: jiangbotao
9 * @LastEditTime: 2019-12-07 11:56:15 9 * @LastEditTime: 2019-12-07 14:01:32
10 * @FilePath: \superglobevue\src\components\viewer.vue 10 * @FilePath: \superglobevue\src\components\viewer.vue
11 --> 11 -->
12 <template> 12 <template>
...@@ -231,10 +231,10 @@ export default { ...@@ -231,10 +231,10 @@ export default {
231 231
232 <style> 232 <style>
233 .compass { 233 .compass {
234 top: 60px; 234 top: 10px;
235 } 235 }
236 .navigation-controls { 236 .navigation-controls {
237 top: 180px; 237 top: 130px;
238 } 238 }
239 .bubble { 239 .bubble {
240 padding: 5px; 240 padding: 5px;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:52:56 3 * @Date: 2019-12-03 22:52:56
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-07 12:44:32 5 * @LastEditTime: 2019-12-07 14:02:03
6 * @FilePath: \superglobevue\src\components\viewer.vue 6 * @FilePath: \superglobevue\src\components\viewer.vue
7 --> 7 -->
8 <template> 8 <template>
...@@ -254,9 +254,9 @@ export default { ...@@ -254,9 +254,9 @@ export default {
254 text-align: left; 254 text-align: left;
255 } 255 }
256 .compass { 256 .compass {
257 top: 60px; 257 top: 10px;
258 } 258 }
259 .navigation-controls { 259 .navigation-controls {
260 top: 170px; 260 top: 120px;
261 } 261 }
262 </style> 262 </style>
......
1 <!-- 1 <!--
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * 演示大场景被淹没 3 * 演示倾斜摄影大场景被淹没
4 * 使用场景中的HYP对象
4 * @Date: 2019-12-02 09:05:50 5 * @Date: 2019-12-02 09:05:50
5 * @LastEditors: jiangbotao 6 * @LastEditors: jiangbotao
6 * @LastEditTime: 2019-12-04 22:03:19 7 * @LastEditTime: 2019-12-07 13:52:58
7 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue 8 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
8 --> 9 -->
9 <template> 10 <template>
...@@ -130,18 +131,15 @@ export default { ...@@ -130,18 +131,15 @@ export default {
130 131
131 var layer = scene.layers.find("srsb"); 132 var layer = scene.layers.find("srsb");
132 var hyp = new Cesium.HypsometricSetting(); 133 var hyp = new Cesium.HypsometricSetting();
133
134 //创建分层设色对象 设置最大/最小可见高度 颜色表 显示模式 透明度及线宽 134 //创建分层设色对象 设置最大/最小可见高度 颜色表 显示模式 透明度及线宽
135 var colorTable = new Cesium.ColorTable(); 135 var colorTable = new Cesium.ColorTable();
136 colorTable.insert(100, new Cesium.Color(0, 39/255, 148/255)); 136 colorTable.insert(100, new Cesium.Color(0, 39/255, 148/255));
137 colorTable.insert(0, new Cesium.Color(149/255, 232/255, 249/255)); 137 colorTable.insert(0, new Cesium.Color(149/255, 232/255, 249/255));
138
139 hyp.MaxVisibleValue = currentHeight; 138 hyp.MaxVisibleValue = currentHeight;
140 hyp.MinVisibleValue = minValue; 139 hyp.MinVisibleValue = minValue;
141 hyp.ColorTable = colorTable; 140 hyp.ColorTable = colorTable;
142 hyp.DisplayMode = Cesium.HypsometricSettingEnum.DisplayMode.FACE; 141 hyp.DisplayMode = Cesium.HypsometricSettingEnum.DisplayMode.FACE;
143 hyp.Opacity = 0.6; 142 hyp.Opacity = 0.6;
144
145 hyp.LineInterval = 10.0; 143 hyp.LineInterval = 10.0;
146 144
147 //设置图层分层设色属性 145 //设置图层分层设色属性
...@@ -149,7 +147,6 @@ export default { ...@@ -149,7 +147,6 @@ export default {
149 hypsometricSetting : hyp, 147 hypsometricSetting : hyp,
150 analysisMode : Cesium.HypsometricSettingEnum.AnalysisRegionMode.ARM_ALL 148 analysisMode : Cesium.HypsometricSettingEnum.AnalysisRegionMode.ARM_ALL
151 }; 149 };
152
153 currentHeight += (parseInt(document.getElementById("speed").value))/10; 150 currentHeight += (parseInt(document.getElementById("speed").value))/10;
154 }; 151 };
155 152
...@@ -158,7 +155,6 @@ export default { ...@@ -158,7 +155,6 @@ export default {
158 var layer = scene.layers.find("sci_park"); 155 var layer = scene.layers.find("sci_park");
159 var hyp = new Cesium.HypsometricSetting(); 156 var hyp = new Cesium.HypsometricSetting();
160 hyp.MaxVisibleValue = 0; 157 hyp.MaxVisibleValue = 0;
161
162 layer.hypsometricSetting = { 158 layer.hypsometricSetting = {
163 hypsometricSetting : hyp, 159 hypsometricSetting : hyp,
164 analysisMode : Cesium.HypsometricSettingEnum.AnalysisRegionMode.ARM_ALL 160 analysisMode : Cesium.HypsometricSettingEnum.AnalysisRegionMode.ARM_ALL
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 * 2、添加了超图发布的矢量瓦片服务 4 * 2、添加了超图发布的矢量瓦片服务
5 * @Date: 2019-12-02 09:05:50 5 * @Date: 2019-12-02 09:05:50
6 * @LastEditors: jiangbotao 6 * @LastEditors: jiangbotao
7 * @LastEditTime: 2019-12-05 13:14:46 7 * @LastEditTime: 2019-12-07 13:52:13
8 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue 8 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
9 --> 9 -->
10 <template> 10 <template>
...@@ -94,12 +94,12 @@ export default { ...@@ -94,12 +94,12 @@ export default {
94 pointer-events: auto; 94 pointer-events: auto;
95 position: absolute; 95 position: absolute;
96 right: 10px; 96 right: 10px;
97 top: 70px; 97 top: 10px;
98 width: 128px; 98 width: 128px;
99 height: 128px; 99 height: 128px;
100 overflow: hidden; 100 overflow: hidden;
101 } 101 }
102 .sm-zoom { 102 .sm-zoom {
103 top: 190px; 103 top: 130px;
104 } 104 }
105 </style> 105 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
2 * 显示基本的三维Globe 2 * 显示基本的三维Globe
3 * 1、添加SuperMap发布的地形数据 3 * 1、添加SuperMap发布的地形数据
4 * 2、添加SuperMap发布的影像数据 4 * 2、添加SuperMap发布的影像数据
5 * 3、量测面积 5 * 3、淹没区分析
6 * 4、淹没区分析 6 * 3.1 Entity分析
7 * 3.2 Primitive分析
7 * @Author: jiangbotao 8 * @Author: jiangbotao
8 * @Date: 2019-12-02 09:05:50 9 * @Date: 2019-12-02 09:05:50
9 * @LastEditors: jiangbotao 10 * @LastEditors: jiangbotao
10 * @LastEditTime: 2019-12-04 20:09:26 11 * @LastEditTime: 2019-12-07 13:49:40
11 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue 12 * @FilePath: \WebGL_Webpack_Vue\components\viewer.vue
12 --> 13 -->
13 <template> 14 <template>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
35 </div> 36 </div>
36 <div id="toolbar" class="param-container tool-bar"> 37 <div id="toolbar" class="param-container tool-bar">
37 <div class="param-item"> 38 <div class="param-item">
38 <button type="button" id="draw" class="button black">绘面</button> 39 <button type="button" id="draw" class="button black">制分析</button>
39 <button type="button" id="begin" class="button black">淹没分析</button> 40 <button type="button" id="begin" class="button black">淹没分析</button>
40 <button type="button" id="clear" class="button black">清除</button> 41 <button type="button" id="clear" class="button black">清除</button>
41 </div> 42 </div>
...@@ -98,7 +99,7 @@ export default { ...@@ -98,7 +99,7 @@ export default {
98 positions.push(longitude); 99 positions.push(longitude);
99 positions.push(latitude); 100 positions.push(latitude);
100 positions.push(h); 101 positions.push(h);
101 102 // 淹没分析时的固定底面
102 positions2d.push(longitude); 103 positions2d.push(longitude);
103 positions2d.push(latitude); 104 positions2d.push(latitude);
104 positions2d.push(1000.0); 105 positions2d.push(1000.0);
...@@ -116,12 +117,14 @@ export default { ...@@ -116,12 +117,14 @@ export default {
116 var targetHeight = 3500; 117 var targetHeight = 3500;
117 var entities = __this.viewer.entities; 118 var entities = __this.viewer.entities;
118 //方式1 119 //方式1
119 // __this.floodCal(entities, positions2d, waterHeight, targetHeight); 120 __this.floodCal(entities, positions2d, waterHeight, targetHeight);
120 __this.floodParse(scene, positions2d, waterHeight, targetHeight); 121 // 方式2
122 // __this.floodParse(scene, positions2d, waterHeight, targetHeight);
121 handlerPolygon && handlerPolygon.clear(); 123 handlerPolygon && handlerPolygon.clear();
122 }); 124 });
123 125
124 $("#clear").click(function(){ 126 $("#clear").click(function(){
127 __this.viewer.entities.removeAll();
125 handlerPolygon && handlerPolygon.clear(); 128 handlerPolygon && handlerPolygon.clear();
126 }); 129 });
127 130
...@@ -257,7 +260,12 @@ export default { ...@@ -257,7 +260,12 @@ export default {
257 .tool-bar { 260 .tool-bar {
258 position: absolute; 261 position: absolute;
259 left: 10px; 262 left: 10px;
260 top: 60px; 263 top: 20px;
261 z-index: 10000; 264 z-index: 10000;
265 padding: 2px;
266 }
267 .param-container .param-item {
268 margin: 5px;
269 overflow: hidden;
262 } 270 }
263 </style> 271 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,17 +2,14 @@ ...@@ -2,17 +2,14 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:08 3 * @Date: 2019-12-03 22:31:08
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-07 11:44:35 5 * @LastEditTime: 2019-12-07 13:39:25
6 * @FilePath: \superglobevue\src\main.js 6 * @FilePath: \superglobevue\src\main.js
7 */ 7 */
8 import Vue from 'vue' 8 import Vue from 'vue'
9 import Antd from 'ant-design-vue'
10 import App from './App' 9 import App from './App'
11 import 'ant-design-vue/dist/antd.css'
12 import router from './router' 10 import router from './router'
13 11
14 Vue.config.productionTip = false 12 Vue.config.productionTip = false
15 Vue.use(Antd)
16 13
17 new Vue({ 14 new Vue({
18 router, 15 router,
......
...@@ -2,29 +2,20 @@ ...@@ -2,29 +2,20 @@
2 * @Author: jiangbotao 2 * @Author: jiangbotao
3 * @Date: 2019-12-03 22:31:08 3 * @Date: 2019-12-03 22:31:08
4 * @LastEditors: jiangbotao 4 * @LastEditors: jiangbotao
5 * @LastEditTime: 2019-12-07 12:44:47 5 * @LastEditTime: 2019-12-07 14:00:56
6 * @FilePath: \superglobevue\src\views\Home.vue 6 * @FilePath: \superglobevue\src\views\Home.vue
7 --> 7 -->
8 <template> 8 <template>
9 <a-layout>
10 <a-layout-header>
11 <a-icon type="global" />&nbsp;&nbsp;三维地理信息系统
12 </a-layout-header>
13 <a-layout-content style="padding: 0px;">
14 <viewer></viewer> 9 <viewer></viewer>
15 </a-layout-content>
16 <a-layout-footer style="height: 22px;">Footer</a-layout-footer>
17 </a-layout>
18 </template> 10 </template>
19 11
20 <script> 12 <script>
21 import viewer from "@/components/viewer_s3m_single.vue"; 13 import viewer from "@/components/viewer_mimg.vue";
22 14
23 export default { 15 export default {
24 name: "home", 16 name: "home",
25 data() { 17 data() {
26 return { 18 return {
27 theme1: 'primary'
28 }; 19 };
29 }, 20 },
30 components: { 21 components: {
...@@ -34,28 +25,5 @@ export default { ...@@ -34,28 +25,5 @@ export default {
34 </script> 25 </script>
35 26
36 <style scoped> 27 <style scoped>
37 .ant-layout-header { 28
38 height: 60px;
39 top: 0px;
40 position: absolute;
41 width: 100%;
42 background-color: #2d8cf0;
43 color: white;
44 text-align: left;
45 padding: 0px 0px;
46 padding-left: 10px;
47 z-index: 99;
48 font-size: 18pt;
49 }
50 .ant-layout-footer {
51 height: 22px;
52 bottom: 0px;
53 position: absolute;
54 width: 100%;
55 background-color: rgba(19, 17, 17, 0.5);
56 color: white;
57 text-align: left;
58 padding-top: 2px;
59 padding-left: 10px;
60 }
61 </style> 29 </style>
......