ssssxxxxx

ipfcst/ipfcst-reportquery/src/main/frontend/views/statisticsQuery/CESQuery/index.vue

@@ -287,11 +287,6 @@ export default {
     getEquipments(eType) {
       var url = '/weatherStationInfos'
       this.displayConfig.displayCode = 'weatherStationEnvironmental'
-      // 枚举类型E1光伏  E2风电
-      if (eType == 'E2') {
-        url = '/windTowerInfos'
-        this.displayConfig.displayCode = 'windTowerEnvironmental'
-      }
       this.$axios.get(url).then((res) => {
         this.equipments = res.data
         if (res.data != null && res.data.length > 0) {
@@ -484,6 +479,7 @@ export default {
       for (var j = 0; j < this.lists.length; j++) {
         this.displayConfig.showCode += this.lists[j].value + ','
       }
+      console.log(this.displayConfig)
       this.$axios.post('displayConfig/', this.displayConfig).then((res) => {
         this.displayConfig = res.data
         this.$message.success('展示设置成功')

ipfcst/ipfcst-reportquery/src/main/frontend/views/statisticsQuery/CESQueryOne/index.vue

@@ -194,7 +194,7 @@ export default {
       test: '',
       displayConfig: {
         id: '',
-        displayCode: 'environmentalData',
+        displayCode: 'environmentalDataOne',
         showCode: '',
         hiddenCode: ''
       },
@@ -285,13 +285,8 @@ export default {
       })
     },
     getEquipments(eType) {
-      var url = '/weatherStationInfos'
-      this.displayConfig.displayCode = 'weatherStationEnvironmental'
-      // 枚举类型E1光伏  E2风电
-      if (eType == 'E2') {
-        url = '/windTowerInfos'
-        this.displayConfig.displayCode = 'windTowerEnvironmental'
-      }
+      var url = '/windTowerInfos'
+      this.displayConfig.displayCode = 'windTowerEnvironmental'
       this.$axios.get(url).then((res) => {
         this.equipments = res.data
         if (res.data != null && res.data.length > 0) {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/EnvironmentalDataService.java

@@ -36,8 +36,6 @@ public class EnvironmentalDataService extends BaseService {
 
     Map<String, Object> map = new HashMap<>();
 
-    ElectricField electricField = electricFieldRepository.findAll().get(0);
-
     Map<String, Object> footMap = new HashMap<>();
 
     EquipmentTypeEnum equipmentTypeEnum;