场站页面光伏类型去掉风速和风向，3D地图增加光伏坐标

neim-ui/src/views/largeScreenPage/Subpage/stationInfo.vue

@@ -28,7 +28,7 @@
 
             </div>
             <div class="mainContent">
-              <div class="contentBox">
+              <div class="contentBox" v-if="station.type === '风'">
                 <span class="numberBox">{{ item.wsAve }}</span>
                 <span class="textBox">平均风速<span class="numberBox" style="font-size: 14px">(m/s)</span></span>
               </div>
@@ -37,7 +37,7 @@
                 <span class="textBox">发电量<span class="numberBox" style="font-size: 14px">(MWh)</span></span>
 
               </div>
-              <div class="contentBox">
+              <div class="contentBox" v-if="station.type === '风'">
                 <span class="numberBox">{{ item.wdSum }}</span>
                 <span class="textBox">主风向</span>
               </div>
@@ -142,6 +142,7 @@ export default {
   },
   mounted() {
     this.station = JSON.parse(this.$store.getters.stationInfo)
+    console.log(this.station)
     this.formatTime()
     this.getPointMap()
     this.timer = setInterval(this.formatTime, 1000 * 60)

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

@@ -281,53 +281,31 @@ export default {
                 scale: 0.15
               },
             });
-            // 悬浮动作
-            // marker.on('mouseover', function (e) {
-            //   console.log(item)
-            // if (item.type === 'project') {
-            //   marker.bindTooltip('<div>测风塔名称：' + item.towerName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
-            //     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
-            // } else {
-            //   marker.bindTooltip('<div>测风塔名称：' + item.towerName + '</div>' + '<div>经度：' + item.longitude + '</div>' + '<div>纬度：' + item.latitude + '</div>',
-            //     {permanent: true, className: 'infoToolTip', offset: [0, -30]}).openTooltip();
-            // }
-
-            // })
-            // marker.on('mouseout', function () {
-            //   marker.bindTooltip().closeTooltip();
-            // })
-            // console.log(item.projectId)
-            // let projectId = item.projectId.find(w=>w.id===id)
-            // 点击动作
-            // marker.on('click', function (e) {
-            //   if(projectId !== undefined && projectId !== null){
-            //     if (projectId.type === 'project') {
-            //       let project = {projectId: id, equipmentNo: item.towerNo}
-            //       sessionStorage.setItem("emailWindTowerInfo", JSON.stringify(project))
-            //       _self.$store.dispatch('equipmentInfo/emailWindTowerInfo', JSON.stringify(project))
-            //       _self.$router.push({path: "/homepage/emailResourcesInfo"})
-            //     } else {
-            //       let station = {stationId: id, equipmentNo: item.towerNo}
-            //       sessionStorage.setItem("realWindTowerInfo", JSON.stringify(station))
-            //       _self.$store.dispatch('equipmentInfo/realWindTowerInfo', JSON.stringify(station))
-            //       _self.$router.push({path: "/homepage/realResourcesInfo"})
-            //     }
-            //   }else{
-            //     if (item.projectId[0].type === 'project') {
-            //       let project = {projectId: item.projectId[0].id, equipmentNo: item.towerNo}
-            //       sessionStorage.setItem("emailWindTowerInfo", JSON.stringify(project))
-            //       _self.$store.dispatch('equipmentInfo/emailWindTowerInfo', JSON.stringify(project))
-            //       _self.$router.push({path: "/homepage/emailResourcesInfo"})
-            //     } else {
-            //       let station = {stationId: item.projectId[0].id, equipmentNo: item.towerNo}
-            //       sessionStorage.setItem("realWindTowerInfo", JSON.stringify(station))
-            //       _self.$store.dispatch('equipmentInfo/realWindTowerInfo', JSON.stringify(station))
-            //       _self.$router.push({path: "/homepage/realResourcesInfo"})
-            //     }
-            //   }
-            // })
-
+          }
+          /*环境监测仪*/
+          for (let item of data.weather) {
+            let marker = viewer.entities.add({
+              position: bmgl.Cartesian3.fromDegrees(Number(item.longitude), Number(item.latitude)),
+              billboard: {
+                heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
+                image: '/largeScreenImg/huanjingjianceyi.png',
+                scale: 0.5
+              },
+            });
+          }
+          /*逆变器*/
 
+          for (let inverter of data.inverter) {
+            for (let item of inverter.data) {
+              let marker = viewer.entities.add({
+                position: bmgl.Cartesian3.fromDegrees(Number(item.longitude), Number(item.latitude)),
+                billboard: {
+                  heightReference: bmgl.HeightReference.CLAMP_TO_GROUND,
+                  image: '/largeScreenImg/nibianqi.png',
+                  scale: 0.5
+                },
+              });
+            }
           }
         }
       })