no message

webConfig/src/views/GISMap.vue

@@ -3784,9 +3784,11 @@
                     }else{
                         this_.mapTCtype = 'Satellite'
                     }
+                    // console.log()
+                    let mapType = this_.map.getMapTypeId()
                     for(let d of data){
                         if(!isTrue){
-                            let decrypt =  this_.bd_decrypt(d.longitude,d.latitude);
+                            let decrypt =  this_.bd_decrypt(d.longitude,d.latitude,mapType == 'roadmap');
                             d.longitude = decrypt.lng;
                             d.latitude = decrypt.lat;
                         }
@@ -4539,33 +4541,63 @@
                 window.open('#/'+type);
             },
             //百度坐标转高德（传入经度、纬度）
-            bd_decrypt(bd_lng, bd_lat) {
-                // var X_PI = Math.PI * 3000.0 / 180.0;
-                // var x = bd_lng - 0.0065;
-                // var y = bd_lat - 0.006;
-                // var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * X_PI);
-                // var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * X_PI);
-                // var gg_lng = z * Math.cos(theta);
-                // var gg_lat = z * Math.sin(theta);
-                // return {lng: gg_lng, lat: gg_lat}
-                return {lng: bd_lng, lat: bd_lat}
+            bd_decrypt(lng, lat,isGcj02) {
+
+                var PI = 3.1415926535897932384626;
+                var a = 6378245.0;
+                var ee = 0.00669342162296594323;
+                function out_of_china(lng, lat) {
+                    return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+                }
+                if (out_of_china(lng, lat)&&isGcj02) {
+                    return {lng: lng, lat: lat}
+                }
+                else {
+                    var dlat = this.transformlat(lng - 105.0, lat - 35.0);
+                    var dlng = this.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 = Number(lat) + Number(dlat);
+                    var mglng = Number(lng) + Number(dlng);
+                    return {lng: mglng, lat: mglat}
+                }
             },
             //高德坐标转百度（传入经度、纬度）
-            bd_encrypt(gg_lng, gg_lat) {
-                // var X_PI = Math.PI * 3000.0 / 180.0;
-                // var x = gg_lng, y = gg_lat;
-                // var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
-                // var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
-                // var bd_lng = z * Math.cos(theta) + 0.0065;
-                // var bd_lat = z * Math.sin(theta) + 0.006;
-                // return {
-                //     bd_lat: bd_lat,
-                //     bd_lng: bd_lng
-                // };
-                return {
-                    bd_lat: gg_lat,
-                    bd_lng: gg_lng
-                };
+            bd_encrypt(lng, lat,isGcj02) {
+                var PI = 3.1415926535897932384626;
+                var a = 6378245.0;
+                var ee = 0.00669342162296594323;
+                function out_of_china(lng, lat) {
+                    return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+                    // return false;
+                }
+                if (out_of_china(lng, lat)&&isGcj02) {
+                    return {
+                        bd_lat: lat,
+                        bd_lng: lng
+                    };
+                }
+                else {
+                    var dlat = this.transformlat(lng - 105.0, lat - 35.0);
+                    var dlng = this.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 = Number(lat) + Number(dlat);
+                    var mglng = Number(lng) + Number(dlng);
+                    // return [lng * 2 - mglng, lat * 2 - mglat]
+                    return {
+                        bd_lat: lat * 2 - mglat,
+                        bd_lng: lng * 2 - mglng
+                    };
+                }
             },
             wgs84togcj02(lng, lat) {
                 // var x_PI = 3.14159265358979324 * 3000.0 / 180.0;

webConfig/src/views/projectManagement.vue

@@ -5047,33 +5047,63 @@
                 return h+':'+m;
             },
             //百度坐标转高德（传入经度、纬度）
-            bd_decrypt(bd_lng, bd_lat) {
-                // var X_PI = Math.PI * 3000.0 / 180.0;
-                // var x = bd_lng - 0.0065;
-                // var y = bd_lat - 0.006;
-                // var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * X_PI);
-                // var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * X_PI);
-                // var gg_lng = z * Math.cos(theta);
-                // var gg_lat = z * Math.sin(theta);
-                // return {lng: gg_lng, lat: gg_lat}
-                return {lng: bd_lng, lat: bd_lat}
+            bd_decrypt(lng, lat,isGcj02) {
+
+                var PI = 3.1415926535897932384626;
+                var a = 6378245.0;
+                var ee = 0.00669342162296594323;
+                function out_of_china(lng, lat) {
+                    return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+                }
+                if (out_of_china(lng, lat)&&isGcj02) {
+                    return {lng: lng, lat: lat}
+                }
+                else {
+                    var dlat = this.transformlat(lng - 105.0, lat - 35.0);
+                    var dlng = this.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 = Number(lat) + Number(dlat);
+                    var mglng = Number(lng) + Number(dlng);
+                    return {lng: mglng, lat: mglat}
+                }
             },
             //高德坐标转百度（传入经度、纬度）
-            bd_encrypt(gg_lng, gg_lat) {
-                // var X_PI = Math.PI * 3000.0 / 180.0;
-                // var x = gg_lng, y = gg_lat;
-                // var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * X_PI);
-                // var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * X_PI);
-                // var bd_lng = z * Math.cos(theta) + 0.0065;
-                // var bd_lat = z * Math.sin(theta) + 0.006;
-                // return {
-                //     bd_lat: bd_lat,
-                //     bd_lng: bd_lng
-                // };
-                return {
-                    bd_lat: gg_lat,
-                    bd_lng: gg_lng
-                };
+            bd_encrypt(lng, lat,isGcj02) {
+                var PI = 3.1415926535897932384626;
+                var a = 6378245.0;
+                var ee = 0.00669342162296594323;
+                function out_of_china(lng, lat) {
+                    return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+                    // return false;
+                }
+                if (out_of_china(lng, lat)&&isGcj02) {
+                    return {
+                        bd_lat: lat,
+                        bd_lng: lng
+                    };
+                }
+                else {
+                    var dlat = this.transformlat(lng - 105.0, lat - 35.0);
+                    var dlng = this.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 = Number(lat) + Number(dlat);
+                    var mglng = Number(lng) + Number(dlng);
+                    // return [lng * 2 - mglng, lat * 2 - mglat]
+                    return {
+                        bd_lat: lat * 2 - mglat,
+                        bd_lng: lng * 2 - mglng
+                    };
+                }
             },
             wgs84togcj02(lng, lat) {
                 // var x_PI = 3.14159265358979324 * 3000.0 / 180.0;