888888

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

@@ -145,19 +145,19 @@
                 width: 1
               }
             },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(50,194,219, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
+            // areaStyle: {
+            //   normal: {
+            //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            //       offset: 0,
+            //       color: 'rgba(50,194,219, 0.3)'
+            //     }, {
+            //       offset: 0.8,
+            //       color: 'rgba(219, 50, 51, 0)'
+            //     }], false),
+            //     shadowColor: 'rgba(0, 0, 0, 0.1)',
+            //     shadowBlur: 10
+            //   }
+            // },
             itemStyle: {
               normal: {
 

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

@@ -54,9 +54,9 @@
               :cell-style="{background:'black',color:'white'}"
               align="center"
               :data="tableData">
-              <vxe-table-column  field="forecastTime" title="预测时间" :formatter="dateFormat" width="30%" sortable min-width="150"></vxe-table-column>
+              <vxe-table-column  field="forecastTime" title="预测时间" :formatter="dateFormat" sortable minWidth="150" width="180"></vxe-table-column>
 <!--              <vxe-table-column field="genDate" title="生成时间" min-width="60" :formatter="dateMoment"></vxe-table-column>-->
-              <vxe-table-column field="fpValue" title="预测功率" width="70%" ></vxe-table-column>
+              <vxe-table-column field="fpValue" title="预测功率"></vxe-table-column>
 <!--              <vxe-table-column field="predictionModelEnum" title="预测模型" min-width="60" :formatter="enumToWord"></vxe-table-column>-->
             </vxe-table>
             <div class="rtPageturning">

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

@@ -145,19 +145,19 @@
                 width: 1
               }
             },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(50,194,219, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
+            // areaStyle: {
+            //   normal: {
+            //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            //       offset: 0,
+            //       color: 'rgba(50,194,219, 0.3)'
+            //     }, {
+            //       offset: 0.8,
+            //       color: 'rgba(219, 50, 51, 0)'
+            //     }], false),
+            //     shadowColor: 'rgba(0, 0, 0, 0.1)',
+            //     shadowBlur: 10
+            //   }
+            // },
             itemStyle: {
               normal: {
 

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

@@ -54,9 +54,9 @@
               :cell-style="{background:'black',color:'white'}"
               align="center"
               :data="tableData">
-              <vxe-table-column  field="forecastTime" title="预测时间" :formatter="dateFormat" width="30%" sortable min-width="150"></vxe-table-column>
+              <vxe-table-column  field="forecastTime" title="预测时间" :formatter="dateFormat" sortable minWidth="150" width="180"></vxe-table-column>
 <!--              <vxe-table-column field="genDate" title="生成时间" min-width="60" :formatter="dateMoment"></vxe-table-column>-->
-              <vxe-table-column field="fpValue" title="预测功率" width="70%" ></vxe-table-column>
+              <vxe-table-column field="fpValue" title="预测功率"></vxe-table-column>
 <!--              <vxe-table-column field="predictionModelEnum" title="预测模型" min-width="60" :formatter="enumToWord"></vxe-table-column>-->
             </vxe-table>
             <div class="rtPageturning">

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

@@ -25,9 +25,9 @@
         <el-button  size="small" :loading="loading"  @click="dateQuery">查询</el-button>
       </div>
       <div class="toolbar" v-show="this.showToolBar"> <vxe-toolbar ref="fstToolBar" custom >
-        <template v-slot:buttons>
-          <vxe-button class="downloadButton" style="border:none;"  @click="exportDataEvent"><i class="vxe-icon--download" ></i></vxe-button>
-        </template>
+<!--        <template v-slot:buttons>-->
+<!--          <vxe-button class="downloadButton" style="border:none;"  @click="exportDataEvent"><i class="vxe-icon&#45;&#45;download" ></i></vxe-button>-->
+<!--        </template>-->
       </vxe-toolbar></div>
       <div class="toolbar" v-show="this.showToolBar"> <vxe-toolbar ref="nwpToolBar" custom></vxe-toolbar></div>
     </div>
@@ -161,21 +161,21 @@
               { 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"}
+              // { 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"}
+              // { 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'){

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

@@ -25,9 +25,9 @@
         <el-button  size="small" :loading="loading"  @click="dateQuery">查询</el-button>
       </div>
       <div class="toolbar" v-show="this.showToolBar"> <vxe-toolbar ref="fstToolBar" custom >
-        <template v-slot:buttons>
-          <vxe-button class="downloadButton" style="border:none;"  @click="exportDataEvent"><i class="vxe-icon--download" ></i></vxe-button>
-        </template>
+<!--        <template v-slot:buttons>-->
+<!--          <vxe-button class="downloadButton" style="border:none;"  @click="exportDataEvent"><i class="vxe-icon&#45;&#45;download" ></i></vxe-button>-->
+<!--        </template>-->
       </vxe-toolbar></div>
       <div class="toolbar" v-show="this.showToolBar"> <vxe-toolbar ref="nwpToolBar" custom></vxe-toolbar></div>
     </div>
@@ -161,21 +161,21 @@
               { 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"}
+              // { 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"}
+              // { 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'){

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

@@ -1087,6 +1087,7 @@ public class DashboardService extends BaseService {
     List llList = new ArrayList();
     List timeList = new ArrayList();
     List lggdfsList = new ArrayList();
+    long currentTime = System.currentTimeMillis();
     for (Long tempDateTime = startDateTime; tempDateTime < endDateTime; tempDateTime = tempDateTime + 15 * 60 * 1000) {
       String time = DateFormatUtils.format(tempDateTime, "HH:mm");
       //时间
@@ -1095,7 +1096,12 @@ public class DashboardService extends BaseService {
 //      TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
 //      cdqTimeAndDataDto.setTime(time);
       if (cdqMap.get(tempDateTime) != null) {
-        cdqList.add(cdqMap.get(tempDateTime));
+        if (tempDateTime>currentTime){
+          cdqList.add(null);
+        }
+        else{
+          cdqList.add(cdqMap.get(tempDateTime));
+        }
 //        cdqTimeAndDataDto.setVal();
       } else {
         cdqList.add(null);
@@ -1120,7 +1126,13 @@ public class DashboardService extends BaseService {
           sjList.add(null);
 //          sjTimeAndDataDto.setVal(null);
         } else {
-          sjList.add(sjMap.get(tempDateTime));
+          if (tempDateTime>currentTime){
+            sjList.add(null);
+          }
+          else{
+            sjList.add(sjMap.get(tempDateTime));
+          }
+
 //          sjTimeAndDataDto.setVal(sjMap.get(tempDateTime));
         }
       } else {
@@ -1268,6 +1280,7 @@ public class DashboardService extends BaseService {
     List llList = new ArrayList();
     List timeList = new ArrayList();
     List lggdfsList = new ArrayList();
+    long currentTime = System.currentTimeMillis();
     for (Long tempDateTime = startDateTime; tempDateTime < endDateTime; tempDateTime = tempDateTime + 15 * 60 * 1000) {
       String time = DateFormatUtils.format(tempDateTime, "HH:mm");
       //时间
@@ -1276,7 +1289,13 @@ public class DashboardService extends BaseService {
 //      TimeAndDataDto cdqTimeAndDataDto = new TimeAndDataDto();
 //      cdqTimeAndDataDto.setTime(time);
       if (cdqMap.get(tempDateTime) != null) {
-        cdqList.add(cdqMap.get(tempDateTime));
+        if (tempDateTime>currentTime){
+          cdqList.add(null);
+        }
+        else{
+          cdqList.add(cdqMap.get(tempDateTime));
+        }
+
 //        cdqTimeAndDataDto.setVal();
       } else {
         cdqList.add(null);
@@ -1301,7 +1320,12 @@ public class DashboardService extends BaseService {
           sjList.add(null);
 //          sjTimeAndDataDto.setVal(null);
         } else {
-          sjList.add(sjMap.get(tempDateTime));
+          if (tempDateTime>currentTime){
+            sjList.add(null);
+          }
+          else{
+            sjList.add(sjMap.get(tempDateTime));
+          }
 //          sjTimeAndDataDto.setVal(sjMap.get(tempDateTime));
         }
       } else {

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

@@ -389,16 +389,16 @@ 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("onGridNum", powerStationStatusData1.getOnGridNum());
+//      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());
       map1.put("abnormalOfMeasuring", powerStationStatusData1.getAbnormalOfMeasuring());
       map1.put("abnormalOfSample", powerStationStatusData1.getAbnormalOfSample());
       map1.put("abnormalOfHubSpeed", powerStationStatusData1.getAbnormalOfHubSpeed());
-      map1.put("isRationingByManualControl", powerStationStatusData1.getIsRationingByManualControl());
-      map1.put("isRationingByAutoControl", powerStationStatusData1.getIsRationingByAutoControl());
+//      map1.put("isRationingByManualControl", powerStationStatusData1.getIsRationingByManualControl());
+//      map1.put("isRationingByAutoControl", powerStationStatusData1.getIsRationingByAutoControl());
       map1.put("ablePowerByMeasuring", powerStationStatusData1.getAblePowerByMeasuring());
       map1.put("ablePowerBySample", powerStationStatusData1.getAblePowerBySample());
       map1.put("ablePowerByHubSpeed", powerStationStatusData1.getAblePowerByHubSpeed());

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

@@ -388,16 +388,16 @@ 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("onGridNum", powerStationStatusData1.getOnGridNum());
+//      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());
       map1.put("abnormalOfMeasuring", powerStationStatusData1.getAbnormalOfMeasuring());
       map1.put("abnormalOfSample", powerStationStatusData1.getAbnormalOfSample());
       map1.put("abnormalOfHubSpeed", powerStationStatusData1.getAbnormalOfHubSpeed());
-      map1.put("isRationingByManualControl", powerStationStatusData1.getIsRationingByManualControl());
-      map1.put("isRationingByAutoControl", powerStationStatusData1.getIsRationingByAutoControl());
+//      map1.put("isRationingByManualControl", powerStationStatusData1.getIsRationingByManualControl());
+//      map1.put("isRationingByAutoControl", powerStationStatusData1.getIsRationingByAutoControl());
       map1.put("ablePowerByMeasuring", powerStationStatusData1.getAblePowerByMeasuring());
       map1.put("ablePowerBySample", powerStationStatusData1.getAblePowerBySample());
       map1.put("ablePowerByHubSpeed", powerStationStatusData1.getAblePowerByHubSpeed());