diff --git a/.env.development b/.env.development index 4e6cab176..7c7487dcf 100644 --- a/.env.development +++ b/.env.development @@ -1,14 +1,13 @@ NODE_ENV=development -# VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api + VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/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 + +VUE_APP_NODE_ENV=dev #项目根路径 VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/package.json b/package.json index 79df3449f..964c9454b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "epmet-oper-web", - "version": "2.0.0", + "name": "epmet-oper-gov", + "version": "1.0.0", "private": true, "scripts": { "dev": "vue-cli-service serve", diff --git a/public/index.html b/public/index.html index d8a62f67a..46123c8a9 100644 --- a/public/index.html +++ b/public/index.html @@ -4,22 +4,15 @@ - - + - - - - - - - - - - - - + function toLoadJs(src) { + var js = document.createElement('script'); + js.src = src; + js.type = 'text/javascript' + document.getElementsByTagName('head')[0].appendChild(js); + } - + 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') + } else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') { + toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js') + } else { + toLoadJs('https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO') + toLoadJs('https://map.qq.com/api/gljs?v=1.exp&key=OB4BZ-D4W3U-B7VVO-4PJWW-6TKDJ-WPB77') + } + diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 709895d60..a2db96fa1 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -6,6 +6,9 @@ import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; import { clearLoginInfo } from "@/utils"; +axios.defaults.withCredentials=true +axios.defaults.crossDomain=true + const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { return new Promise((reslove) => { diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 709895d60..a2db96fa1 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -6,6 +6,9 @@ import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; import { clearLoginInfo } from "@/utils"; +axios.defaults.withCredentials=true +axios.defaults.crossDomain=true + const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { return new Promise((reslove) => { diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js index e6cf3a220..55dd0ce31 100644 --- a/src/utils/dai-map.js +++ b/src/utils/dai-map.js @@ -8,6 +8,20 @@ export const mapType = ? "td" : "tdzw"; +const urlSdtdt = (() => { + if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { + return { + search: "https://service.sdmap.gov.cn/search", + geo: "https://service.sdmap.gov.cn/geodecode", + }; + } else { + return { + search: "http://59.206.203.34/QueryService.ashx", + geo: "http://59.206.203.34/GeoDecodeService.ashx", + }; + } +})(); + export const QQMap = window.TMap; export const TDMap = window.T; @@ -87,8 +101,7 @@ export function searchNearby(map, keyword) { } else if (mapType == "tdzw") { return new Promise(async (reslove) => { const center = map.getCenter(); - // const url = "https://service.sdmap.gov.cn/search"; - const url = "http://59.206.203.34/QueryService.ashx"; + const url = urlSdtdt.search; const { status, result } = await requestGet(url, { area: `CIRCLE(${center.lon} ${center.lat} 1000000)`, words: keyword, @@ -345,8 +358,7 @@ export default function init(ele, position, params) { this.getAddress = async function (lat, lng) { return new Promise(async (reslove) => { - // const url = "https://service.sdmap.gov.cn/geodecode"; - const url = "http://59.206.203.34/GeoDecodeService.ashx"; + const url = urlSdtdt.geo; const { status, result } = await requestGet(url, { point: lng + "," + lat, type: "11", diff --git a/src/utils/request.js b/src/utils/request.js index 7de9ad4cb..202ef6183 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,6 +5,9 @@ import qs from 'qs' import { clearLoginInfo } from '@/utils' import isPlainObject from 'lodash/isPlainObject' +axios.defaults.withCredentials=true +axios.defaults.crossDomain=true + const http = axios.create({ baseURL: window.SITE_CONFIG['apiURL'], timeout: 1000 * 900, diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js index 297082e7f..a86ac0b34 100644 --- a/src/utils/tdt-wp-zw.js +++ b/src/utils/tdt-wp-zw.js @@ -1,5 +1,12 @@ export const baseUrl = "http://59.206.203.34/tileservice/SDPubMap"; +let vec = + "http://59.206.203.34/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={row}&TILECOL={col}&FORMAT=image%2Fpng"; +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"; +} + +// http://www.sdmap.gov.cn/tileservice/SDPubMap export default { - vec: "http://59.206.203.34/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={row}&TILECOL={col}&FORMAT=image%2Fpng", - // 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, };