diff --git a/src/main.js b/src/main.js index a9ef9ac09..f5f3634b1 100644 --- a/src/main.js +++ b/src/main.js @@ -32,10 +32,6 @@ import store from "@/js/store"; import util from "@js/util"; // import Cookies from "js-cookie"; import getQueryPara from "dai-js/modules/getQueryPara"; -import tiandi2qq from "@/utils/tiandi2qq"; - -// 天地图转qq模式 -tiandi2qq(); // 兼容token传参登录 if (getQueryPara("token")) { diff --git a/src/utils/dai-map.js b/src/utils/dai-map.js new file mode 100644 index 000000000..342ba3a56 --- /dev/null +++ b/src/utils/dai-map.js @@ -0,0 +1,33 @@ + +export default function init() { + this.mapType = typeof window.TMap!=='undefined' ? 'qq' : 'tiandi' + window.TMap = T; + console.log("天地图", T); + window.TMap = {}; + window.TMap.Map = function (ele, paramas) { + let tmap = new T.Map(ele, paramas); + if (typeof ele == "string") { + ele = document.getElementById("app"); + } + let width = ele.offsetWidth; + let height = ele.offsetHeight; + if (height == 0) { + ele.style.height = width * 0.6 + "px"; + } + Object.keys(tmap).forEach((ki) => { + this[ki] = tmap[ki]; + }); + return this; + }; + window.TMap.service = { + Search: T.LocalSearch, + Geocoder: T.Geocoder, + }; + window.TMap.MultiMarker = function () {}; + window.TMap.LatLng = function (lat, lng) { + return { + lat, + lng, + }; + }; +} diff --git a/src/utils/tiandi2qq.js b/src/utils/tiandi2qq.js deleted file mode 100644 index 92756cc05..000000000 --- a/src/utils/tiandi2qq.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * 邮箱 - * @param {*} s - */ -export default function init() { - window.TMap = { - Map: T.Map, - service: { - Search: T.LocalSearch, - Geocoder: T.Geocoder, - }, - MultiMarker() {}, - LatLng(lat, lng) { - return { - lat, - lng, - }; - }, - }; -} diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index eeee6da0d..a80d53040 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -640,20 +640,20 @@ export default { rotation: 45, // 设置地图旋转角度 }); - // search = new window.TMap.service.Search({ pageSize: 10 }); - // // 新建一个地点搜索类 - // markers = new TMap.MultiMarker({ - // map: map, - // geometries: [], - // }); - // infoWindowList = Array(10); + search = new window.TMap.service.Search(map, { pageSize: 10 }); + // 新建一个地点搜索类 + markers = new TMap.MultiMarker({ + map: map, + geometries: [], + }); + infoWindowList = Array(10); - // geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 + geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 - // // 监听地图平移结束 - // map.on("panend", (e) => { - // this.handleMoveCenter(item, e); - // }); + // 监听地图平移结束 + map.on("panend", (e) => { + this.handleMoveCenter(item, e); + }); // this.handleMoveCenter(item); },