1111

nngkxxdp/src/main/resources/static/naxsb/js/mapCity.js

@@ -747,7 +747,7 @@ var mapVcAddress = {
   },
 };
 
-var cityMark = {
+var cityMark = conversion1({
   0: [
     {
       id: 0,
@@ -3032,9 +3032,9 @@ var cityMark = {
       },
     },
   ],
-};
+});
 
-var markDetail = {
+var markDetail = conversion1( {
   0: {
     latitude: "29.595602",
     longitude: "106.777981",
@@ -3115,9 +3115,9 @@ var markDetail = {
     latitude: "29.479751",
     longitude: "106.639465",
   },
-};
+});
 
-var marks = [
+var marks = conversion([
   {
     id: 0,
     latitude: "29.595602",
@@ -3373,7 +3373,7 @@ var marks = [
       padding: 5,
     },
   },
-];
+])
 var vrUrl = [
   "gyd",
   "xkz",
@@ -3398,52 +3398,97 @@ var vrUrl = [
 ];
 
 
-var qjzxData=[
+var qjzxData= conversion([
   {
-      id: 1,
-      title: '南岸区重庆经开区政务服务中心',
-      address: '南岸区天文街道广福大道12号行政服务中心B区2号楼',
-      latitude: "29.496217",
-      longitude: "106.644242",
-      tel: '62606718',
-      vrUrl: 'https://www.cqna.gov.cn/vr/dating3/tour.html'
+    id: 1,
+    title: '南岸区重庆经开区政务服务中心',
+    address: '南岸区天文街道广福大道12号行政服务中心B区2号楼',
+    latitude: "29.496217",
+    longitude: "106.644242",
+    tel: '62606718',
+    vrUrl: 'https://www.cqna.gov.cn/vr/dating3/tour.html'
   },
   {
-      id: 2,
-      title: '南岸区行政服务（南坪）中心',
-      address: '南岸区南坪西路上海城嘉发跨茂中心2楼',
-      latitude: "29.52874",
-      longitude: "106.562715",
-      tel: '62606738',
-      vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/dating_np/tour.html'
+    id: 2,
+    title: '南岸区行政服务（南坪）中心',
+    address: '南岸区南坪西路上海城嘉发跨茂中心2楼',
+    latitude: "29.52874",
+    longitude: "106.562715",
+    tel: '62606738',
+    vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/dating_np/tour.html'
   }
-]
-var fzxData=[
+])
+var fzxData= conversion([
   {
-      id: 1,
-      title: '重庆南岸区茶园车管所',
-      address: '重庆市茶园新区长生桥镇机电路22号',
-      tel: '(023)62827985',
-      latitude: "29.479751",
-      longitude: "106.639465"
+    id: 1,
+    title: '重庆南岸区茶园车管所',
+    address: '重庆市茶园新区长生桥镇机电路22号',
+    tel: '(023)62827985',
+    latitude: "29.479751",
+    longitude: "106.639465"
   },
   {
-      id: 2,
-      title: '南岸区行政服务中心不动产登记分中心',
-      address: '南岸区珊瑚路一号',
-      latitude: "29.526347",
-      longitude: "106.566766",
-      tel: '62986062',
-      vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/bdc/tour.html',
+    id: 2,
+    title: '南岸区行政服务中心不动产登记分中心',
+    address: '南岸区珊瑚路一号',
+    latitude: "29.526347",
+    longitude: "106.566766",
+    tel: '62986062',
+    vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/bdc/tour.html',
   },
   {
-      id: 3,
-      title: '南岸区行政服务中心税务分中心',
-      address: '南岸区南坪东路587号附4号',
-      latitude: "29.539969",
-      longitude: "106.583986",
-      tel: '62934881',
-      vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/swzx/tour.html',
+    id: 3,
+    title: '南岸区行政服务中心税务分中心',
+    address: '南岸区南坪东路587号附4号',
+    latitude: "29.539969",
+    longitude: "106.583986",
+    tel: '62934881',
+    vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/swzx/tour.html',
   }
-]
+])
+
+
+
+function conversion(data) {
+  return data.map(item => ({
+    ...item,
+    oldLatitude: item.latitude,
+    oldLongitude: item.longitude,
+    ...GCJ02ToBD09(item.latitude, item.longitude),
+  }))
+}
+
+function conversion1(data){
+  console.log("开始数据转换：", data)
+  var newObj = JSON.parse(JSON.stringify(data));
+  Object.keys(data).forEach(key => {
+    if (Array.isArray(newObj[key])){
+      newObj[key].forEach(child => {
+        const coordinate = GCJ02ToBD09(child.latitude, child.longitude)
+        child.oldLatitude = child.latitude
+        child.oldLongitude = child.longitude
+        child.latitude = coordinate.latitude
+        child.longitude = coordinate.longitude
+      })
+    } else {
+      const coordinate = GCJ02ToBD09(newObj[key].latitude, newObj[key].longitude)
+      newObj[key].oldLatitude = newObj[key].latitude
+      newObj[key].oldLongitude = newObj[key].longitude
+      newObj[key].latitude = coordinate.latitude
+      newObj[key].longitude = coordinate.longitude
+    }
+  })
+  return JSON.parse(JSON.stringify(newObj));
+}
 
+function GCJ02ToBD09(lat, lon) {
+  var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+  var z = Math.sqrt(lon * lon + lat * lat) + 0.00002 * Math.sin(lat * x_pi);
+  var theta = Math.atan2(lat, lon) + 0.000003 * Math.cos(lon * x_pi);
+  var bd_lon = z * Math.cos(theta) + 0.0065;
+  var bd_lat = z * Math.sin(theta) + 0.006;
+  return {
+    latitude: bd_lat + '',
+    longitude: bd_lon + ''
+  };
+}

nngkxxdp/src/main/resources/static/naxsb/mobile/zwfwMapMobile.html

@@ -26,7 +26,8 @@
     <script type="text/javascript"
         src="https://api.map.baidu.com/api?type=webgl&v=3.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
         </script>
-    <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapCity.js"></script>
+    <script src="../js/mapCity.js"></script>
+    <!-- <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapCity.js"></script> -->
     <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapPoint.js"></script>
     <style>
         * {
@@ -362,54 +363,6 @@
                         name: '村社便民服务站'
                     }
                 ],
-                qjzxData: [
-                    {
-                        id: 1,
-                        title: '南岸区重庆经开区政务服务中心',
-                        address: '南岸区天文街道广福大道12号行政服务中心B区2号楼',
-                        latitude: "29.496217",
-                        longitude: "106.644242",
-                        tel: '62606718',
-                        vrUrl: 'https://www.cqna.gov.cn/vr/dating3/tour.html'
-                    },
-                    {
-                        id: 2,
-                        title: '南岸区行政服务（南坪）中心',
-                        address: '南岸区南坪西路上海城嘉发跨茂中心2楼',
-                        latitude: "29.52874",
-                        longitude: "106.562715",
-                        tel: '62606738',
-                        vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/dating_np/tour.html'
-                    }
-                ],
-                fzxData: [
-                    {
-                        id: 1,
-                        title: '重庆南岸区茶园车管所',
-                        address: '重庆市茶园新区长生桥镇机电路22号',
-                        tel: '(023)62827985',
-                        latitude: "29.479751",
-                        longitude: "106.639465"
-                    },
-                    {
-                        id: 2,
-                        title: '南岸区行政服务中心不动产登记分中心',
-                        address: '南岸区珊瑚路一号',
-                        latitude: "29.526347",
-                        longitude: "106.566766",
-                        tel: '62986062',
-                        vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/bdc/tour.html',
-                    },
-                    {
-                        id: 3,
-                        title: '南岸区行政服务中心税务分中心',
-                        address: '南岸区南坪东路587号附4号',
-                        latitude: "29.539969",
-                        longitude: "106.583986",
-                        tel: '62934881',
-                        vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/swzx/tour.html',
-                    }
-                ],
                 prevformData: {},
                 formData: {},
                 districtLevelLists: [],
@@ -418,7 +371,10 @@
                 dialogVisible: false
             };
         },
-        created() { },
+        created() {
+            this.qjzxData = qjzxData;
+            this.fzxData = fzxData;
+        },
         mounted() {
             this.loadMap();
         },

nngkxxdp/src/main/resources/static/naxsb/qjt.html

@@ -730,7 +730,6 @@
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);
-                    console.log('tccrk')
                 }
                 if (child.material.name == 'tcc1') {
                     const div = document.createElement('div');
@@ -746,7 +745,6 @@
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);
-                    console.log('tcc1')
                 }
                 if (child.material.name == 'tcc') {
                     const div = document.createElement('div');
@@ -762,7 +760,6 @@
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);
-                    console.log('tcc2')
                 }
                 if (child.material.name == 'gongjiaoche') {
                     const div = document.createElement('div');
@@ -781,7 +778,6 @@
                     div.innerHTML = html;
                     let tag = new THREE.CSS2DObject(div);
                     child.add(tag);
-                    console.log('gjcz')
                 }
             }
             if (child.isMesh) {
@@ -793,7 +789,6 @@
                 child.material.transparent = true;
                 child.material.emissiveIntensity = 0.8;
                 if (child.name) {
-                    // console.log(child, 'child', child.name);
                     const div = document.createElement('div');
                     div.id = child.uuid;
                     div.style = 'color:red;';
@@ -893,22 +888,6 @@
                         _this.nowDiv.floorGuideShow4 = true;
                     });
                 }
-                // if (child.name == 'chekuchukou') {
-                //     // console.log(child, 'child', child.name);
-                //     const div = document.createElement('div');
-                //     div.id = child.uuid;
-                //     let html = '';
-                //     html += '<div style="font-size: 12px; width: 80px; text-align: center;">';
-                //     html += '<div class="building-text" style="background: #18A65A; margin-bottom: -2px;">';
-                //     html += '<span style="text-align: left;">停车场</span>';
-                //     html += '<span style="font-size: 10px; text-align: left;">所有车位：-</span>';
-                //     html += '<span style="font-size: 10px; text-align: left;">所有充电桩：-</span>';
-                //     html += '</div>';
-                //     html += '</div>';
-                //     div.innerHTML = html;
-                //     let tag = new THREE.CSS2DObject(div);
-                //     child.add(tag);
-                // }
             }
         });
         scene.add(obj.scene);
@@ -922,12 +901,6 @@
         obj.scene.position.sub(center);
 
         document.getElementById('loading').style.display = 'none';
-        // 公交详情加点事件
-        /*    setTimeout(() => {
-               document.getElementById('busDetails').addEventListener('click', function (event) {
-                   document.getElementById('transitTitPop').innerText = "true"
-               });
-           }, 300) */
 
         render();
     }, function (xhr) {

nngkxxdp/src/main/resources/static/naxsb/zwfwMap.html

@@ -25,7 +25,8 @@
     src="https://api.map.baidu.com/api?type=webgl&v=3.0&ak=7XivTux4H2e1ifKLjvEhxfuayDYxAluq">
     </script>
   <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/urljson.js"></script>
-  <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapCity.js"></script>
+  <script src="js/mapCity.js"></script>
+  <!-- <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapCity.js"></script> -->
   <script src="https://www.cqna.gov.cn/syygapi/naxsb/js/mapPoint.js"></script>
   <style>
     * {
@@ -589,54 +590,6 @@
         current: 0,
         districtLevelTotal: 0,
         map: {},
-        qjzxData: [
-          {
-            id: 1,
-            title: '南岸区重庆经开区政务服务中心',
-            address: '南岸区天文街道广福大道12号行政服务中心B区2号楼',
-            latitude: "29.496217",
-            longitude: "106.644242",
-            tel: '62606718',
-            vrUrl: 'https://www.cqna.gov.cn/vr/dating3/tour.html'
-          },
-          {
-            id: 2,
-            title: '南岸区行政服务（南坪）中心',
-            address: '南岸区南坪西路上海城嘉发跨茂中心2楼',
-            latitude: "29.52874",
-            longitude: "106.562715",
-            tel: '62606738',
-            vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/dating_np/tour.html'
-          }
-        ],
-        fzxData: [
-          {
-            id: 1,
-            title: '重庆南岸区茶园车管所',
-            address: '重庆市茶园新区长生桥镇机电路22号',
-            tel: '(023)62827985',
-            latitude: "29.479751",
-            longitude: "106.639465"
-          },
-          {
-            id: 2,
-            title: '南岸区行政服务中心不动产登记分中心',
-            address: '南岸区珊瑚路一号',
-            latitude: "29.526347",
-            longitude: "106.566766",
-            tel: '62986062',
-            vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/bdc/tour.html',
-          },
-          {
-            id: 3,
-            title: '南岸区行政服务中心税务分中心',
-            address: '南岸区南坪东路587号附4号',
-            latitude: "29.539969",
-            longitude: "106.583986",
-            tel: '62934881',
-            vrUrl: 'https://www.cqna.gov.cn/vr/jiedao/swzx/tour.html',
-          }
-        ],
         formData: {},
         startPlace: '',
         endPlace: '',
@@ -649,8 +602,12 @@
         endPanel: '',
       }
     },
-    created() { },
+    created() {
+      this.qjzxData = qjzxData;
+      this.fzxData = fzxData;
+    },
     mounted() {
+
       this.loadMap();
       this.bindEvents();
     },