diff --git a/.env.development b/.env.development index e6abb72d8..d1c8a3e7c 100644 --- a/.env.development +++ b/.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 \ No newline at end of file diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index 1d2f4bb07..51da6ae52 100644 --- a/src/utils/dai-map.js +++ b/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; }), }, diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index 530783b60..149116066 100644 --- a/src/utils/tdt-wp-zw.js +++ b/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 { diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantai.vue b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue new file mode 100644 index 000000000..329626f4c --- /dev/null +++ b/src/views/modules/base/epidemic/travelYantai/travelYantai.vue @@ -0,0 +1,1084 @@ + + + + + + diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue new file mode 100644 index 000000000..a943b1d6b --- /dev/null +++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue @@ -0,0 +1,313 @@ + + + + + + + + diff --git a/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue new file mode 100644 index 000000000..662137b1b --- /dev/null +++ b/src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue @@ -0,0 +1,1069 @@ + + + + + + + + + + + diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index 4a08c4291..aea7cad9a 100644 --- a/src/views/modules/visual/command/index.vue +++ b/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, diff --git a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue index 77263287e..bc891c8a3 100644 --- a/src/views/modules/visual/plugin/power/components/screen-org-tree.vue +++ b/src/views/modules/visual/plugin/power/components/screen-org-tree.vue @@ -275,7 +275,7 @@ export default { justify-content: center; margin: 0 7px; &-info { - width: 300px; + width: 400px; height: 80px; background: url('../../../../../../assets/img/plugins/dangwei-by.png') no-repeat; background-size: 100% 100%;