Merge branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/utils/dai-map.js

@@ -103,11 +103,12 @@ export function searchNearby(map, keyword) {
       const center = map.getCenter();
       const url = urlSdtdt.search;
       const { status, result } = await requestGet(url, {
-        area: `CIRCLE(${center.lon} ${center.lat} 1000000)`,
+        // area: `CIRCLE(${center.lon} ${center.lat} 1000000)`,
         words: keyword,
-        city: "全国",
+        city: "烟台",
+        uid: "navinfo",
         st: "LocalSearch",
-        tk: "e758167d5b90c351b70a979c0820840c",
+        // tk: "e758167d5b90c351b70a979c0820840c",
       });
 
       if (
@@ -362,7 +363,9 @@ export default function init(ele, position, params) {
         const { status, result } = await requestGet(url, {
           point: lng + "," + lat,
           type: "11",
-          tk: "e758167d5b90c351b70a979c0820840c",
+          st: "Rgc2",
+          output: "json",
+          // tk: "e758167d5b90c351b70a979c0820840c",
         });
         if (status == "ok" && result.address) {
           reslove({

src/utils/tdt-wp-zw.js

@@ -4,6 +4,10 @@ let vec =
 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