地图图标更改

neim-biz/src/main/java/com/jiayue/biz/domain/FanTower.java

@@ -20,5 +20,7 @@ public class FanTower {
     private String FanModel;
     //轮毂高度
     private String hubHeight;
+    //风机类型，是新风机还是老风机
+    private String type;
 
 }

neim-biz/src/main/java/com/jiayue/biz/dto/FanTowerDto.java

@@ -26,5 +26,7 @@ public class FanTowerDto {
     private String FanModel;
     //轮毂高度
     private String hubHeight;
+    //类型
+    private String type;
 
 }

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

@@ -177,6 +177,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
         fanTowerDto.setLatitudeFan(fanTower.getLatitudeFan());
         fanTowerDto.setLongitudeFan(fanTower.getLongitudeFan());
         fanTowerDto.setHubHeight(fanTower.getHubHeight());
+        fanTowerDto.setType(fanTower.getType());
     }
 
     //重组组风机信息
@@ -187,6 +188,7 @@ public class FengJiInfoServiceImpl extends ServiceImpl<WindTowerDataParentTableM
         fanTower.setLatitudeFan(fanTowerDto.getLatitudeFan());
         fanTower.setLongitudeFan(fanTowerDto.getLongitudeFan());
         fanTower.setHubHeight(fanTowerDto.getHubHeight());
+        fanTower.setType(fanTowerDto.getType());
     }
 
 

neim-ui/src/views/dataQuery/electrucStation/index.vue

@@ -419,8 +419,8 @@ export default {
     // },
     getPoint(){
       getPointMap().then(res => {
-        sessionStorage.setItem("allPointInfo", JSON.stringify({info: this.allPointInfo}))
-        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: this.allPointInfo}))
+        sessionStorage.setItem("allPointInfo", JSON.stringify({info: res.data}))
+        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: res.data}))
       }).catch(err => {
         console.log('所有点位坐标：' + err)
       })

neim-ui/src/views/dataQuery/fengjiInfo/index.vue

@@ -187,6 +187,20 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="12">
+              <el-form-item label="风机类型" prop="type">
+                <el-select v-model="form.type" placeholder="请选择" style="width: 100%" clearable>
+                  <el-option
+                    v-for="item in fenJiTypeOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -319,6 +333,7 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
+      fenJiTypeOption:[{value:'新',label:'新型风机'},{value:'旧',label:'旧风机'}]
     }
   },
   mounted() {
@@ -390,7 +405,8 @@ export default {
         longitudeFan:row.longitudeFan,
         latitudeFan:row.latitudeFan,
         fanModel:row.fanModel,
-        hubHeight:row.hubHeight
+        hubHeight:row.hubHeight,
+        type:row.type
       }
       this.stationFanOpen = true
     },
@@ -400,7 +416,6 @@ export default {
         if (valid) {
           if(this.saveFlag === 'add'){
             this.form.id = this.stationOption.find(w=>w.name === this.form.name).id
-            console.log(this.form)
             saveFanTowerForStationInfo(this.form).then(res=>{
               this.getFanTowerForStation()
               this.stationFanOpen = false
@@ -538,7 +553,8 @@ export default {
         longitudeFan:null,
         latitudeFan:null,
         fanModel:null,
-        hubHeight:null
+        hubHeight:null,
+        type:null
       }
     },
     resetProjectFanForm(){
@@ -572,8 +588,8 @@ export default {
     },
     getPoint(){
       getPointMap().then(res => {
-        sessionStorage.setItem("allPointInfo", JSON.stringify({info: this.allPointInfo}))
-        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: this.allPointInfo}))
+        sessionStorage.setItem("allPointInfo", JSON.stringify({info:  res.data}))
+        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info:  res.data}))
       }).catch(err => {
         console.log('所有点位坐标：' + err)
       })

neim-ui/src/views/dataQuery/project/index.vue

@@ -446,8 +446,8 @@ export default {
     // },
     getPoint(){
       getPointMap().then(res => {
-        sessionStorage.setItem("allPointInfo", JSON.stringify({info: this.allPointInfo}))
-        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: this.allPointInfo}))
+        sessionStorage.setItem("allPointInfo", JSON.stringify({info: res.data}))
+        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: res.data}))
       }).catch(err => {
         console.log('所有点位坐标：' + err)
       })

neim-ui/src/views/dataQuery/windTowerStatusInfo/index.vue

@@ -671,8 +671,8 @@ export default {
     },
     getPoint(){
       getPointMap().then(res => {
-        sessionStorage.setItem("allPointInfo", JSON.stringify({info: this.allPointInfo}))
-        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: this.allPointInfo}))
+        sessionStorage.setItem("allPointInfo", JSON.stringify({info: res.data}))
+        this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: res.data}))
       }).catch(err => {
         console.log('所有点位坐标：' + err)
       })

neim-ui/src/views/largeScreenPage/components/3DbigeMap.vue

@@ -183,21 +183,24 @@ export default {
         // 渲染所有风机、塔、拐点标记点位
         // console.log(this.mapData.allPointInfo)
         if (this.mapData.allPointInfo !== null && this.mapData.allPointInfo !== undefined) {
+          let defaultImage = {
+            heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
+            image: '/img/fengji.png',
+            scale: 0.6
+          }
+          let blueImage = {
+            heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
+            image: '/img/fengji/fengjiblue.png',
+            scale: 0.2
+          }
+          let redImage = {
+            heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
+            image: '/img/fengji/fengjired.png',
+            scale: 0.2
+          }
           let image = [{
             billboard: {
               heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
-              image: '/img/fengji.png',
-              scale: 0.6
-            }
-          }, {
-            billboard: {
-              heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
-              image: '/img/fengji/fengjiblue.png',
-              scale: 0.2
-            }
-          }, {
-            billboard: {
-              heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
               image: '/img/fengji/fengjigreen.png',
               scale: 0.2
             }
@@ -211,18 +214,32 @@ export default {
           let data = this.mapData.allPointInfo
           let i = 0
           for (let fan of data.fan) {
-            if (i > 3) i = 0
+            if (i > 1) i = 0
             for (let item of fan.data) {
-              if (fan.name === '依兰珠山风电场') {
-                viewer.entities.add({
-                  position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
-                  billboard: image[3].billboard
-                });
-              } else {
+              if(fan.type === 'project'){
                 viewer.entities.add({
                   position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
-                  billboard: image[i].billboard
+                  billboard: redImage
                 });
+              }else {
+                if (item.type !== null) {
+                  if (item.type === '新') {
+                    viewer.entities.add({
+                      position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
+                      billboard: defaultImage
+                    });
+                  } else {
+                    viewer.entities.add({
+                      position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
+                      billboard: blueImage
+                    });
+                  }
+                } else {
+                  viewer.entities.add({
+                    position: bmgl.Cartesian3.fromDegrees(Number(item.longitudeFan), Number(item.latitudeFan)),
+                    billboard: image[i].billboard
+                  });
+                }
               }
             }
             i++;

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

@@ -242,6 +242,7 @@ export default {
         let fengjiblue = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiblue.png'
         let fengjigreen = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjigreen.png'
         let fengjiyellow = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiyellow.png'
+        let fengjired = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjired.png'
         let iconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huanjingjianceyi.png'
         let nIconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/nibianqi.png'
         // 所有场站标记点位
@@ -428,22 +429,26 @@ export default {
             iconAnchor: [35, 55],
             className: 'stationIcon',
           })
+          let redFengji = window.BM.icon({
+            iconUrl: fengjired,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let bluefengji = window.BM.icon({
+            iconUrl: fengjiblue,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let defaultFengji = window.BM.icon({
+            iconUrl: fjIconurl,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
           let fj_icon = [{
             icon: window.BM.icon({
-              iconUrl: fjIconurl,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
-              iconUrl: fengjiblue,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
               iconUrl: fengjigreen,
               iconSize: [30, 30],
               iconAnchor: [30, 30],
@@ -499,29 +504,40 @@ export default {
               })
             }
           }
+
           let i = 0
           for (let fan of data.fan) {
-            if (i > 3) i = 0
+            if (i > 1) i = 0
+
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
               let marker = ''
-              if (fan.name === '依兰珠山风电场') {
+              if(fan.type === 'project'){
                 marker = window.BM.marker(coordinate, {
-                  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,
+                  icon: redFengji,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else {
+                if (item.type !== null) {
+                  if (item.type === '新') {
+                    marker = window.BM.marker(coordinate, {
+                      icon: defaultFengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  } else {
+                    marker = window.BM.marker(coordinate, {
+                      icon: bluefengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  }
+                } else {
+                  // console.log(i)
+                  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') {

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

@@ -237,6 +237,7 @@ export default {
         let fengjiblue = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiblue.png'
         let fengjigreen = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjigreen.png'
         let fengjiyellow = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiyellow.png'
+        let fengjired = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjired.png'
         let iconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huanjingjianceyi.png'
         let nIconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/nibianqi.png'
         // 所有场站标记点位
@@ -410,22 +411,26 @@ export default {
             iconAnchor: [35, 55],
             className: 'stationIcon',
           })
+          let redFengji = window.BM.icon({
+            iconUrl: fengjired,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let bluefengji = window.BM.icon({
+            iconUrl: fengjiblue,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let defaultFengji = window.BM.icon({
+            iconUrl: fjIconurl,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
           let fj_icon = [{
             icon: window.BM.icon({
-              iconUrl: fjIconurl,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
-              iconUrl: fengjiblue,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
               iconUrl: fengjigreen,
               iconSize: [30, 30],
               iconAnchor: [30, 30],
@@ -481,29 +486,40 @@ export default {
               })
             }
           }
+
           let i = 0
           for (let fan of data.fan) {
-            if (i > 3) i = 0
+            if (i > 1) i = 0
+
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
               let marker = ''
-              if (fan.name === '依兰珠山风电场') {
+              if(fan.type === 'project'){
                 marker = window.BM.marker(coordinate, {
-                  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,
+                  icon: redFengji,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else {
+                if (item.type !== null) {
+                  if (item.type === '新') {
+                    marker = window.BM.marker(coordinate, {
+                      icon: defaultFengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  } else {
+                    marker = window.BM.marker(coordinate, {
+                      icon: bluefengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  }
+                } else {
+                  // console.log(i)
+                  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') {

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

@@ -197,6 +197,7 @@ export default {
         let fengjiblue = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiblue.png'
         let fengjigreen = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjigreen.png'
         let fengjiyellow = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiyellow.png'
+        let fengjired = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjired.png'
         let gfbconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guangfuban.png'
         let gfsconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/guang.png'
         let gfhfconurl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huafuguangfu.png'
@@ -386,22 +387,26 @@ export default {
             iconAnchor: [35, 55],
             className: 'stationIcon',
           })
+          let redFengji = window.BM.icon({
+            iconUrl: fengjired,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let bluefengji = window.BM.icon({
+            iconUrl: fengjiblue,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let defaultFengji = window.BM.icon({
+            iconUrl: fjIconurl,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
           let fj_icon = [{
             icon: window.BM.icon({
-              iconUrl: fjIconurl,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
-              iconUrl: fengjiblue,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
               iconUrl: fengjigreen,
               iconSize: [30, 30],
               iconAnchor: [30, 30],
@@ -457,29 +462,40 @@ export default {
               })
             }
           }
+
           let i = 0
           for (let fan of data.fan) {
-            if (i > 3) i = 0
+            if (i > 1) i = 0
+
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
               let marker = ''
-              if (fan.name === '依兰珠山风电场') {
+              if(fan.type === 'project'){
                 marker = window.BM.marker(coordinate, {
-                  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,
+                  icon: redFengji,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else {
+                if (item.type !== null) {
+                  if (item.type === '新') {
+                    marker = window.BM.marker(coordinate, {
+                      icon: defaultFengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  } else {
+                    marker = window.BM.marker(coordinate, {
+                      icon: bluefengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  }
+                } else {
+                  // console.log(i)
+                  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') {

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

@@ -189,6 +189,7 @@ export default {
         let fengjiblue = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiblue.png'
         let fengjigreen = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjigreen.png'
         let fengjiyellow = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjiyellow.png'
+        let fengjired = 'http://' + _self.href.split("//")[1].split("/")[0] + '/img/fengji/fengjired.png'
         let iconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/huanjingjianceyi.png'
         let nIconUrl = 'http://' + _self.href.split("//")[1].split("/")[0] + '/largeScreenImg/nibianqi.png'
         // 所有场站标记点位
@@ -362,22 +363,26 @@ export default {
             iconAnchor: [35, 55],
             className: 'stationIcon',
           })
+          let redFengji = window.BM.icon({
+            iconUrl: fengjired,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let bluefengji = window.BM.icon({
+            iconUrl: fengjiblue,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
+          let defaultFengji = window.BM.icon({
+            iconUrl: fjIconurl,
+            iconSize: [30, 30],
+            iconAnchor: [30, 30],
+            className: 'stationIcon',
+          })
           let fj_icon = [{
             icon: window.BM.icon({
-              iconUrl: fjIconurl,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
-              iconUrl: fengjiblue,
-              iconSize: [30, 30],
-              iconAnchor: [30, 30],
-              className: 'stationIcon',
-            })
-          }, {
-            icon: window.BM.icon({
               iconUrl: fengjigreen,
               iconSize: [30, 30],
               iconAnchor: [30, 30],
@@ -433,29 +438,40 @@ export default {
               })
             }
           }
+
           let i = 0
           for (let fan of data.fan) {
-            if (i > 3) i = 0
+            if (i > 1) i = 0
+
             for (let item of fan.data) {
               let coordinate = [Number(item.latitudeFan), Number(item.longitudeFan)]
               let marker = ''
-              if (fan.name === '依兰珠山风电场') {
+              if(fan.type === 'project'){
                 marker = window.BM.marker(coordinate, {
-                  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,
+                  icon: redFengji,
                   riseOnHover: true
                 }).addTo(this.bMap);
+              }else {
+                if (item.type !== null) {
+                  if (item.type === '新') {
+                    marker = window.BM.marker(coordinate, {
+                      icon: defaultFengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  } else {
+                    marker = window.BM.marker(coordinate, {
+                      icon: bluefengji,
+                      riseOnHover: true
+                    }).addTo(this.bMap);
+                  }
+                } else {
+                  // console.log(i)
+                  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') {