diff --git a/package.json b/package.json index 78b1bb281..636a2262a 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "ol": "^6.9.0", "particles.js": "^2.0.0", "portfinder": "^1.0.21", + "proj4": "^2.8.0", "qs": "^6.7.0", "quill": "^1.3.6", "screenfull": "^4.2.1", @@ -112,4 +113,4 @@ "not ie <= 10" ] } -} \ No newline at end of file +} diff --git a/public/index.html b/public/index.html index 850ec51df..57c3284fb 100644 --- a/public/index.html +++ b/public/index.html @@ -44,7 +44,7 @@ if (SITE_CONFIG['nodeEnv'] == 'dev_tdt') { toLoadJs('http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926') } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt') { - toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js?tk=e758167d5b90c351b70a979c0820840c') + toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js') } else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') { toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js') } else { diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index c56abb6f0..8e2c609cb 100644 --- a/src/utils/tdt-wp-zw.js +++ b/src/utils/tdt-wp-zw.js @@ -5,9 +5,7 @@ if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { vec = "http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c"; vec = - "http://service.sdmap.gov.cn/tileservice/sdpubmap?tk=e758167d5b90c351b70a979c0820840c&layer=SDPubMap&style=default&tilematrixset=vector&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fpng&TileMatrix={z}&TileCol={x}&TileRow={y}"; - vec = - "http://www.sdmap.gov.cn/tileservice/SdRasterPubMap?layer=SDRasterPubMap&style=default&tilematrixset=default028mm&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image/png&TileMatrix={z}&TileCol={x}&TileRow={y}&key=e758167d5b90c351b70a979c0820840c"; + "http://www.sdmap.gov.cn/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=sdvec&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng"; } // http://www.sdmap.gov.cn/tileservice/SDPubMap diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue index 2dbd347c4..ba7472e8a 100644 --- a/src/views/modules/visual/command/cpts/map.vue +++ b/src/views/modules/visual/command/cpts/map.vue @@ -463,6 +463,10 @@ export default { type: "rasterTile", tileSize: 256, zoomOffset: 0, + extent: [ + 114.229839088925, 33.9389305555556, 123.400530149205, + 38.9048194444444, + ], }, }) .style({ diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue index d78633b44..662ad1776 100644 --- a/src/views/modules/workSys/mapConfig.vue +++ b/src/views/modules/workSys/mapConfig.vue @@ -1,200 +1,234 @@