diff --git a/api/inspection/inspection.js b/api/inspection/inspection.js index b39e597..c01cbf8 100644 --- a/api/inspection/inspection.js +++ b/api/inspection/inspection.js @@ -119,4 +119,52 @@ export function listInspectionTaskDetails(_that,_data){ } }); }) +} +var x_PI = 3.14159265358979324 * 3000.0 / 180.0; +var PI = 3.1415926535897932384626; +var a = 6378245.0; +var ee = 0.00669342162296594323; + +function out_of_china(lng, lat) { + var lat = +lat; + var lng = +lng; + // 纬度3.86~53.55,经度73.66~135.05 + return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55); +} +function transformlat(lng, lat) { + var lat = +lat; + var lng = +lng; + var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng)); + ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0; + return ret +} +function transformlng(lng, lat) { + var lat = +lat; + var lng = +lng; + var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng)); + ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0; + return ret +} +export function wgs84togcj02(lng, lat) { + var lat = +lat; + var lng = +lng; + if (out_of_china(lng, lat)) { + return [lng, lat] + } else { + var dlat = transformlat(lng - 105.0, lat - 35.0); + var dlng = transformlng(lng - 105.0, lat - 35.0); + var radlat = lat / 180.0 * PI; + var magic = Math.sin(radlat); + magic = 1 - ee * magic * magic; + var sqrtmagic = Math.sqrt(magic); + dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI); + dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI); + var mglat = lat + dlat; + var mglng = lng + dlng; + return { lat: mglat, lng: mglng } + } } \ No newline at end of file diff --git a/conf/config.js b/conf/config.js index 9052a00..1c26f04 100644 --- a/conf/config.js +++ b/conf/config.js @@ -17,12 +17,12 @@ let baseUrl = '/'; // 腾讯地图Key, h5使用 let QQMapKey = ''; -let commonBaseUrl= 'https://shuimuwy.com/'; +let commonBaseUrl= 'http://demo.homecommunity.cn/'; // #ifndef H5 //服务器域名 小程序 或者 app 时 后端地址 //let baseUrl = 'http://demo.homecommunity.cn/'; -let baseUrl = 'https://shuimuwy.com/'; +let baseUrl = 'http://demo.homecommunity.cn/'; // #endif //app支付时这里需要填写支付秘钥 diff --git a/pages/excuteOneInspection/excuteOneInspection.vue b/pages/excuteOneInspection/excuteOneInspection.vue index 2313887..577ebe5 100644 --- a/pages/excuteOneInspection/excuteOneInspection.vue +++ b/pages/excuteOneInspection/excuteOneInspection.vue @@ -54,7 +54,8 @@ } from '../../lib/java110/utils/common.js'; import { queryDictInfo, - queryInspectionItemTitle + queryInspectionItemTitle, + wgs84togcj02 } from '../../api/inspection/inspection.js'; import { getCurrentCommunity, @@ -263,7 +264,8 @@ } else { this.description += (item.itemTitle + ':' + item.radio + ';') } - }) + }); + let {lat,lng} = wgs84togcj02(this.longitude,this.latitude) let obj = { "taskId": this.taskId, "taskDetailId": this.taskDetailId, @@ -275,8 +277,8 @@ "photos": this.photos, "userId": this.userId, "userName": this.userName, - "latitude": this.latitude, - "longitude": this.longitude + "latitude": lat, + "longitude": lng } let msg = "";