Skip to content

Commit c733114

Browse files
author
潘卓然ParnDeedlit
committed
【站点】【修复】【修复10.5.4版本的网站用例】
1 parent 0f13d07 commit c733114

File tree

14 files changed

+78
-56
lines changed

14 files changed

+78
-56
lines changed

‎website/public/static/demo/config/config-vue-cesium.json‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@
88
"iconfont": "iconhand_draw",
99
"folder": "raster",
1010
"leaffolder": true,
11+
"childs": [
12+
{
13+
"name": "通用瓦片",
14+
"file": "raster",
15+
"diffcult": "2",
16+
"detail": "",
17+
"icon": "raster.png",
18+
"update": "最后更新时间：2020-11-23"
19+
},
20+
{
21+
"name": "地形瓦片",
22+
"file": "dem",
23+
"diffcult": "2",
24+
"detail": "",
25+
"icon": "dem.png",
26+
"update": "最后更新时间：2020-11-23"
27+
}
28+
]
29+
},
30+
{
31+
"name": "Vue-IGServer",
32+
"iconfont": "iconhand_draw",
33+
"folder": "igserver",
34+
"leaffolder": true,
1135
"childs": [
1236
{
1337
"name": "地图文档",
@@ -24,15 +48,15 @@
2448
"detail": "",
2549
"icon": "tile.png",
2650
"update": "最后更新时间：2020-11-23"
27-
},
28-
{
29-
"name": "通用瓦片",
30-
"file": "raster",
31-
"diffcult": "2",
32-
"detail": "",
33-
"icon": "raster.png",
34-
"update": "最后更新时间：2020-11-23"
35-
},
51+
}
52+
]
53+
},
54+
{
55+
"name": "Vue-OGC",
56+
"iconfont": "iconhand_draw",
57+
"folder": "ogc",
58+
"leaffolder": true,
59+
"childs": [
3660
{
3761
"name": "WMTS瓦片",
3862
"file": "wmts",
@@ -48,14 +72,6 @@
4872
"detail": "",
4973
"icon": "wms.png",
5074
"update": "最后更新时间：2021-01-28"
51-
},
52-
{
53-
"name": "地形瓦片",
54-
"file": "dem",
55-
"diffcult": "2",
56-
"detail": "",
57-
"icon": "dem.png",
58-
"update": "最后更新时间：2020-11-23"
5975
}
6076
]
6177
},

website/public/static/demo/vue-cesium/example/raster/document.htm renamed to website/public/static/demo/vue-cesium/example/igserver/document.htm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<mapgis-3d-igs-doc-layer :base-url="baseUrl"></mapgis-3d-igs-doc-layer>
25+
<mapgis-3d-igs-doc-layer :base-url="baseUrl" :layer-style="layerStyle"></mapgis-3d-igs-doc-layer>
2626
</mapgis-web-scene>
2727
</div>
2828
<script>
2929
new Vue({
3030
el: '#app',
3131
data() {
3232
return {
33-
baseUrl: 'http://develop.smaryun.com:6163/igs/rest/mrms/docs/北京市'
33+
baseUrl: 'http://develop.smaryun.com:6163/igs/rest/mrms/docs/北京市',
34+
layerStyle: {
35+
zIndex: 1
36+
}
3437
};
3538
},
3639
methods: {

website/public/static/demo/vue-cesium/example/raster/tile.htm renamed to website/public/static/demo/vue-cesium/example/igserver/tile.htm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<mapgis-3d-igs-tile-layer :base-url="baseUrl"></mapgis-3d-igs-tile-layer>
25+
<mapgis-3d-igs-tile-layer :base-url="baseUrl" :layer-style="layerStyle"></mapgis-3d-igs-tile-layer>
2626
</mapgis-web-scene>
2727
</div>
2828
<script>
2929
new Vue({
3030
el: '#app',
3131
data() {
3232
return {
33-
baseUrl: 'http://develop.smaryun.com:6163/igs/rest/mrms/tile/北京市'
33+
baseUrl: 'http://develop.smaryun.com:6163/igs/rest/mrms/tile/北京市',
34+
layerStyle: {
35+
zIndex: 1
36+
}
3437
};
3538
},
3639
methods: {

‎website/public/static/demo/vue-cesium/example/model/igsm3d.htm‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,14 @@
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
2525
<mapgis-3d-igs-m3d :url="url"> </mapgis-3d-igs-m3d>
26-
<mapgis-3d-rastertile-layer
27-
:id="rastertile.id"
28-
:base-url="rastertile.baseUrl"
29-
:layer-style="rastertile.layerStyle"
30-
></mapgis-3d-rastertile-layer>
3126
</mapgis-web-scene>
3227
</div>
3328
<script>
3429
new Vue({
3530
el: '#app',
3631
data() {
3732
return {
38-
url: 'http://develop.smaryun.com:6163/igs/rest/g3d/ZondyModels',
39-
rastertile: {
40-
id: 'rastertile',
41-
baseUrl:
42-
'http://t6.tianditu.com/img_w/wmts?service=WMTS&version=1.0.0&request=GetTile&tilematrix={z}&layer=img&style=default&tilerow={y}&tilecol={x}&tilematrixset=w&format=tiles&tk=f5347cab4b28410a6e8ba5143e3d5a35',
43-
layerStyle: {
44-
zIndex: 2
45-
}
46-
}
33+
url: 'http://develop.smaryun.com:6163/igs/rest/g3d/ZondyModels'
4734
};
4835
},
4936
methods: {

‎website/public/static/demo/vue-cesium/example/model/tileset.htm‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
2525
<mapgis-3d-tileset :url="url"> </mapgis-3d-tileset>
26-
<mapgis-3d-rastertile-layer :base-url="rasterUrl"></mapgis-3d-rastertile-layer>
2726
</mapgis-web-scene>
2827
</div>
2928
<script>
3029
new Vue({
3130
el: '#app',
3231
data() {
3332
return {
34-
url: './static/data/3DTile/Tileset/tileset.json',
35-
rasterUrl:
36-
'http://t6.tianditu.com/img_w/wmts?service=WMTS&version=1.0.0&request=GetTile&tilematrix={z}&layer=img&style=default&tilerow={y}&tilecol={x}&tilematrixset=w&format=tiles&tk=f5347cab4b28410a6e8ba5143e3d5a35'
33+
url: './static/data/3DTile/Tileset/tileset.json'
3734
};
3835
},
3936
methods: {

website/public/static/demo/vue-cesium/example/raster/wms.htm renamed to website/public/static/demo/vue-cesium/example/ogc/wms.htm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<mapgis-3d-ogc-wms-layer :base-url="baseUrl" :layers="layers" :srs="srs"></mapgis-3d-ogc-wms-layer>
25+
<mapgis-3d-ogc-wms-layer :base-url="baseUrl" :layers="layers" :srs="srs" :layer-style="layerStyle"></mapgis-3d-ogc-wms-layer>
2626
</mapgis-web-scene>
2727
</div>
2828
<script>
@@ -32,7 +32,10 @@
3232
return {
3333
baseUrl: 'http://develop.smaryun.com:6163/igs/rest/ogc/doc/北京市/WMSServer',
3434
layers: '北京市,绿地_1,绿地_2,绿地_3,绿地_4,水域_3,水域_2,水域_1,大学,学校,动物园,高尔夫,观光胜地,果园,住宅用地,医院,商业用地,建筑物,铁路_1,铁路_2,铁路_3,主干道,主干道,高速公路_1,高速公路_1_9-10,三级道路_链接,三级道路,二级道路_链接,二级道路,一级道路_链接,一级道路,主干道_链接,主干道,主干道,高速公路_链接,高速公路_2,高速公路_2,三级道路_链接,三级道路,二级道路_链接,二级道路,一级道路_链接,一级道路,地铁,主干道_链接,主干道,主干道,高速公路_链接,高速公路_2,高速公路_2,地铁站POI,山顶,果园poi,汽车站点POI,大学poi,学校poi,中小学POI,幼儿园POI,医院POI,口腔医院POI,派出所POI,检察院POI,银行POI,邮局POI,体育馆POI,纪念碑POI,博物馆POI,名胜古迹点,动物园poi,观光胜地poi,主题公园POI,宾馆POI,百货店POI,便利店POI,书店POI,快餐POI,咖啡馆POI,电影院POI,高尔夫poi,村庄点,市镇点,区县点,首都点',
35-
srs: 'EPSG:4326'
35+
srs: 'EPSG:4326',
36+
layerStyle: {
37+
zIndex: 1
38+
}
3639
};
3740
},
3841
methods: {

website/public/static/demo/vue-cesium/example/raster/wmts.htm renamed to website/public/static/demo/vue-cesium/example/ogc/wmts.htm

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
<mapgis-3d-ogc-wmts-layer
2626
:base-url="baseUrl"
2727
:wmts-layer="wmtsLayer"
28-
:tile-matrix-set="tileMatrixSet"
2928
:srs="srs"
30-
:options="options"
29+
:tile-matrix-set="tileMatrixSet"
30+
:format="format"
31+
:layer-style="layerStyle"
3132
>
3233
</mapgis-3d-ogc-wmts-layer>
3334
</mapgis-web-scene>
@@ -41,8 +42,9 @@
4142
wmtsLayer: 'vec',
4243
tileMatrixSet: 'c',
4344
srs: 'EPSG:4326',
44-
options: {
45-
format: 'tiles'
45+
format: 'tiles',
46+
layerStyle: {
47+
zIndex: 1
4648
}
4749
};
4850
},

‎website/public/static/demo/vue-cesium/example/raster/dem.htm‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<cesium-terrain-provider :url="demUrl" :v-if="showDem"></cesium-terrain-provider>
26-
<mapgis-3d-ogc-wmts-layer :base-url="baseUrl" :wmts-layer="wmtsLayer" :srs="srs" :tile-matrix-set="tileMatrixSet">
27-
</mapgis-3d-ogc-wmts-layer>
25+
<mapgis-3d-terrain-provider :url="demUrl" :v-if="showDem"></mapgis-3d-terrain-provider>
26+
<mapgis-3d-ogc-wmts-layer
27+
:base-url="baseUrl"
28+
:wmts-layer="wmtsLayer"
29+
:srs="srs"
30+
:tile-matrix-set="tileMatrixSet"
31+
:format="format"
32+
:layer-style="layerStyle"
33+
>
34+
</mapgis-3d-ogc-wmts-layer>
2835
</mapgis-web-scene>
2936
</div>
3037
<script>
@@ -34,12 +41,13 @@
3441
return {
3542
showDem: false,
3643
demUrl: undefined,
37-
baseUrl: 'http://t6.tianditu.gov.cn/vec_c/wmts?tk=9c157e9585486c02edf817d2ecbc7752',
38-
wmtsLayer: 'vec',
44+
baseUrl: 'http://t6.tianditu.gov.cn/img_c/wmts?tk=9c157e9585486c02edf817d2ecbc7752',
45+
wmtsLayer: 'img',
3946
tileMatrixSet: 'c',
4047
srs: 'EPSG:4326',
41-
options: {
42-
format: 'tiles'
48+
format: 'tiles',
49+
layerStyle: {
50+
zIndex: 1
4351
}
4452
};
4553
},

‎website/public/static/demo/vue-cesium/example/raster/raster.htm‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<mapgis-3d-rastertile-layer :base-url="baseUrl"></mapgis-3d-rastertile-layer>
25+
<mapgis-3d-rastertile-layer :base-url="baseUrl" :layer-style="layerStyle"></mapgis-3d-rastertile-layer>
2626
</mapgis-web-scene>
2727
</div>
2828
<script>
@@ -31,7 +31,10 @@
3131
data() {
3232
return {
3333
baseUrl:
34-
'http://t6.tianditu.com/img_w/wmts?service=WMTS&version=1.0.0&request=GetTile&tilematrix={z}&layer=img&style=default&tilerow={y}&tilecol={x}&tilematrixset=w&format=tiles&tk=f5347cab4b28410a6e8ba5143e3d5a35'
34+
'http://t6.tianditu.com/img_w/wmts?service=WMTS&version=1.0.0&request=GetTile&tilematrix={z}&layer=img&style=default&tilerow={y}&tilecol={x}&tilematrixset=w&format=tiles&tk=f5347cab4b28410a6e8ba5143e3d5a35',
35+
layerStyle: {
36+
zIndex: 1
37+
}
3538
};
3639
},
3740
methods: {

‎website/public/static/demo/vue-cesium/example/vvectortile/vectortile.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
lib-path="./static/libs/cdn/cesium/Cesium.js"
2323
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
2424
>
25-
<mapgis-3d-vectortile-layer v-bind:style-url="styleUrl"></mapgis-3d-vectortile-layer>
25+
<mapgis-3d-vectortile-layer v-bind:mvt-style="mvtStyle"></mapgis-3d-vectortile-layer>
2626
</mapgis-web-scene>
2727
</div>
2828
<script>
2929
new Vue({
3030
el: '#app',
3131
data() {
3232
return {
33-
styleUrl: 'http://develop.smaryun.com:6163/igs/rest/mrms/vtiles/styles/蓝色-墨卡托.json'
33+
mvtStyle: 'http://develop.smaryun.com:6163/igs/rest/mrms/vtiles/styles/蓝色-墨卡托.json'
3434
};
3535
},
3636
methods: {

0 commit comments

Comments
 (0)