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

.env.development

@@ -8,7 +8,7 @@ VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
-VUE_APP_NODE_ENV=dev_sdtdt
-# VUE_APP_NODE_ENV=dev
+# VUE_APP_NODE_ENV=dev_sdtdt
+VUE_APP_NODE_ENV=dev
 #项目根路径
 VUE_APP_PUBLIC_PATH=epmet-oper

src/utils/dai-map.js

@@ -49,9 +49,13 @@ export function searchNearby(map, keyword) {
                 lng,
                 lat,
                 address,
-                resultList: data.map((item) => {
+                resultList: data.map((item, index) => {
+                  const {
+                    location: { lat, lng },
+                  } = item;
                   item.lonlat = lng + " " + lat;
                   item.name = item.name || "";
+                  item.hotPointID = "hotPointID" + index;
                   return item;
                 }),
               },
@@ -93,7 +97,10 @@ export function searchNearby(map, keyword) {
             lng,
             lat,
             address: address + name,
-            resultList: data,
+            resultList: data.map((item, index) => {
+              item.hotPointID = "hotPointID" + index;
+              return item;
+            }),
           },
         });
       } else {
@@ -129,9 +136,11 @@ export function searchNearby(map, keyword) {
             lng,
             lat,
             address: address + name,
-            resultList: result.features.map((item) => {
+            resultList: result.features.map((item, index) => {
+              const { lng, lat } = item;
               item.lonlat = lng + " " + lat;
               item.name = item.name || "";
+              item.hotPointID = "hotPointID" + index;
               return item;
             }),
           },

src/utils/tdt-wp-zw.js

@@ -6,6 +6,7 @@ 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://wprd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}';
 }
 
 export default {

src/views/modules/visual/command/index.vue

@@ -289,7 +289,7 @@ export default {
     cptCard,
     ScreenLoading,
     gridMap:
-      mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt"
+      mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt1"
         ? gridMapOl
         : gridMap,
     sidemenu1,