实际功率页面还原理论、可用功率

ipfcst/ipfcst-reportquery/src/main/frontend/views/realTimeQuery/realPowerQuery/index.vue

@@ -150,34 +150,24 @@
           this.drawData = res.data
           this.abandonmentRates = res.data.abandonmentRates
           this.drawLoading = false
-          this.tableColumn = []
-          if(this.drawData.displayKyLl == '1'){
-            this.tableColumn = [
-              { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
-              { field: 'realValue', title: '实际功率',minWidth:"60"},
-              { field: 'ableValue', title: '可用功率',minWidth:"60"},
-              { field: 'theoryValue', title: '理论功率',minWidth:"60"},
-              { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
-              { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
-              { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
-              { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
-              // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-              // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-              // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-              // { field: 'capacity', title: '装机容量',minWidth:"60"},
-              // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
-            ]
-          }else {
-            this.tableColumn = [
-              { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
-              { field: 'realValue', title: '实际功率',minWidth:"60"},
-              // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-              // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-              // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-              // { field: 'capacity', title: '装机容量',minWidth:"60"},
-              // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
-            ]
-          }
+          // this.tableColumn = []
+
+          this.tableColumn = [
+            { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
+            { field: 'realValue', title: '实际功率',minWidth:"60"},
+            { field: 'ableValue', title: '可用功率',minWidth:"60"},
+            { field: 'theoryValue', title: '理论功率',minWidth:"60"},
+            { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
+            { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
+            { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
+            { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
+            { field: 'openCapacity', title: '开机容量',minWidth:"60"},
+            // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+            // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+            { field: 'capacity', title: '装机容量',minWidth:"60"},
+            // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+          ]
+
           if(this.drawData.abnormalShow == '1'){
             this.tableColumn .push({ field: 'abnormalOfMeasuring', title: '测风光法的异常值',minWidth:"60"})
             this.tableColumn .push({ field: 'abnormalOfSample', title: '样板机法的异常值',minWidth:"60"})

ipfcst/ipfcst-reportquery/src/main/frontend/views/realTimeQuery/realPowerQueryOne/index.vue

@@ -150,34 +150,51 @@
           this.drawData = res.data
           this.abandonmentRates = res.data.abandonmentRates
           this.drawLoading = false
-          this.tableColumn = []
-          if(this.drawData.displayKyLl == '1'){
-            this.tableColumn = [
-              { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
-              { field: 'realValue', title: '实际功率',minWidth:"60"},
-              { field: 'ableValue', title: '可用功率',minWidth:"60"},
-              { field: 'theoryValue', title: '理论功率',minWidth:"60"},
-              { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
-              { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
-              { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
-              { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
-              // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-              // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-              // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-              // { field: 'capacity', title: '装机容量',minWidth:"60"},
-              // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
-            ]
-          }else {
-            this.tableColumn = [
-              { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
-              { field: 'realValue', title: '实际功率',minWidth:"60"},
-              // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-              // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-              // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-              // { field: 'capacity', title: '装机容量',minWidth:"60"},
-              // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
-            ]
-          }
+
+          this.tableColumn = [
+            { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
+            { field: 'realValue', title: '实际功率',minWidth:"60"},
+            { field: 'ableValue', title: '可用功率',minWidth:"60"},
+            { field: 'theoryValue', title: '理论功率',minWidth:"60"},
+            { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
+            { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
+            { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
+            { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
+            { field: 'openCapacity', title: '开机容量',minWidth:"60"},
+            // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+            // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+            { field: 'capacity', title: '装机容量',minWidth:"60"},
+            // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+          ]
+
+          // this.tableColumn = []
+          // if(this.drawData.displayKyLl == '1'){
+          //   this.tableColumn = [
+          //     { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
+          //     { field: 'realValue', title: '实际功率',minWidth:"60"},
+          //     { field: 'ableValue', title: '可用功率',minWidth:"60"},
+          //     { field: 'theoryValue', title: '理论功率',minWidth:"60"},
+          //     { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
+          //     { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
+          //     { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
+          //     { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
+          //     // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
+          //     // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+          //     // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+          //     // { field: 'capacity', title: '装机容量',minWidth:"60"},
+          //     // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+          //   ]
+          // }else {
+          //   this.tableColumn = [
+          //     { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
+          //     { field: 'realValue', title: '实际功率',minWidth:"60"},
+          //     // { field: 'openCapacity', title: '开机容量',minWidth:"60"},
+          //     // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+          //     // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+          //     // { field: 'capacity', title: '装机容量',minWidth:"60"},
+          //     // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+          //   ]
+          // }
           if(this.drawData.abnormalShow == '1'){
             this.tableColumn .push({ field: 'abnormalOfMeasuring', title: '测风光法的异常值',minWidth:"60"})
             this.tableColumn .push({ field: 'abnormalOfSample', title: '样板机法的异常值',minWidth:"60"})

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

@@ -389,8 +389,8 @@ public class PowerStationStatusDataOneService extends BaseService {
       map1.put("referencePowerByMeasuring", powerStationStatusData1.getReferencePowerByMeasuring());
       map1.put("referencePowerBySample", powerStationStatusData1.getReferencePowerBySample());
       map1.put("referencePowerByHubSpeed", powerStationStatusData1.getReferencePowerByHubSpeed());
-//      map1.put("openCapacity", powerStationStatusData1.getOpenCapacity());
-//      map1.put("capacity", powerStationStatusData1.getCapacity());
+      map1.put("openCapacity", powerStationStatusData1.getOpenCapacity());
+      map1.put("capacity", powerStationStatusData1.getCapacity());
 //      map1.put("onGridNum", powerStationStatusData1.getOnGridNum());
       map1.put("onSiteObstructed", powerStationStatusData1.getOnSiteObstructed());
       map1.put("offSiteObstructed", powerStationStatusData1.getOffSiteObstructed());

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

@@ -388,8 +388,8 @@ public class PowerStationStatusDataService extends BaseService {
       map1.put("referencePowerByMeasuring", powerStationStatusData1.getReferencePowerByMeasuring());
       map1.put("referencePowerBySample", powerStationStatusData1.getReferencePowerBySample());
       map1.put("referencePowerByHubSpeed", powerStationStatusData1.getReferencePowerByHubSpeed());
-//      map1.put("openCapacity", powerStationStatusData1.getOpenCapacity());
-//      map1.put("capacity", powerStationStatusData1.getCapacity());
+      map1.put("openCapacity", powerStationStatusData1.getOpenCapacity());
+      map1.put("capacity", powerStationStatusData1.getCapacity());
 //      map1.put("onGridNum", powerStationStatusData1.getOnGridNum());
       map1.put("onSiteObstructed", powerStationStatusData1.getOnSiteObstructed());
       map1.put("offSiteObstructed", powerStationStatusData1.getOffSiteObstructed());