Merge pull request #82 from MapGIS/yangkun_6_25

潘卓然 Parn Deedlit · web-flow · commit 4b6deb04dd8e · 2021-06-25T20:07:32.000+08:00
【站点】【修复】【Yangkun 6 25 修改站点BUG】
diff --git a/website/public/static/demo/config/config-headers.json b/website/public/static/demo/config/config-headers.json
@@ -13,9 +13,9 @@
             {
                 "title": "插件",
                 "icon": "iconchajian",
-                "links": [["插件列表", "详细图表", "插件标签", "提交bug", "其他"]],
+                "links": [["插件列表", "详细图表", "插件标签", "提交bug"]],
                 "hightlights": [[false, false, false, false, false]],
-                "routes": [["/total/plugins", "/total/detailChart", "/total/pluginTags", "/total/bugCommit", "/total/other"]]
+                "routes": [["/total/plugins", "/total/detailChart", "/total/pluginTags", "/total/bugCommit"]]
             },
             {
                 "title": "协议",
diff --git a/website/public/static/demo/vue-cesium/example/sceneChildComponnents/compare.htm b/website/public/static/demo/vue-cesium/example/sceneChildComponnents/compare.htm
@@ -16,7 +16,10 @@
 
 <body>
     <div id="app">
-        <mapgis-web-scene>
+        <mapgis-web-scene
+            lib-path="./static/libs/cdn/cesium/Cesium.js"
+            plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
+        >
             <mapgis-3d-arcgis-map-layer :base-url="mapUrl2" :id="mapId2"></mapgis-3d-arcgis-map-layer>
             <mapgis-3d-arcgis-tile-layer :base-url="tileUrl" :id="tileId"></mapgis-3d-arcgis-tile-layer>
             <mapgis-3d-arcgis-map-layer :base-url="mapUrl1" :id="mapId1"></mapgis-3d-arcgis-map-layer>
diff --git a/website/public/static/demo/vue-cesium/example/sceneChildComponnents/measureTwo.htm b/website/public/static/demo/vue-cesium/example/sceneChildComponnents/measureTwo.htm
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-    <title>Vue-测量-多屏</title>
+    <title>Vue-测量-测量组件通过VueKey找到要生效的mapgis-web-scene组件</title>
     <script include="vue,antd" exclude="plugin,cesium" src="./static/libs/include-cesium-local.js"></script>
     <style type="text/css">
         #sceneOne,#sceneTwo {
diff --git a/website/public/static/demo/vue-mapboxgl/example/mapChildComponents/compare-hori.htm b/website/public/static/demo/vue-mapboxgl/example/mapChildComponents/compare-hori.htm
@@ -24,13 +24,27 @@
     <div id="app">
         <mapgis-compare :orientation="orientation">
             <mapgis-web-map :map-style="mapStyle" :zoom="mapZoom" :center="outerCenter" :crs="mapCrs" slot="beforeMap">
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId"
-                    :url="wmtsurl1"> </mapgis-ogc-wmts-layer>
-
+                <mapgis-ogc-wmts-layer
+                        v-bind:layer-id="layerWmtsId"
+                        v-bind:source-id="sourceWmtsId"
+                        v-bind:base-url="wmtsurl1"
+                        v-bind:tile-matrix-set="tileMatrixSet1"
+                        v-bind:wmts-layer="layer1"
+                        v-bind:format="format"
+                        v-bind:token="token"
+                >
+                </mapgis-ogc-wmts-layer>
             </mapgis-web-map>
             <mapgis-web-map :map-style="mapStyle" :zoom="mapZoom" :center="outerCenter" :crs="mapCrs" slot="afterMap">
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId"
-                    :url="wmtsurl2"> </mapgis-ogc-wmts-layer>
+                <mapgis-ogc-wmts-layer
+                        v-bind:layer-id="layerWmtsId"
+                        v-bind:source-id="sourceWmtsId"
+                        v-bind:base-url="wmtsurl2"
+                        v-bind:tile-matrix-set="tileMatrixSet2"
+                        v-bind:wmts-layer="layer2"
+                        v-bind:format="format"
+                        v-bind:token="token"
+                > </mapgis-ogc-wmts-layer>
             </mapgis-web-map>
         </mapgis-compare>
     </div>
@@ -57,8 +71,17 @@
                     layerWmts: {},
                     layerWmtsId: 'ogcwmts_layerId',
                     sourceWmtsId: 'ogcwmts_sourceId',
-                    wmtsurl1: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
-                    wmtsurl2: 'http://t0.tianditu.com/DataServer?T=vec_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752'
+                    wmtsurl1: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                    tileMatrixSet1: 'c',
+                    layer1:"img",
+                    format:"tiles",
+                    token: {
+                        key: 'tk',
+                        value: 'f5347cab4b28410a6e8ba5143e3d5a35'
+                    },
+                    wmtsurl2: 'http://t0.tianditu.gov.cn/vec_c/wmts',
+                    tileMatrixSet2: 'c',
+                    layer2:"vec"
                 };
             }
         });
diff --git a/website/public/static/demo/vue-mapboxgl/example/mapChildComponents/compare.htm b/website/public/static/demo/vue-mapboxgl/example/mapChildComponents/compare.htm
@@ -24,13 +24,27 @@
     <div id="app">
         <mapgis-compare :orientation="orientation">
             <mapgis-web-map :map-style="mapStyle" :zoom="mapZoom" :center="outerCenter" :crs="mapCrs" slot="beforeMap">
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId"
-                    :url="wmtsurl1"> </mapgis-ogc-wmts-layer>
-
+                <mapgis-ogc-wmts-layer
+                        v-bind:layer-id="layerWmtsId"
+                        v-bind:source-id="sourceWmtsId"
+                        v-bind:base-url="wmtsurl1"
+                        v-bind:tile-matrix-set="tileMatrixSet1"
+                        v-bind:wmts-layer="layer1"
+                        v-bind:format="format"
+                        v-bind:token="token"
+                >
+                </mapgis-ogc-wmts-layer>
             </mapgis-web-map>
             <mapgis-web-map :map-style="mapStyle" :zoom="mapZoom" :center="outerCenter" :crs="mapCrs" slot="afterMap">
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId"
-                    :url="wmtsurl2"> </mapgis-ogc-wmts-layer>
+                <mapgis-ogc-wmts-layer
+                        v-bind:layer-id="layerWmtsId"
+                        v-bind:source-id="sourceWmtsId"
+                        v-bind:base-url="wmtsurl2"
+                        v-bind:tile-matrix-set="tileMatrixSet2"
+                        v-bind:wmts-layer="layer2"
+                        v-bind:format="format"
+                        v-bind:token="token"
+                > </mapgis-ogc-wmts-layer>
             </mapgis-web-map>
         </mapgis-compare>
     </div>
@@ -57,8 +71,17 @@
                     layerWmts: {},
                     layerWmtsId: 'ogcwmts_layerId',
                     sourceWmtsId: 'ogcwmts_sourceId',
-                    wmtsurl1: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
-                    wmtsurl2: 'http://t0.tianditu.com/DataServer?T=vec_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752'
+                    wmtsurl1: 'http://t0.tianditu.gov.cn/img_c/wmts',
+                    tileMatrixSet1: 'c',
+                    layer1:"img",
+                    format:"tiles",
+                    token: {
+                        key: 'tk',
+                        value: 'f5347cab4b28410a6e8ba5143e3d5a35'
+                    },
+                    wmtsurl2: 'http://t0.tianditu.gov.cn/vec_c/wmts',
+                    tileMatrixSet2: 'c',
+                    layer2:"vec"
                 };
             },
         });

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`{`
`14`	`14`	`"title": "插件",`
`15`	`15`	`"icon": "iconchajian",`
`16`		`- "links": [["插件列表", "详细图表", "插件标签", "提交bug", "其他"]],`
	`16`	`+ "links": [["插件列表", "详细图表", "插件标签", "提交bug"]],`
`17`	`17`	`"hightlights": [[false, false, false, false, false]],`
`18`		`- "routes": [["/total/plugins", "/total/detailChart", "/total/pluginTags", "/total/bugCommit", "/total/other"]]`
	`18`	`+ "routes": [["/total/plugins", "/total/detailChart", "/total/pluginTags", "/total/bugCommit"]]`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"title": "协议",`