迁移mine map

login/vue.config.js

@@ -10,6 +10,8 @@ const proxy = {
     // target: 'http://10.102.1.182:9000',
     // target: 'http://10.102.1.182:9100',
     target: 'http://106.120.201.126:14724',
+    // target: 'http://37.12.182.29:9000', // 济南
+
   },
   '/cdn': {
     target: 'http://127.0.0.1:3000',

wj-manage-web/public/index.html

@@ -22,22 +22,21 @@
             href="/cdn/libs/mapbox-gl-draw/mapbox-gl-draw.css"
             type="text/css"
     />
-    <link rel="stylesheet" href="//119.163.106.187:11080/minemapapi/v2.1.0/minemap.css">
-    <script src="//119.163.106.187:11080/minemapapi/v2.1.0/minemap.js"></script>
+    <link rel="stylesheet" href="//37.8.188.98:21009/minemapapi/v2.1.0/minemap.css">
+    <script src="//37.8.188.98:21009/minemapapi/v2.1.0/minemap.js"></script>
     <script>
         /**
          * 全局参数设置
          */
-        minemap.domainUrl = '//119.163.106.187:11080';
-        minemap.dataDomainUrl = '//119.163.106.187:11080';
-        minemap.serverDomainUrl = '//119.163.106.187:11080';
-        minemap.spriteUrl = '//119.163.106.187:11080/minemapapi/v2.1.0/sprite/sprite';
-        minemap.serviceUrl = '//119.163.106.187:11080/service/';
+        minemap.domainUrl = '//37.8.188.98:21009';
+        minemap.dataDomainUrl = '//37.8.188.98:21009';
+        minemap.serverDomainUrl = '//37.8.188.98:21009';
+        minemap.spriteUrl = '//37.8.188.98:21009/minemapapi/v2.1.0/sprite/sprite';
+        minemap.serviceUrl = '//37.8.188.98:21009/service/';
         /**
          * key、solution设置
          */
         minemap.key = 'fe874f67b89d4c0dab56780f8423324c';
-        minemap.solution = 12612;
     </script>
     <style>
         #app,

wj-manage-web/src/main.js

@@ -20,7 +20,8 @@ import 'element-ui/lib/theme-chalk/index.css';
 Vue.use(ElementUI, {
   size: 'small',
 })
-window.wsHost = (process.env.NODE_ENV==='development'?'10.102.1.182:9000':location.host)
+// window.wsHost = (process.env.NODE_ENV==='development'?'10.102.1.182:9000':location.host)
+window.wsHost = (process.env.NODE_ENV==='development'?'37.12.182.29:9000':location.host)
 // 暂时挂载到window 以支持项目之前的ELEMENT.Message写法
 window.ELEMENT = ElementUI
 // 事件总线

wj-manage-web/src/utils/map/mapUtilsV2.js

@@ -418,7 +418,7 @@ export default {
 	  	var offset = offset ? offset : [0, 0];
 		var className = className ? className :'';
 	  	var popup = new mapboxgl.Popup({ closeOnClick: false, offset: offset,className:className})
-	  		.setLngLat([lng, lat])
+	  		.setLngLat(wgs84togcj02(lng, lat))
 	  		.setHTML(html)
 	  		.addTo(map);
 	  	var obj = {

wj-manage-web/src/utils/mapUtils.js

@@ -5,8 +5,8 @@ const ee = 0.00669342162296594323
 export function initWMap(id,center,zoom) {
     let map = new minemap.Map({
         container: id,
-        // style: '//119.163.106.187:11080/service/solu/style/id/12612', /*白色底图样式*/
-        style: '//119.163.106.187:11080/service/solu/style/id/12620', /*蓝色底图样式*/
+        // style: '//37.8.188.98:21009/service/solu/style/id/16976', /*白色底图样式*/
+        style: '//37.8.188.98:21009/service/solu/style/id/16980', /*蓝色底图样式*/
         center: center || map_config.MAP_CENTER,
         zoom:  zoom || map_config.MAP_ZOOM,
         pitch: map_config.MAP_PITCH,

wj-manage-web/src/views/situation/index.vue

@@ -305,7 +305,7 @@ export default {
         offset: [0, 0],
       });
       popup
-          .setLngLat([item.lng, item.lat])
+          .setLngLat(wgs84togcj02([item.lng, item.lat]))
           .setHTML('<div id="alarm_popup"></div>')
           .addTo(map)
           .addClassName("alarmPopup");
@@ -781,7 +781,7 @@ export default {
         offset: [0, -30],
       });
       eventPopup
-          .setLngLat([data.lng, data.lat])
+          .setLngLat(wgs84togcj02(data.lng, data.lat))
           .setHTML('<div id="event_popup"></div>')
           .addTo(map)
           .addClassName("eventPopup");
@@ -1028,7 +1028,7 @@ export default {
           offset: [0, -20],
         });
         vehiclePopups[`popup${data.id}`]
-            .setLngLat([data.longitude, data.latitude])
+            .setLngLat(wgs84togcj02(data.longitude, data.latitude))
             .setHTML(`<div id="vehicle_popup${data.id}"></div>`)
             .addTo(map)
             .addClassName("vehicleDetailPopup");
@@ -1063,6 +1063,10 @@ export default {
       }
       // 筛选可见区域
       for (let i = 0; i < msg.length; i++) {
+        // 坐标转换
+        let trans = wgs84togcj02([msg[i].longitude,msg[i].latitude])
+        msg[i].longitude = trans[0]
+        msg[i].latitude = trans[1]
         // todo
         // if (!this.showHisVid) msg[i].overRun = null
         // 缺失车牌号字段和非机动车类型 把车牌号字段置空

wj-manage-web/src/views/situation/trackSwitcher.vue

@@ -186,6 +186,7 @@ protobuf.load("../wj-manage-web/RealtimeCarInfo.proto", (event, root) => {
 import { allTrack } from "../../dao/historyTrack";
 import { equip_camera } from "../../dao/situation";
 import LoopVideo from "../../components/Standard/loopVideo.vue";
+import {wgs84togcj02} from "../../utils/mapboxTools";
 export default {
   name: "trackSwitcher",
   components: { LoopVideo },
@@ -769,7 +770,7 @@ export default {
             ...data,
           };
         } else {
-          vehiclePopups[`popup${data.id}`] = new mapboxgl.Popup({
+          vehiclePopups[`popup${data.id}`] = new minemap.Popup({
             closeButton: true,
             anchor: "bottom",
           });
@@ -779,7 +780,7 @@ export default {
             delete vehiclePopups[`popup${data.id}`];
           });
           vehiclePopups[`popup${data.id}`]
-            .setLngLat([data.longitude, data.latitude])
+            .setLngLat(wgs84togcj02([data.longitude, data.latitude]))
             .setHTML(`<div id="vehicle_popup${data.id}"></div>`)
             .addTo(window.map)
             .addClassName("vehicleDetailPopup");

wj-manage-web/vue.config.js

@@ -7,7 +7,8 @@ const proxy = {
   '/sso|/design|/develop|/group1|/holo|/web|/opt': {
     // target: 'http://10.102.1.182:9000',
     // target: 'http://10.102.1.181:9000',
-    target: 'http://106.120.201.126:14724',
+    // target: 'http://106.120.201.126:14724', // 182外网
+    target: 'http://37.12.182.29:9000', // 济南
   },
   '/nvr': {
     target: 'http://10.100.1.154:19830', // 回放视频