From e6bb1dc30c20d52ba23e7073292d01eb50e8302d Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 27 Oct 2022 16:47:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E7=AD=B9=E8=8E=AB=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/utils/tdt-wp-zw.js | 4 +--- src/views/modules/visual/command/cpts/map.vue | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/index.html b/public/index.html index 46123c8a9..2e1d6b701 100644 --- a/public/index.html +++ b/public/index.html @@ -40,7 +40,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({ From 849b9429bb68700d2f62149ec51c6e2e67823237 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 28 Oct 2022 16:53:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/views/modules/workSys/mapConfig.vue | 1182 +++++++++++++---------- 2 files changed, 650 insertions(+), 535 deletions(-) diff --git a/package.json b/package.json index 964c9454b..799ec0ed1 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "node-sass": "^4.12.0", "ol": "^6.9.0", "portfinder": "^1.0.21", + "proj4": "^2.8.0", "qs": "^6.7.0", "quill": "^1.3.6", "screenfull": "^4.2.1", @@ -111,4 +112,4 @@ "not ie <= 10" ] } -} \ No newline at end of file +} 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 @@