后台对接

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

@@ -90,7 +90,7 @@ public class Equipment {
     private String displayHeight;
 
     /**
-     *测风塔附属于
+     *测风塔的来源 email=>邮件塔  modbus=>实时塔
      */
     private String type;
 

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

@@ -8,4 +8,8 @@ public class EquipmentDto {
     private String value;
     // 风向层高
     private String wdHeight;
+    /**
+     *测风塔的来源 email=>邮件塔  modbus=>实时塔
+     */
+    private String type;
 }

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

@@ -842,6 +842,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                         equipmentDto.setLabel(equipment.getName());
                         equipmentDto.setValue(equipment.getEquipmentNo());
                         equipmentDto.setWdHeight(equipment.getWdHeights());
+                        equipmentDto.setType(equipment.getType());
                         equipmentDtoList.add(equipmentDto);
                     }
                     selectLabForVal.setEquipmentDto(equipmentDtoList);
@@ -1017,6 +1018,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                         equipmentDto.setLabel(equipment.getName());
                         equipmentDto.setValue(equipment.getEquipmentNo());
                         equipmentDto.setWdHeight(equipment.getWdHeights());
+                        equipmentDto.setType(equipment.getType());
                         equipmentDtoList.add(equipmentDto);
                     }
                     selectLabForVal.setEquipmentDto(equipmentDtoList);

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

@@ -204,6 +204,7 @@
 </template>
 
 <script>
+import {selectTForAir} from "@/api/biz/dataQuery/homePage";
 import {projectSelect} from "@/api/biz/dataQuery/largeScreenPage";
 import wdCharts from '../components/wdCharts'
 import wdPowerCharts from '../components/wdPowerCharts'
@@ -254,6 +255,7 @@ export default {
     this.timer = setInterval(this.formatTime, 1000 * 60)
   },
   methods: {
+    // 获取项目信息
     getProjectSelect(){
       projectSelect().then(res=>{
         this.projectOption = res.data
@@ -276,10 +278,36 @@ export default {
           this.wdHeight = this.towerOption[0].wdHeight
         }
         this.cftInfo = {equipmentNo:this.cftNo,wdHeights:this.wdHeight}
+        this.getTowerInfo()
       }).catch(err=>{
         console.log('获取项目列表失败：'+err)
       })
     },
+    getTowerInfo(){
+      selectTForAir({equipmentId: this.cftNo, month: ''}).then(res=>{
+        // console.log(res.data)
+        let data = res.data
+        this.projectInfo = {
+          time: data.dataTime,
+          model: 'WH6.25N-182',
+          latitude: data.latitude,
+          longitude: data.longitude,
+          wd: data.wdSum,
+          hour: data.hour,
+          power: data.battery
+        }
+        this.environmentInfo = {
+          airDensity: data.air,
+          t: data.t,
+          pa: data.pa,
+          turbulent: data.turbulence,
+          windShear: data.windShear
+        }
+      }).catch(err=>{
+        console.log('获取测风塔基本信息：'+err)
+      })
+    },
+
     // 改变项目下拉框
     changeProject(){
       let project = this.projectOption.find(w=>w.value === this.projectId)
@@ -287,11 +315,13 @@ export default {
       this.cftNo = this.towerOption[0].value
       this.wdHeight = this.towerOption[0].wdHeight
       this.cftInfo = {equipmentNo:this.cftNo,wdHeights:this.wdHeight}
+      this.getTowerInfo()
     },
     // 改变塔信息下拉框
     changeTower(){
       let towerInfo = this.towerOption.find(w=>w.value === this.cftNo)
       this.cftInfo = {equipmentNo:this.cftNo,wdHeights:towerInfo.wdHeight}
+      this.getTowerInfo()
     },
     push() {
       this.$router.push({path: "/dataQuery/windTowerStatusInfo"})

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

@@ -195,21 +195,22 @@ import {stationSelect} from "@/api/biz/dataQuery/largeScreenPage";
 import wdCharts from '../components/wdCharts'
 import wdPowerCharts from '../components/wdPowerCharts'
 import WsCharts from "@/views/largeScreenPage/components/wsCharts";
+
 export default {
   name: "realResourcesInfo",
-  components:{WsCharts, wdCharts,wdPowerCharts},
+  components: {WsCharts, wdCharts, wdPowerCharts},
   data() {
     return {
       timer: null,
       time: '',
       realWindTowerInfo: {},
-      cftInfo:{equipmentNo:'006171',wdHeights:'120,80,10'},
+      cftInfo: {equipmentNo: '006171', wdHeights: '120,80,10'},
       height: '140',
       wdHeight: '',
-      stationId:'1',
-      stationOption:[{id:'1',stationName:'穆棱风电场'}],//项目列表
-      cftNo:'8009',
-      towerOption:[{value:'8009',label:'穆棱8009'}],//塔列表
+      stationId: '1',
+      stationOption: [{id: '1', stationName: '穆棱风电场'}],//项目列表
+      cftNo: '8009',
+      towerOption: [{value: '8009', label: '穆棱8009'}],//塔列表
       stationInfo: {
         latitude: '46.24',
         longitude: '129.8',
@@ -237,45 +238,71 @@ export default {
     this.timer = setInterval(this.formatTime, 1000 * 60)
   },
   methods: {
-    getStationSelect(){
-      stationSelect().then(res=>{
+    getStationSelect() {
+      stationSelect().then(res => {
         console.log(res.data)
         this.stationOption = res.data
-        if(this.realWindTowerInfo !== undefined){
+        if (this.realWindTowerInfo !== undefined) {
           this.stationId = this.realWindTowerInfo.stationId
-          let station = this.stationOption.find(w=>w.value === this.stationId)
+          let station = this.stationOption.find(w => w.value === this.stationId)
           this.towerOption = station.equipmentDto
-          if(this.realWindTowerInfo.equipmentNo !== null &&this.realWindTowerInfo.equipmentNo !== undefined){
+          if (this.realWindTowerInfo.equipmentNo !== null && this.realWindTowerInfo.equipmentNo !== undefined) {
             this.cftNo = this.realWindTowerInfo.equipmentNo
-            let towerInfo = this.towerOption.find(w=>w.value === this.cftNo)
+            let towerInfo = this.towerOption.find(w => w.value === this.cftNo)
             this.wdHeight = towerInfo.wdHeight
-          }else{
+          } else {
             this.cftNo = this.towerOption[0].value
             this.wdHeight = this.towerOption[0].wdHeight
           }
-        }else{
+        } else {
           this.stationId = this.stationOption[0].value
           this.towerOption = this.stationOption[0].equipmentDto
           this.cftNo = this.towerOption[0].value
           this.wdHeight = this.towerOption[0].wdHeight
         }
-        this.cftInfo = {equipmentNo:this.cftNo,wdHeights:this.wdHeight}
-      }).catch(err=>{
-        console.log('获取场站列表失败：'+err)
+        this.cftInfo = {equipmentNo: this.cftNo, wdHeights: this.wdHeight}
+        this.getTowerInfo()
+      }).catch(err => {
+        console.log('获取场站列表失败：' + err)
+      })
+    },
+    getTowerInfo() {
+      selectTForAir({equipmentId: this.cftNo, month: ''}).then(res => {
+        // console.log(res.data)
+        let data = res.data
+        this.stationInfo = {
+          latitude: data.latitude,
+          longitude: data.longitude,
+          wd: data.wdSum,
+          hour: data.hour,
+          power: data.battery
+        }
+        this.environmentInfo = {
+          airDensity: data.air,
+          t: data.t,
+          pa: data.pa,
+          turbulent: data.turbulence,
+          windShear: data.windShear
+        }
+      }).catch(err => {
+        console.log('获取测风塔基本信息：' + err)
       })
     },
+
     // 改变场站下拉框
-    changeStation(){
-      let station = this.stationOption.find(w=>w.value === this.stationId)
+    changeStation() {
+      let station = this.stationOption.find(w => w.value === this.stationId)
       this.towerOption = station.equipmentDto
       this.cftNo = this.towerOption[0].value
       this.wdHeight = this.towerOption[0].wdHeight
-      this.cftInfo = {equipmentNo:this.cftNo,wdHeights:this.wdHeight}
+      this.cftInfo = {equipmentNo: this.cftNo, wdHeights: this.wdHeight}
+      this.getTowerInfo()
     },
     // 改变塔信息下拉框
-    changeTower(){
-      let towerInfo = this.towerOption.find(w=>w.value === this.cftNo)
-      this.cftInfo = {equipmentNo:this.cftNo,wdHeights:towerInfo.wdHeight}
+    changeTower() {
+      let towerInfo = this.towerOption.find(w => w.value === this.cftNo)
+      this.cftInfo = {equipmentNo: this.cftNo, wdHeights: towerInfo.wdHeight}
+      this.getTowerInfo()
     },
     push() {
       this.$router.push({path: "/dataQuery/windTowerStatusInfo"})
@@ -311,7 +338,7 @@ export default {
   height: calc(100vh);
   /*background: url(../../../assets/largeScreenImg/backBg.png) no-repeat;*/
   /*background-size: 100% 100%;*/
-  background: #030F1A ;
+  background: #030F1A;
   color: white;
 }
 
@@ -426,6 +453,7 @@ export default {
 .main-top-center {
   width: 71.5%
 }
+
 .main-bottom-center {
   width: 45%;
 }
@@ -448,6 +476,7 @@ export default {
   background: url(../../../assets/largeScreenImg/resourcesInfo/centerTitleBg.png) 100% no-repeat;
   background-size: 100% 100%;
 }
+
 .topCenterTiltleTextBg {
   height: 32px;
   background: url(../../../assets/largeScreenImg/zaiyunAndqianqi/projectEvolveTitleBg.png) 100% no-repeat;
@@ -462,39 +491,47 @@ export default {
   position: relative;
   top: -25%;
 }
-.rSelect{
+
+.rSelect {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.projectSelect{
+
+.projectSelect {
   height: 34px;
   width: 200px;
   background: url(../../../assets/largeScreenImg/resourcesInfo/projectBg.png) 100% no-repeat;
   background-size: 100% 100%;
 }
-.towerSelect{
+
+.towerSelect {
   height: 30px;
   width: 200px;
   background: url(../../../assets/largeScreenImg/resourcesInfo/towerBg.png) 100% no-repeat;
   background-size: 100% 100%;
 }
+
 .rSelect /deep/ .el-input--small .el-input__inner {
   background: transparent;
   border: 0;
   color: white;
   font-size: 16px;
 }
+
 .projectSelect /deep/ .el-input--small .el-input__inner {
   margin-left: 5%;
   margin-top: 1%;
 }
+
 .rSelect /deep/ .el-select .el-input .el-select__caret {
   color: #ffffff;
 }
+
 .centerTitle {
   margin-left: 5%;
 }
+
 .topCenterTitle {
   margin-left: 2.5%;
 }