【website-站点示例】【杨琨】【修改示例】

killer1992 · killer1992 · commit 1470d5324652 · 2021-06-07T11:46:48.000+08:00
diff --git a/website/public/static/demo/vue-cesium/example/control/draw.htm b/website/public/static/demo/vue-cesium/example/control/draw.htm
@@ -41,11 +41,12 @@
                 lib-path="./static/libs/cdn/cesium/Cesium.js"
                 plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js"
             >
-                <mapgis-3d-draw ref="drawref" :vue-key="vueKey" v-on:load="handleDrawLoad" v-on:drawcreate="handleCreate">
+                <mapgis-3d-draw ref="drawref" v-on:load="handleDrawLoad" v-on:drawcreate="handleCreate">
                     <div id="toolbar-wrapper">
                         <div class="toolbar-item" v-on:click="togglePoint">画点</div>
                         <div class="toolbar-item" v-on:click="togglePolyline">画线</div>
                         <div class="toolbar-item" v-on:click="togglePolygon">画区</div>
+                        <div class="toolbar-item" v-on:click="toggleRectangle">画矩形</div>
                         <div class="toolbar-item" v-on:click="toggleDelete">删除</div>
                     </div>
                 </mapgis-3d-draw>
@@ -83,6 +84,9 @@
                     togglePolygon() {
                         this.drawer && this.drawer.enableDrawPolygon();
                     },
+                    toggleRectangle() {
+                        this.drawer && this.drawer.enableDrawRectangle();
+                    },
                     toggleDelete() {
                         this.drawer && this.drawer.removeEntities();
                     }
diff --git a/website/public/static/demo/vue-cesium/gallery/control/draw.png b/website/public/static/demo/vue-cesium/gallery/control/draw.png
diff --git a/website/public/static/demo/vue-cesium/gallery/raster/raster.png b/website/public/static/demo/vue-cesium/gallery/raster/raster.png
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/attribution.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/attribution.htm
@@ -39,7 +39,6 @@
             :token="token">
           </mapgis-ogc-wmts-layer>
           <mapgis-rastertile-layer
-            :layer="layerRaster"
             :layer-id="layerRasterId"
             :source="sourceRaster"
             :source-id="sourceRasterId">
@@ -76,7 +75,6 @@
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/draw.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/draw.htm
@@ -52,7 +52,6 @@
                 v-bind:crs="mapCrs"
             >
                 <mapgis-igs-tdt-layer
-                    v-bind:layer="layer"
                     v-bind:layer-id="layerId"
                     v-bind:source-id="sourceId"
                     v-bind:baseURL="baseURL"
@@ -64,15 +63,15 @@
                     class="custom-draw-wrapper"
                     position="top-left"
                     v-bind:controls="controls"
-                    v-on:added="handleAdded1"
-                    v-on:drawcreate="handleCreate1"
-                    ref="drawref1"
+                    v-on:added="handleAdded"
+                    v-on:drawcreate="handleCreate"
+                    ref="drawref"
                 >
                     <div id="toolbar-wrapper1">
-                        <div class="toolbar-item" v-on:click="togglePoint1">画点</div>
-                        <div class="toolbar-item" v-on:click="togglePolyline1">画线</div>
-                        <div class="toolbar-item" v-on:click="togglePolygon1">画区</div>
-                        <div class="toolbar-item" v-on:click="toggleDelete1">删除</div>
+                        <div class="toolbar-item" v-on:click="togglePoint">画点</div>
+                        <div class="toolbar-item" v-on:click="togglePolyline">画线</div>
+                        <div class="toolbar-item" v-on:click="togglePolygon">画区</div>
+                        <div class="toolbar-item" v-on:click="toggleDelete">删除</div>
                     </div>
                 </mapgis-draw>
             </mapgis-web-map>
@@ -97,7 +96,6 @@
 
                         layerId: 'igsLayer_layerId',
                         sourceId: 'igsLayer_sourceId',
-                        layer: {}, // 图层配置信息
                         baseURL: 'http://t2.tianditu.gov.cn/vec_c/wmts', // 请求基地址
                         token: '2ddaabf906d4b5418aed0078e1657029', // 请求天地图的key值
                         controls: {
@@ -112,44 +110,34 @@
                     };
                 },
                 methods: {
-                    enableDrawer1() {
-                        const component = this.$refs.drawref1;
+                    enableDrawer() {
+                        const component = this.$refs.drawref;
                         if (component) {
                             component.enableDrawer();
                         }
                     },
-                    enableDrawer2() {
-                        const component = this.$refs.drawref2;
-                        if (component) {
-                            component.enableDrawer();
-                        }
-                    },
-                    handleAdded1(e, data) {
+                    handleAdded(e, data) {
                         var { drawer, map } = e;
-                        this.drawer1 = drawer;
+                        this.drawer = drawer;
                     },
-                    handleCreate1(e) {
+                    handleCreate(e) {
                         console.log('create', e);
-                        // this.drawer1 && this.drawer1.deleteAll();
                     },
-                    togglePoint1(e) {
-                        this.enableDrawer1();
-                        this.drawer1 && this.drawer1.changeMode('draw_point');
+                    togglePoint(e) {
+                        this.enableDrawer();
+                        this.drawer && this.drawer.changeMode('draw_point');
                     },
-                    togglePolyline1() {
-                        this.enableDrawer1();
-                        this.drawer1 && this.drawer1.changeMode('draw_line_string');
+                    togglePolyline() {
+                        this.enableDrawer();
+                        this.drawer && this.drawer.changeMode('draw_line_string');
                     },
-                    togglePolygon1() {
-                        this.enableDrawer1();
+                    togglePolygon() {
+                        this.enableDrawer();
                         this.mode = 'QueryByPolygon';
-                        this.drawer1 && this.drawer1.changeMode('draw_polygon');
-                    },
-                    toggleDelete1() {
-                        this.drawer1 && this.drawer1.deleteAll();
+                        this.drawer && this.drawer.changeMode('draw_polygon');
                     },
-                    toggleDelete2() {
-                        this.drawer2 && this.drawer2.deleteAll();
+                    toggleDelete() {
+                        this.drawer && this.drawer.deleteAll();
                     }
                 }
             });
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/fps.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/fps.htm
@@ -40,7 +40,6 @@
                 >
                 </mapgis-ogc-wmts-layer>
                 <mapgis-rastertile-layer
-                    v-bind:layer="layerRaster"
                     v-bind:layer-id="layerRasterId"
                     v-bind:source="sourceRaster"
                     v-bind:source-id="sourceRasterId"
@@ -76,7 +75,6 @@
                         format:"tiles",
                         token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerRaster: {},
                         sourceRaster: {
                             type: 'raster',
                             tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/fullscreen.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/fullscreen.htm
@@ -39,7 +39,6 @@
            :token="token">
           </mapgis-ogc-wmts-layer>
           <mapgis-rastertile-layer
-           :layer="layerRaster"
            :layer-id="layerRasterId"
            :source="sourceRaster"
            :source-id="sourceRasterId">
@@ -77,7 +76,6 @@
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/geolocate.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/geolocate.htm
@@ -40,7 +40,6 @@
                   :token="token">
           </mapgis-ogc-wmts-layer>
         <mapgis-rastertile-layer
-          :layer="layerRaster"
           :layer-id="layerRasterId"
           :source="sourceRaster"
           :source-id="sourceRasterId"
@@ -76,7 +75,6 @@
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/marker.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/marker.htm
@@ -45,7 +45,6 @@
                     v-bind:token="token">
                 </mapgis-ogc-wmts-layer>
                 <mapgis-rastertile-layer
-                    v-bind:layer="layerRaster"
                     v-bind:layer-id="layerRasterId"
                     v-bind:source="sourceRaster"
                     v-bind:source-id="sourceRasterId"
@@ -83,7 +82,6 @@
                         format:"tiles",
                         token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerRaster: {},
                         sourceRaster: {
                             type: 'raster',
                             tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/measure.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/measure.htm
@@ -53,8 +53,7 @@
                 v-on:load="handleMapLoad"
                 >
                 <mapgis-igs-tdt-layer 
-                    :layer="layer" 
-                    :layer-id="layerId" 
+                    :layer-id="layerId"
                     :source-id="sourceId" 
                     :baseURL="baseURL" 
                     :token="token" 
@@ -101,7 +100,6 @@
 
                         layerId: 'igsLayer_layerId',
                         sourceId: 'igsLayer_sourceId',
-                        layer: {}, // 图层配置信息
                         baseURL: 'http://t2.tianditu.gov.cn/vec_c/wmts', // 请求基地址
                         token: '2ddaabf906d4b5418aed0078e1657029', // 请求天地图的key值
                         controls: {
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/navigation.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/navigation.htm
@@ -44,7 +44,6 @@
                   v-bind:token="token">
           </mapgis-ogc-wmts-layer>
         <mapgis-rastertile-layer
-          :layer="layerRaster"
           :layer-id="layerRasterId"
           :source="sourceRaster"
           :source-id="sourceRasterId"
@@ -80,7 +79,6 @@
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/popup.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/popup.htm
@@ -43,7 +43,6 @@
           :token="token">
         </mapgis-ogc-wmts-layer>
         <mapgis-rastertile-layer
-          :layer="layerRaster"
           :layer-id="layerRasterId"
           :source="sourceRaster"
           :source-id="sourceRasterId"
@@ -82,8 +81,6 @@
                   tileMatrixSet:"c",
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
-
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-control/scale.htm b/website/public/static/demo/vue-mapboxgl/example/vue-control/scale.htm
@@ -39,7 +39,6 @@
              :token="token">
           </mapgis-ogc-wmts-layer>
         <mapgis-rastertile-layer
-          :layer="layerRaster"
           :layer-id="layerRasterId"
           :source="sourceRaster"
           :source-id="sourceRasterId"
@@ -73,7 +72,6 @@
                   format:"tiles",
                   token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                  layerRaster: {},
                   sourceRaster: {
                       type: 'raster',
                       tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-raster/document.htm b/website/public/static/demo/vue-mapboxgl/example/vue-raster/document.htm
@@ -64,7 +64,6 @@
                 >
                 </mapgis-ogc-wmts-layer>
                 <mapgis-igs-doc-layer
-                    v-bind:layer="layerRaster"
                     v-bind:layer-id="layerRasterId"
                     v-bind:source-id="sourceRasterId"
                     v-bind:url="url"
@@ -97,7 +96,6 @@
                         format:"tiles",
                         token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerRaster: {},
                         layerRasterId: 'raster_layerId',
                         sourceRasterId: 'raster_sourceId',
                         url:'http://develop.smaryun.com:6163/igs/rest/mrms/docs/北京市'
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-raster/raster.htm b/website/public/static/demo/vue-mapboxgl/example/vue-raster/raster.htm
@@ -64,7 +64,6 @@
                 >
                 </mapgis-ogc-wmts-layer>
                 <mapgis-rastertile-layer
-                    v-bind:layer="layerRaster"
                     v-bind:layer-id="layerRasterId"
                     v-bind:source="sourceRaster"
                     v-bind:source-id="sourceRasterId"
@@ -97,7 +96,6 @@
                         format:"tiles",
                         token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerRaster: {},
                         sourceRaster: {
                             type: 'raster',
                             tiles: ['http://t0.tianditu.com/DataServer?T=cia_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752']
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-raster/tdtlayer.htm b/website/public/static/demo/vue-mapboxgl/example/vue-raster/tdtlayer.htm
@@ -25,14 +25,12 @@
         v-on:load="handleMapLoad"
         >
         <mapgis-igs-tdt-layer
-          :layer="tianditu1Layer"
           :layer-id="tianditu1LayerId"
           :source-id="tianditu1SourceId"
           :url="tianditu1Url"
           >
         </mapgis-igs-tdt-layer>
         <mapgis-igs-tdt-layer
-          :layer="tianditu2Layer"
           :layer-id="tianditu2LayerId"
           :source-id="tianditu2SourceId"
           :url="tianditu2Url"
@@ -58,7 +56,6 @@
                   outerCenter: [116.39, 40.20], // 地图显示中心
                   mapCrs: 'EPSG:4326',
 
-                  tianditu1Layer: {},
                   tianditu1LayerId: 'tianditu_layer_id_1',
                   tianditu1SourceId: 'tianditu_source_id_1',
                   tianditu1Url:  'http://t' +
@@ -68,7 +65,6 @@
                       '&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}' +
                       '&tk=' +  tiandituKey,
 
-                  tianditu2Layer: {},
                   tianditu2LayerId: 'tianditu_layer_id_2',
                   tianditu2SourceId: 'tianditu_source_id_2',
                   tianditu2Url:  'http://t' +
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-raster/tile.htm b/website/public/static/demo/vue-mapboxgl/example/vue-raster/tile.htm
@@ -64,7 +64,6 @@
                 >
                 </mapgis-ogc-wmts-layer>
                 <mapgis-igs-tile-layer
-                    v-bind:layer="layerRaster"
                     v-bind:layer-id="layerRasterId"
                     v-bind:source-id="sourceRasterId"
                     v-bind:url="url"
@@ -97,7 +96,6 @@
                         format:"tiles",
                         token:"f5347cab4b28410a6e8ba5143e3d5a35",
 
-                        layerRaster: {},
                         layerRasterId: 'raster_layerId',
                         sourceRasterId: 'raster_sourceId',
                         url:'http://develop.smaryun.com:6163/igs/rest/mrms/tile/北京市/{z}/{y}/{x}'
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/circle.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/circle.htm
@@ -23,14 +23,13 @@
         <div id="app">
             <mapgis-web-map
                 id="map"
-                :access-token="accessToken"
                 :map-style="mapStyle"
                 :zoom="mapZoom"
                 :center="outerCenter"
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
+                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
                 <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
                 </mapgis-vector-layer>
                 <mapgis-vector-layer :layer="layerSymbol" :layer-id="layerSymbolId" :source="sourceSymbol" :source-id="sourceSymbolId">
@@ -81,7 +80,6 @@
                         outerCenter: [114.39960479736327, 30.495722001885323], // 地图显示中心
                         mapCrs: 'EPSG:4326',
 
-                        layerWmts: {},
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
                         wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill-extrusion.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill-extrusion.htm
@@ -23,7 +23,6 @@
         <div id="app">
             <mapgis-web-map
                 id="map"
-                :access-token="accessToken"
                 :map-style="mapStyle"
                 :zoom="mapZoom"
                 :pitch="45"
@@ -32,7 +31,7 @@
                 :crs="mapCrs"
                 v-on:load="handleMapLoad"
             >
-                <mapgis-ogc-wmts-layer :layer="layerWmts" :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
+                <mapgis-ogc-wmts-layer :layer-id="layerWmtsId" :source-id="sourceWmtsId" :url="wmtsurl"> </mapgis-ogc-wmts-layer>
                 <mapgis-vector-layer :layer="layerVector" :layer-id="layerVectorId" :source="sourceVector" :source-id="sourceVectorId">
                 </mapgis-vector-layer>
             </mapgis-web-map>
@@ -167,7 +166,6 @@
                         outerCenter: [114.39958333969115, 30.467706575758285], // 地图显示中心
                         mapCrs: 'EPSG:4326',
 
-                        layerWmts: {},
                         layerWmtsId: 'ogcwmts_layer_id',
                         sourceWmtsId: 'ogcwmts_source_id',
                         wmtsurl: 'http://t0.tianditu.com/DataServer?T=img_c&L={z}&Y={y}&X={x}&tk=9c157e9585486c02edf817d2ecbc7752',
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/fill.htm
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/line.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/line.htm
diff --git a/website/public/static/demo/vue-mapboxgl/example/vue-vector/symbol.htm b/website/public/static/demo/vue-mapboxgl/example/vue-vector/symbol.htm
