地图

neim-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -718,35 +718,10 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //测风塔List
         HashSet<Map<String, Object>> towerList = new HashSet<>();
         //拐点坐标List
-        ArrayList<Map<String,List<List<Coordinates>>>> coordinateList = new ArrayList<>();
+        ArrayList<Map<String, List<List<Coordinates>>>> coordinateList = new ArrayList<>();
         //风机List
         List<HashMap<String, Object>> fanList = new ArrayList<>();
         HashSet<String> eqNoList = new HashSet<>();
-        for (ProjectInfo projectInfo : projectInfoList) {
-            Map<String,List<List<Coordinates>>> cmap = new HashMap<>();
-            cmap.put(projectInfo.getProjectBasicInfo().getProjectNameEasy(),projectInfo.getCoordinates());
-            //拐点坐标
-            coordinateList.add(cmap);
-
-            if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
-                //循环测风塔信息
-                for (Equipment equipment : projectInfo.getEquipment()) {
-                    HashMap<String, Object> map = new HashMap<>();
-                    eqNoList.add(equipment.getEquipmentNo());
-                    map.put("type", "project");
-                    map.put("longitude", equipment.getLongitude());
-                    map.put("latitude", equipment.getLatitude());
-                    map.put("towerName", equipment.getName());
-                    map.put("towerNo", equipment.getEquipmentNo());
-                    map.put("projectId", projectInfo.getId());
-                    towerList.add(map);
-                }
-            }
-        }
-
-
-        dataMap.put("coordinatesList", coordinateList);
-
         for (StationInfo stationInfo : stationInfoList) {
             if (stationInfo.getEquipment() != null && stationInfo.getEquipment().size() > 0) {
                 //循环测风塔信息
@@ -768,13 +743,46 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
             for (Map.Entry<String, List<FanTower>> entry : collect.entrySet()) {
                 HashMap<String, Object> map = new HashMap<>();
                 List<FanTower> collect1 = stationInfo.getFanTowerList().stream().filter(w -> w.getFanModel().equals(entry.getKey())).collect(Collectors.toList());
-                map.put("type","station");
-                map.put("name",stationInfo.getStationBasicInfo().getStationName());
-                map.put("data",collect1);
+                map.put("type", "station");
+                map.put("name", stationInfo.getStationBasicInfo().getStationName());
+                map.put("data", collect1);
+                fanList.add(map);
+            }
+        }
+        for (ProjectInfo projectInfo : projectInfoList) {
+            Map<String, List<List<Coordinates>>> cmap = new HashMap<>();
+            cmap.put(projectInfo.getProjectBasicInfo().getProjectNameEasy(), projectInfo.getCoordinates());
+            //拐点坐标
+            coordinateList.add(cmap);
+
+            if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
+                //循环测风塔信息
+                for (Equipment equipment : projectInfo.getEquipment()) {
+                    HashMap<String, Object> map = new HashMap<>();
+                    eqNoList.add(equipment.getEquipmentNo());
+                    map.put("type", "project");
+                    map.put("longitude", equipment.getLongitude());
+                    map.put("latitude", equipment.getLatitude());
+                    map.put("towerName", equipment.getName());
+                    map.put("towerNo", equipment.getEquipmentNo());
+                    map.put("projectId", projectInfo.getId());
+                    towerList.add(map);
+                }
+            }
+            if (projectInfo.getFanTowerList() != null && projectInfo.getFanTowerList().size() > 0) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("type", "project");
+                map.put("name", projectInfo.getProjectBasicInfo().getProjectName());
+                map.put("data", projectInfo.getFanTowerList());
                 fanList.add(map);
             }
         }
 
+
+        dataMap.put("coordinatesList", coordinateList);
+
+
+
         List<Map<String, Object>> listMap = new ArrayList<>();
         //利用塔编号过滤分组项目以及场站的id
         for (String s : eqNoList) {
@@ -971,15 +979,16 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
             }
             //过滤塔信息
             StationInfo stationInfo = stationInfoList.get(0);
-            if (stationInfo.getEquipment() != null && stationInfo.getEquipment().size() > 0) {
-                dataMap.put("longitude", stationInfo.getEquipment().get(0).getLongitude());
-                dataMap.put("latitude", stationInfo.getEquipment().get(0).getLatitude());
-            }
-            if (stationInfo.getFanTowerList() != null && stationInfo.getFanTowerList().size() > 0) {
-                dataMap.put("longitude", stationInfo.getFanTowerList().get(0).getLongitudeFan());
-                dataMap.put("latitude", stationInfo.getFanTowerList().get(0).getLatitudeFan());
-            }
-
+//            if (stationInfo.getEquipment() != null && stationInfo.getEquipment().size() > 0) {
+//                dataMap.put("longitude", stationInfo.getEquipment().get(0).getLongitude());
+//                dataMap.put("latitude", stationInfo.getEquipment().get(0).getLatitude());
+//            }
+//            if (stationInfo.getFanTowerList() != null && stationInfo.getFanTowerList().size() > 0) {
+//                dataMap.put("longitude", stationInfo.getFanTowerList().get(0).getLongitudeFan());
+//                dataMap.put("latitude", stationInfo.getFanTowerList().get(0).getLatitudeFan());
+//            }
+            dataMap.put("longitude", stationInfo.getStationBasicInfo().getLongitude());
+            dataMap.put("latitude", stationInfo.getStationBasicInfo().getLatitude());
 
             dataMap.put("modelT", arrayList);
         }

neim-ui/src/views/largeScreenPage/components/bigeHeatMap.vue

@@ -118,7 +118,7 @@ export default {
        // var layer1=window.BM.tileLayer('bigemap.re-huafu')
         //var layer2=window.BM.tileLayer('bigemap.heatMapWs',{opacity:0.7});
         let heatmapid = 'bigemap.heatMapWs';
-        // let heatmapid = 'bigemap.btpi9bvl';
+        // let heatmapid = 'bigemap.900gyz4b';
         fetch(`${ip1}/tokens/v1?access_token=none`).then(function (response) {
           return response.json();
         }).then(function (body) {
@@ -454,19 +454,25 @@ export default {
                   icon: fj_icon[3].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else if(fan.name === '依兰鸡冠山四期200MW风电项目'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[2].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
               }else{
                 marker = window.BM.marker(coordinate, {
                   icon: fj_icon[i].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
               }
+
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>项目预设风机点位：</div>' +'<div>所属项目名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 } else {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>'+ '<div>机型：' + item.fanModel + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 }
 

neim-ui/src/views/largeScreenPage/components/bigeHeatSunMap.vue

@@ -436,19 +436,25 @@ export default {
                   icon: fj_icon[3].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else if(fan.name === '依兰鸡冠山四期200MW风电项目'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[2].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
               }else{
                 marker = window.BM.marker(coordinate, {
                   icon: fj_icon[i].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
               }
+
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>项目预设风机点位：</div>' +'<div>所属项目名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 } else {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>'+ '<div>机型：' + item.fanModel + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 }
 

neim-ui/src/views/largeScreenPage/components/bigeMap.vue

@@ -158,8 +158,10 @@ export default {
           window.geo2 = geo2;
           // console.log(geo2.getBounds())
           //限制拖动
-          this.bMap.setMaxBounds([[43.42301,124.174976],[53.561657,135.086264]]);
-          this.bMap.fitBounds([[43.42301,124.174976],[53.561657,135.086264]]);
+          this.bMap.setMaxBounds([[43.42301,122.574976],[53.561657,135.086264]]);
+          this.bMap.fitBounds([[43.42301,122.574976],[53.561657,135.086264]]);
+          // this.bMap.setMaxBounds(geo2.getBounds());
+          // this.bMap.fitBounds(geo2.getBounds());
 
           const layers = geo2.getLayers();
           for (const item of layers) {
@@ -412,6 +414,11 @@ export default {
                   icon: fj_icon[3].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else if(fan.name === '依兰鸡冠山四期200MW风电项目'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[2].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
               }else{
                 marker = window.BM.marker(coordinate, {
                   icon: fj_icon[i].icon,
@@ -422,7 +429,7 @@ export default {
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>项目预设风机点位：</div>' +'<div>所属项目名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 } else {
                   marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>'+ '<div>机型：' + item.fanModel + '</div>',

neim-ui/src/views/largeScreenPage/components/zaiXianBigeMap.vue

@@ -151,8 +151,8 @@ export default {
           }).addTo(this.bMap);
           window.geo2=geo2;
           //限制拖动
-          this.bMap.setMaxBounds([[43.42301,124.174976],[53.561657,135.086264]]);
-          this.bMap.fitBounds([[43.42301,124.174976],[53.561657,135.086264]]);
+          this.bMap.setMaxBounds([[43.42301,122.574976],[53.561657,135.086264]]);
+          this.bMap.fitBounds([[43.42301,122.574976],[53.561657,135.086264]]);
 
           const layers = geo2.getLayers();
           for (const item of layers) {
@@ -388,19 +388,25 @@ export default {
                   icon: fj_icon[3].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else if(fan.name === '依兰鸡冠山四期200MW风电项目'){
+                marker = window.BM.marker(coordinate, {
+                  icon: fj_icon[2].icon,
+                  riseOnHover: true
+                }).addTo(this.bMap);
               }else{
                 marker = window.BM.marker(coordinate, {
                   icon: fj_icon[i].icon,
                   riseOnHover: true
                 }).addTo(this.bMap);
               }
+
               marker.on('mouseover', function (e) {
                 // console.log(item)
                 if (fan.type === 'project') {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>项目预设风机点位：</div>' +'<div>所属项目名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 } else {
-                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>',
+                  marker.bindTooltip('<div>所属场站名称：' + fan.name + '</div>' + '<div>经度：' + item.longitudeFan + '</div>' + '<div>纬度：' + item.latitudeFan + '</div>'+ '<div>机型：' + item.fanModel + '</div>',
                     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
                 }