Browse Source

代理改动

feature
dai 3 years ago
parent
commit
2266ec09be
  1. 2
      public/index.html
  2. 6
      src/utils/dai-map.js
  3. 6
      src/utils/tdt-wp-zw.js
  4. 5
      src/views/modules/visual/command/index.vue
  5. 33
      src/views/modules/workSys/mapConfig.vue

2
public/index.html

@ -39,7 +39,7 @@
if (SITE_CONFIG['nodeEnv'] == 'dev_tdt') { if (SITE_CONFIG['nodeEnv'] == 'dev_tdt') {
toLoadJs('http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926') toLoadJs('http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926')
} else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt') { } else if (SITE_CONFIG['nodeEnv'] == 'dev_sdtdt1') {
toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js') toLoadJs('http://www.sdmap.gov.cn/api/olapi/ol/openlayers.js')
} else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') { } else if (SITE_CONFIG['nodeEnv'] == 'yantai_zhengwu_prod') {
toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js') toLoadJs('http://59.206.203.34/api/olapi/ol/openlayers.js')

6
src/utils/dai-map.js

@ -16,7 +16,7 @@ const urlSdtdt = (() => {
}; };
} else { } else {
return { return {
search: "http://172.20.46.177/epmet-map-proxy/QueryService.ashx", search: "http://172.20.46.177/map_search_proxy/search",
geo: "http://172.20.46.177/epmet-map-proxy/GeoDecodeService.ashx", geo: "http://172.20.46.177/epmet-map-proxy/GeoDecodeService.ashx",
}; };
} }
@ -108,12 +108,12 @@ export function searchNearby(map, keyword) {
const center = map.getCenter(); const center = map.getCenter();
const url = urlSdtdt.search; const url = urlSdtdt.search;
const { status, result } = await requestGet(url, { const { status, result } = await requestGet(url, {
// area: `CIRCLE(${center.lon} ${center.lat} 1000000)`, area: `CIRCLE(${center.lon} ${center.lat} 1000000)`,
words: keyword, words: keyword,
city: "烟台", city: "烟台",
uid: "navinfo", uid: "navinfo",
st: "LocalSearch", st: "LocalSearch",
// tk: "e758167d5b90c351b70a979c0820840c", tk: "e758167d5b90c351b70a979c0820840c",
}); });
if ( if (

6
src/utils/tdt-wp-zw.js

@ -1,6 +1,8 @@
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={x}&TILECOL={y}&FORMAT=image%2Fpng";
let vec = 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={x}&TILECOL={y}&FORMAT=image%2Fpng"; "http://172.20.46.177/map_tile_proxy/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}";
if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") { if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
vec = 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://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";

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

@ -288,7 +288,10 @@ export default {
People, People,
cptCard, cptCard,
ScreenLoading, ScreenLoading,
gridMap: mapType == "tdzw" ? gridMapOl : gridMap, gridMap:
mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt"
? gridMapOl
: gridMap,
sidemenu1, sidemenu1,
sidemenu2, sidemenu2,
sidemenuLeft, sidemenuLeft,

33
src/views/modules/workSys/mapConfig.vue

@ -647,27 +647,27 @@ const vueGis = {
gaodeMapLayer = new TileLayer({ gaodeMapLayer = new TileLayer({
title: "地图", title: "地图",
source: new XYZ({
url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
}),
// source: new XYZ({ // source: new XYZ({
// url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}" // url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
// }), // }),
// source: new XYZ({ // source: new XYZ({
// //url // url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
// url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
// wrapX: true//xfalse
// }), // }),
source: new XYZ({
//url
url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
wrapX: true, //xfalse
}),
// zIndex: 20 // zIndex: 20
}); });
var sourceMark = new XYZ({ // var sourceMark = new XYZ({
url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}", // url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
// zIndex: 22 // // zIndex: 22
}); // });
var tileMark = new TileLayer({ // var tileMark = new TileLayer({
title: "标注图层", // title: "",
source: sourceMark, // source: sourceMark,
}); // });
(mapView = new View({ (mapView = new View({
// //
@ -680,7 +680,8 @@ const vueGis = {
//map //map
// //
(map = new Map({ (map = new Map({
layers: [gaodeMapLayer, tileMark], layers: [gaodeMapLayer],
// layers: [gaodeMapLayer, tileMark],
// //
view: mapView, view: mapView,
target: "map", target: "map",

Loading…
Cancel
Save