Ver código fonte

修改实时预测

xusl 1 ano atrás
pai
commit
c70940e663

+ 6 - 19
ipfcst/ipfcst-reportquery/src/main/frontend/router/modules/realTimeQuery.js

@@ -54,20 +54,14 @@ const realTimeQueryRouter = {
       path: 'nwp',
       component: () => import('@/views/realTimeQuery/nwp'),
       name: 'nwp',
-      meta: { title: '实时NWP查询', noCache: true },
+      meta: { title: '光伏实时NWP查询', noCache: true },
       sign: 'currency'
     },
     {
       path: 'nwpOne',
       component: () => import('@/views/realTimeQuery/nwpOne'),
       name: 'nwpOne',
-      meta: { title: '实时NWP一期查询', noCache: true },
-      sign: 'currency'
-    },{
-      path: 'nwpTwo',
-      component: () => import('@/views/realTimeQuery/nwpTwo'),
-      name: 'nwpTwo',
-      meta: { title: '实时NWP二期查询', noCache: true },
+      meta: { title: '风电实时NWP查询', noCache: true },
       sign: 'currency'
     },
     {
@@ -79,23 +73,16 @@ const realTimeQueryRouter = {
     },
     {
       path: 'contrastRealTimeQuery',
-      component: () => import('@/views/contrastRealTimeQuery'),
+      component: () => import('@/views/realTimeQuery/forecastPowerShortTerm'),
       name: 'contrastRealTimeQuery',
-      meta: { title: '实时预测查询', noCache: true },
+      meta: { title: '光伏实时预测查询', noCache: true },
       sign: 'currency'
     },
     {
       path: 'contrastRealTimeQueryOne',
-      component: () => import('@/views/contrastRealTimeQueryOne'),
+      component: () => import('@/views/realTimeQuery/forecastPowerShortTermOne'),
       name: 'contrastRealTimeQueryOne',
-      meta: { title: '实时预测一期查询', noCache: true },
-      sign: 'currency'
-    },
-    {
-      path: 'contrastRealTimeQueryTwo',
-      component: () => import('@/views/contrastRealTimeQueryTwo'),
-      name: 'contrastRealTimeQueryTwo',
-      meta: { title: '实时预测二期查询', noCache: true },
+      meta: { title: '风电实时预测查询', noCache: true },
       sign: 'currency'
     },
     // {

+ 0 - 1247
ipfcst/ipfcst-reportquery/src/main/frontend/views/contrastRealTimeQuery/charts/index.vue

@@ -151,7 +151,6 @@ export default {
         series: []
       }
 
-      if (newValue.electricField.electricFieldTypeEnum == "E1") {
         option.yAxis.push({
           type: 'value',
           name: '(W/㎡)',
@@ -176,72 +175,6 @@ export default {
             }
           }
         })
-      } else {
-        option.yAxis.push({
-          type: 'value',
-          name: '(m/s)',
-          min: 0,
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            lineStyle: {
-              color: '#fff2cc'
-            }
-          },
-          axisLabel: {
-            margin: 10,
-            textStyle: {
-              fontSize: 14
-            }
-          },
-          splitLine: {
-            lineStyle: {
-              color: '#666633'
-            }
-          }
-        })
-      }
-
-      if(newValue.ableValue.length>0){
-        option.series.push({
-          name: '可用功率',
-          type: 'line',
-          smooth: false,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.kygl,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ableValue
-        })
-        option.legend.data.push('可用功率')
-      }
-
       if(newValue.realValue.length>0){
         option.series.push({
           name: '实际功率',
@@ -281,127 +214,6 @@ export default {
         option.legend.data.push('实际功率')
       }
 
-
-      if(newValue.theoryValue.length>0){
-
-        option.series.push({
-          name: '理论功率',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.llgl,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.theoryValue
-        })
-        option.legend.data.push('理论功率')
-      }
-
-      if(newValue.referencePowerBySample != undefined&&newValue.referencePowerBySample.length>0){
-
-        option.series.push({
-          name: '参照功率(样板机)',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ybjf,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.referencePowerBySample
-        })
-        option.legend.data.push('参照功率(样板机)')
-      }
-
-      if(newValue.referencePowerByMeasuring != undefined&&newValue.referencePowerByMeasuring.length>0){
-
-        option.series.push({
-          name: '参照功率(测风、测光)',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.cfgf,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.referencePowerByMeasuring
-        })
-        option.legend.data.push('参照功率(测风、测光)')
-      }
-
       if(newValue.rDq.length>0){
         option.series.push({
           name: '实时短期',
@@ -440,1065 +252,6 @@ export default {
         })
         option.legend.data.push('实时短期')
       }
-
-      if(newValue.rCdq.length>0){
-
-        option.series.push({
-          name: '实时超短期',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.cdq,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.rCdq
-        })
-        option.legend.data.push('实时超短期')
-      }
-
-      if (newValue.globalR.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '总辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.zfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.globalR
-        })
-        option.legend.data.push('总辐射')
-      }
-      if (newValue.diffuseR.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '散辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.sfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.diffuseR
-        })
-        option.legend.data.push('散辐射')
-      }
-      if (newValue.obliqueR.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '斜辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.xfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.obliqueR
-        })
-        option.legend.data.push('斜辐射')
-      }
-      if (newValue.directR.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '直辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.zfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.directR
-        })
-        option.legend.data.push('直辐射')
-      }
-      if (newValue.wsInst10.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '10米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws10,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst10
-        })
-        option.legend.data.push('10米风速')
-      }
-      if (newValue.wsInst30.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '30米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws30,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst30
-        })
-        option.legend.data.push('30米风速')
-      }
-      if (newValue.wsInst50.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '50米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws50,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst50
-        })
-        option.legend.data.push('50米风速')
-      }
-      if (newValue.wsInst60.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '60米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws60,
-              borderColor: 'rgba(64,94,94,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst60
-        })
-        option.legend.data.push('60米风速')
-      }
-      if (newValue.wsInst70.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '70米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws70,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst70
-        })
-        option.legend.data.push('70米风速')
-      }
-      if (newValue.wsInst80.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '80米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws80,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst80
-        })
-        option.legend.data.push('80米风速')
-      }
-      if (newValue.wsInst90.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '90米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws90,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst90
-        })
-        option.legend.data.push('90米风速')
-      }
-      if (newValue.wsInst100.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '100米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws100,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst100
-        })
-        option.legend.data.push('100米风速')
-      }
-      if (newValue.wsInst110.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '110米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws110,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst110
-        })
-        option.legend.data.push('110米风速')
-      }
-      if (newValue.wsInst120.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '120米风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.ws120,
-              borderColor: 'rgba(201,209,210,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInst120
-        })
-        option.legend.data.push('120米风速')
-      }
-
-      if (newValue.wsInstHubHeight.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: '轮毂风速',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.wsHubHeight,
-              borderColor: 'rgba(201,209,210,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.wsInstHubHeight
-        })
-        option.legend.data.push('轮毂风速')
-      }
-      if (newValue.ws10.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws10,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp10,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws10
-        })
-        option.legend.data.push(newValue.columns.ws10)
-      }
-      if (newValue.ws30.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws30,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp30,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws30
-        })
-        option.legend.data.push(newValue.columns.ws30)
-      }
-      if (newValue.ws50.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws50,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp50,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws50
-        })
-        option.legend.data.push(newValue.columns.ws50)
-      }
-      if (newValue.ws70.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws70,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp70,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws70
-        })
-        option.legend.data.push(newValue.columns.ws70)
-      }
-      if (newValue.ws80.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws80,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp80,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws80
-        })
-        option.legend.data.push(newValue.columns.ws80)
-      }
-      if (newValue.ws90.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws90,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp90,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws90
-        })
-        option.legend.data.push(newValue.columns.ws90)
-      }
-      if (newValue.ws100.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws100,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp100,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws100
-        })
-        option.legend.data.push(newValue.columns.ws100)
-      }
-      if (newValue.ws170.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: newValue.columns.ws170,
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwp170,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.ws170
-        })
-        option.legend.data.push(newValue.columns.ws170)
-      }
-
-
-      if (newValue.swr.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: 'nwp辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwpfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.swr
-        })
-        option.legend.data.push('nwp辐射')
-      }
-
-      if (newValue.directRadiation.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: 'nwp直辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwpzhfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.directRadiation
-        })
-        option.legend.data.push('nwp直辐射')
-      }
-      if (newValue.diffuseRadiation.length > 0) {
-        option.series.push({
-          yAxisIndex: 1,
-          name: 'nwp散辐射',
-          type: 'line',
-          smooth: true,
-          symbol: 'circle',
-          symbolSize: 5,
-          showSymbol: false,
-          lineStyle: {
-            normal: {
-              width: 2
-            }
-          },
-          // 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: {
-
-              color: cc.nwpsfs,
-              borderColor: 'rgba(50,194,219,0.2)',
-              borderWidth: 12
-            }
-          },
-          data: newValue.diffuseRadiation
-        })
-        option.legend.data.push('nwp散辐射')
-      }
       option.animation=false;
       this.chart.setOption(option, true)
       var val =[{

+ 76 - 613
ipfcst/ipfcst-reportquery/src/main/frontend/views/contrastRealTimeQuery/index.vue

@@ -22,17 +22,6 @@
         </el-date-picker>
       </div>
       <div>
-        <span class="timeText">设备编号</span>
-        <el-select v-model="equipmentId" placeholder="请选择">
-          <el-option
-            v-for="item in equipments"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-      <div>
         <span class="timeText">间隔时间</span>
         <el-select v-model="jgTime" placeholder="请选择" @change="changeJgTime">
           <el-option
@@ -59,56 +48,10 @@
       <div class="toolbar" v-show="this.showToolBar">
         <vxe-toolbar ref="nwpToolBar" custom></vxe-toolbar>
       </div>
-      <div class="timeQuery">
-        <el-button size="small" :loading="loading" @click="dialogVisible = true">显示设置</el-button>
-      </div>
 
     </div>
 
 
-    <el-dialog
-      title="选择数据类型"
-      :visible.sync="dialogVisible"
-      :before-close="this.cancelDisplay"
-      width="50%">
-      <div class="drag-box-item">
-        <div class="item-title">隐藏</div>
-
-        <draggable class="list-group" :list="listh" group="people" @change="log">
-          <transition-group id="done" tag="div" class="item-ul">
-            <div
-              v-for="(element, index) in listh"
-              :key="element.value"
-              class="drag-list"
-            >
-              {{ element.key }}
-            </div>
-          </transition-group>
-        </draggable>
-
-      </div>
-      <div class="drag-box-item">
-        <div class="item-title">展示</div>
-
-        <draggable class="list-group" :list="lists" group="people" @change="log">
-          <transition-group id="wdtodo" tag="div" class="item-ul">
-            <div
-              v-for="(element, index) in lists"
-              :key="element.value"
-              class="drag-list"
-            >
-              {{ element.key }}
-            </div>
-          </transition-group>
-        </draggable>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="this.initShow" style="color: #3d1f25">初始化</el-button>
-    <el-button @click="this.cancelDisplay" style="color: #1f2d3d">取 消</el-button>
-    <el-button type="primary" style="color: #1f2d3d" @click="this.changeDisplay">确 定</el-button>
-  </span>
-    </el-dialog>
-
     <div class="content">
       <el-tabs type="card" v-model="activeName" @tab-click="Byresize">
         <el-tab-pane label="图表" name="first">
@@ -271,32 +214,30 @@ export default {
     },
     downloadFile(name){
       const formData = new FormData();
-        formData.append('path', "/home/syjy/ipfcstV3/reportForm")
-        //formData.append('path', "/Users/wanghongchen")
-        formData.append('name', name)
-        formData.append('type', "")
-        this.$axios({ // 用axios发送post请求
-          method: 'post',
-          url: '/downLoadFile', // 请求地址
-          data: formData, // 参数
-          responseType: 'blob', // 表明返回服务器返回的数据类型
-          headers: {
-            'Content-Type': 'application/json'
-          }
-        }).then(res => { // 处理返回的文件流
-          this.tableLoading = false
-          if (res && res.code === 0) {
-            this.$message.error('下载失败!')
-          }
-        })
+      formData.append('path', "/home/syjy/ipfcstV3/reportForm")
+      //formData.append('path', "/Users/wanghongchen")
+      formData.append('name', name)
+      formData.append('type', "")
+      this.$axios({ // 用axios发送post请求
+        method: 'post',
+        url: '/downLoadFile', // 请求地址
+        data: formData, // 参数
+        responseType: 'blob', // 表明返回服务器返回的数据类型
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }).then(res => { // 处理返回的文件流
+        this.tableLoading = false
+        if (res && res.code === 0) {
+          this.$message.error('下载失败!')
+        }
+      })
     },
     exportDataEvent() {
       this.loading = true
       const formData = new FormData()
       formData.append("startTime",this.startTime)
       formData.append("endTime",this.endTime)
-      formData.append("no",this.equipmentId)
-      formData.append("otherType",this.electricField.electricFieldTypeEnum)
       formData.append("jgTime",this.jgTime)
       formData.append("base64",this.base64)
       //this.$axios.get('ComprehensiveContrastExports/' + this.startTime + '/' + this.endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime+ '/' +this.base64+ '/' +this.width+ '/' +this.height, {
@@ -373,110 +314,15 @@ export default {
       })
     },
     getEquipments(eType) {
-      var url = '/weatherStationInfos'
-      this.displayConfig.displayCode = "rtWeatherStationInfos"
-      //枚举类型E1光伏  E2风电
-      if (eType == 'E2') {
-        url = '/windTowerInfos'
-        this.displayConfig.displayCode = 'rtWindTowerInfos'
-      }
-      this.$axios.get(url).then((res) => {
-        this.equipments = res.data
-        if (res.data != null && res.data.length > 0) {
-          this.equipmentId = this.equipments[0].id
-          this.getDisplay()
-        } else {
-          this.$message.warning("设备信息未维护")
-        }
-      }).catch((error) => {
-        this.$message.error('查询设备信息出错' + error)
-      })
+      this.displayConfig.displayCode = 'rtWindTowerInfos'
+      this.getDisplay()
     },
     initDisplay() {
-      // this.lists = []
-      // this.listsquery = []
-      if (this.electricField.electricFieldTypeEnum == 'E1') {
-        this.lists.push({key: '总辐射(W/㎡)', value: 'globalR'})
-        this.listh.push({key: '直辐射(W/㎡)', value: 'directR'})
-        this.listh.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-        this.listh.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-
-        this.lists.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-        this.listh.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-        this.listh.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-
-        this.lists.push({key:'实际功率(MW)',value:'realValue'})
-        this.lists.push({key: '实时短期(MW)', value: 'rDq'})
-        this.lists.push({key: '实时超短期(MW)', value: 'rCdq'})
-
-        this.listsquery.push({key: '总辐射(W/㎡)', value: 'globalR'})
-        this.listhquery.push({key: '直辐射(W/㎡)', value: 'directR'})
-        this.listhquery.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-        this.listhquery.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-
-        this.listsquery.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-        this.listhquery.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-        this.listhquery.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-
-        this.listsquery.push({key:'实际功率(MW)',value:'realValue'})
-        this.listsquery.push({key: '实时短期(MW)', value: 'rDq'})
-        this.listsquery.push({key: '实时超短期(MW)', value: 'rCdq'})
-        this.changeDisplay()
-      } else {
-        this.lists.push({key:'实际功率(MW)',value:'realValue'})
-        this.lists.push({key: '实时短期(MW)', value: 'rDq'})
-        this.lists.push({key: '实时超短期(MW)', value: 'rCdq'})
-
-        this.lists.push({key: '10米风速(m/s)', value: 'wsInst10'})
-        this.listh.push({key: '30米风速(m/s)', value: 'wsInst30'})
-        this.listh.push({key: '50米风速(m/s)', value: 'wsInst50'})
-        this.listh.push({key: '60米风速(m/s)', value: 'wsInst60'})
-        this.listh.push({key: '70米风速(m/s)', value: 'wsInst70'})
-        this.listh.push({key: '80米风速(m/s)', value: 'wsInst80'})
-        this.listh.push({key: '90米风速(m/s)', value: 'wsInst90'})
-        this.listh.push({key: '100米风速(m/s)', value: 'wsInst100'})
-        this.listh.push({key: '110米风速(m/s)', value: 'wsInst110'})
-        this.listh.push({key: '120米风速(m/s)', value: 'wsInst120'})
-        this.listh.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-
-        this.lists.push({key: this.columns.ws10, value: 'ws10'})
-        this.listh.push({key: this.columns.ws30, value: 'ws30'})
-        this.listh.push({key: this.columns.ws50, value: 'ws50'})
-        this.listh.push({key: this.columns.ws70, value: 'ws70'})
-        this.listh.push({key: this.columns.ws80, value: 'ws80'})
-        this.listh.push({key: this.columns.ws90, value: 'ws90'})
-        this.listh.push({key: this.columns.ws100, value: 'ws100'})
-        this.listh.push({key: this.columns.ws170, value: 'ws170'})
-
-
-        this.listsquery.push({key:'实际功率(MW)',value:'realValue'})
-        this.listsquery.push({key: '实时短期(MW)', value: 'rDq'})
-        this.listsquery.push({key: '实时超短期(MW)', value: 'rCdq'})
-
-        this.listsquery.push({key: '10米风速(m/s)', value: 'wsInst10'})
-        this.listhquery.push({key: '30米风速(m/s)', value: 'wsInst30'})
-        this.listhquery.push({key: '50米风速(m/s)', value: 'wsInst50'})
-        this.listhquery.push({key: '60米风速(m/s)', value: 'wsInst60'})
-        this.listhquery.push({key: '70米风速(m/s)', value: 'wsInst70'})
-        this.listhquery.push({key: '80米风速(m/s)', value: 'wsInst80'})
-        this.listhquery.push({key: '90米风速(m/s)', value: 'wsInst90'})
-        this.listhquery.push({key: '100米风速(m/s)', value: 'wsInst100'})
-        this.listhquery.push({key: '110米风速(m/s)', value: 'wsInst110'})
-        this.listhquery.push({key: '120米风速(m/s)', value: 'wsInst120'})
-        this.listhquery.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-
-
-        this.listsquery.push({key: this.columns.ws10, value: 'ws10'})
-        this.listhquery.push({key: this.columns.ws30, value: 'ws30'})
-        this.listhquery.push({key: this.columns.ws50, value: 'ws50'})
-        this.listhquery.push({key: this.columns.ws70, value: 'ws70'})
-        this.listhquery.push({key: this.columns.ws80, value: 'ws80'})
-        this.listhquery.push({key: this.columns.ws90, value: 'ws90'})
-        this.listhquery.push({key: this.columns.ws100, value: 'ws100'})
-        this.listhquery.push({key: this.columns.ws170, value: 'ws170'})
-
-        this.changeDisplay()
-      }
+      this.lists.push({key:'实际功率(MW)',value:'realValue'})
+      this.lists.push({key: '实时短期(MW)', value: 'rDq'})
+      this.listsquery.push({key:'实际功率(MW)',value:'realValue'})
+      this.listsquery.push({key: '实时短期(MW)', value: 'rDq'})
+      this.changeDisplay()
     },
     getDisplay() {
       this.$axios.get('displayConfig/' + this.displayConfig.displayCode).then((res) => {
@@ -488,110 +334,6 @@ export default {
           var hiddenlist = this.displayConfig.hiddenCode.split(',')
           for (var i = 0; i < showlist.length; i++) {
             switch (showlist[i]) {
-              case 'globalR':
-                this.lists.push({key: '总辐射(W/㎡)', value: 'globalR'})
-                this.listsquery.push({key: '总辐射(W/㎡)', value: 'globalR'})
-                break;
-              case 'directR':
-                this.lists.push({key: '直辐射(W/㎡)', value: 'directR'})
-                this.listsquery.push({key: '直辐射(W/㎡)', value: 'directR'})
-                break;
-              case 'diffuseR':
-                this.lists.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-                this.listsquery.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-                break;
-              case 'obliqueR':
-                this.lists.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-                this.listsquery.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-                break;
-              case 'wsInst10':
-                this.lists.push({key: '10米风速(m/s)', value: 'wsInst10'})
-                this.listsquery.push({key: '10米风速(m/s)', value: 'wsInst10'})
-                break;
-              case 'wsInst30':
-                this.lists.push({key: '30米风速(m/s)', value: 'wsInst30'})
-                this.listsquery.push({key: '30米风速(m/s)', value: 'wsInst30'})
-                break;
-              case 'wsInst50':
-                this.lists.push({key: '50米风速(m/s)', value: 'wsInst50'})
-                this.listsquery.push({key: '50米风速(m/s)', value: 'wsInst50'})
-                break;
-              case 'wsInst60':
-                this.lists.push({key: '60米风速(m/s)', value: 'wsInst60'})
-                this.listsquery.push({key: '60米风速(m/s)', value: 'wsInst60'})
-                break;
-              case 'wsInst70':
-                this.lists.push({key: '70米风速(m/s)', value: 'wsInst70'})
-                this.listsquery.push({key: '70米风速(m/s)', value: 'wsInst70'})
-                break;
-              case 'wsInst80':
-                this.lists.push({key: '80米风速(m/s)', value: 'wsInst80'})
-                this.listsquery.push({key: '80米风速(m/s)', value: 'wsInst80'})
-                break;
-              case 'wsInst90':
-                this.lists.push({key: '90米风速(m/s)', value: 'wsInst90'})
-                this.listsquery.push({key: '90米风速(m/s)', value: 'wsInst90'})
-                break;
-              case 'wsInst100':
-                this.lists.push({key: '100米风速(m/s)', value: 'wsInst100'})
-                this.listsquery.push({key: '100米风速(m/s)', value: 'wsInst100'})
-                break;
-              case 'wsInst110':
-                this.lists.push({key: '110米风速(m/s)', value: 'wsInst110'})
-                this.listsquery.push({key: '110米风速(m/s)', value: 'wsInst110'})
-                break;
-              case 'wsInst120':
-                this.lists.push({key: '120米风速(m/s)', value: 'wsInst120'})
-                this.listsquery.push({key: '120米风速(m/s)', value: 'wsInst120'})
-                break;
-              case 'wsInstHubHeight':
-                this.lists.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-                this.listsquery.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-                break;
-              case 'ws10':
-                this.lists.push({key: this.columns.ws10, value: 'ws10'})
-                this.listsquery.push({key: this.columns.ws10, value: 'ws10'})
-                break;
-              case 'ws30':
-                this.lists.push({key: this.columns.ws30, value: 'ws30'})
-                this.listsquery.push({key: this.columns.ws30, value: 'ws30'})
-                break;
-              case 'ws50':
-                this.lists.push({key: this.columns.ws50, value: 'ws50'})
-                this.listsquery.push({key: this.columns.ws50, value: 'ws50'})
-                break;
-              case 'ws70':
-                this.lists.push({key: this.columns.ws70, value: 'ws70'})
-                this.listsquery.push({key: this.columns.ws70, value: 'ws70'})
-                break;
-              case 'ws80':
-                this.lists.push({key: this.columns.ws80, value: 'ws80'})
-                this.listsquery.push({key: this.columns.ws80, value: 'ws80'})
-                break;
-              case 'ws90':
-                this.lists.push({key: this.columns.ws90, value: 'ws90'})
-                this.listsquery.push({key: this.columns.ws90, value: 'ws90'})
-                break;
-              case 'ws100':
-                this.lists.push({key: this.columns.ws100, value: 'ws100'})
-                this.listsquery.push({key: this.columns.ws100, value: 'ws100'})
-                break;
-              case 'ws170':
-                this.lists.push({key: this.columns.ws170, value: 'ws170'})
-                this.listsquery.push({key: this.columns.ws170, value: 'ws170'})
-                break;
-              case 'swr':
-                this.lists.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-                this.listsquery.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-                break;
-              case 'directRadiation':
-                this.lists.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-                this.listsquery.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-                break;
-              case 'diffuseRadiation':
-                this.lists.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-                this.listsquery.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-                break;
               case 'realValue':
                 this.lists.push({key:'实际功率(MW)',value:'realValue'})
                 this.listsquery.push({key:'实际功率(MW)',value:'realValue'})
@@ -600,119 +342,10 @@ export default {
                 this.lists.push({key: '实时短期(MW)', value: 'rDq'})
                 this.listsquery.push({key: '实时短期(MW)', value: 'rDq'})
                 break;
-              case 'rCdq':
-                this.lists.push({key: '实时超短期(MW)', value: 'rCdq'})
-                this.listsquery.push({key: '实时超短期(MW)', value: 'rCdq'})
-                break;
-
             }
           }
           for (var i = 0; i < hiddenlist.length; i++) {
             switch (hiddenlist[i]) {
-              case 'globalR':
-                this.listh.push({key: '总辐射(W/㎡)', value: 'globalR'})
-                this.listhquery.push({key: '总辐射(W/㎡)', value: 'globalR'})
-                break;
-              case 'directR':
-                this.listh.push({key: '直辐射(W/㎡)', value: 'directR'})
-                this.listhquery.push({key: '直辐射(W/㎡)', value: 'directR'})
-                break;
-              case 'diffuseR':
-                this.listh.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-                this.listhquery.push({key: '散辐射(W/㎡)', value: 'diffuseR'})
-                break;
-              case 'obliqueR':
-                this.listh.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-                this.listhquery.push({key: '斜辐射(W/㎡)', value: 'obliqueR'})
-                break;
-              case 'wsInst10':
-                this.listh.push({key: '10米风速(m/s)', value: 'wsInst10'})
-                this.listhquery.push({key: '10米风速(m/s)', value: 'wsInst10'})
-                break;
-              case 'wsInst30':
-                this.listh.push({key: '30米风速(m/s)', value: 'wsInst30'})
-                this.listhquery.push({key: '30米风速(m/s)', value: 'wsInst30'})
-                break;
-              case 'wsInst50':
-                this.listh.push({key: '50米风速(m/s)', value: 'wsInst50'})
-                this.listhquery.push({key: '50米风速(m/s)', value: 'wsInst50'})
-                break;
-              case 'wsInst60':
-                this.listh.push({key: '60米风速(m/s)', value: 'wsInst60'})
-                this.listhquery.push({key: '60米风速(m/s)', value: 'wsInst60'})
-                break;
-              case 'wsInst70':
-                this.listh.push({key: '70米风速(m/s)', value: 'wsInst70'})
-                this.listhquery.push({key: '70米风速(m/s)', value: 'wsInst70'})
-                break;
-              case 'wsInst80':
-                this.listh.push({key: '80米风速(m/s)', value: 'wsInst80'})
-                this.listhquery.push({key: '80米风速(m/s)', value: 'wsInst80'})
-                break;
-              case 'wsInst90':
-                this.listh.push({key: '90米风速(m/s)', value: 'wsInst90'})
-                this.listhquery.push({key: '90米风速(m/s)', value: 'wsInst90'})
-                break;
-              case 'wsInst100':
-                this.listh.push({key: '100米风速(m/s)', value: 'wsInst100'})
-                this.listhquery.push({key: '100米风速(m/s)', value: 'wsInst100'})
-                break;
-              case 'wsInst110':
-                this.listh.push({key: '110米风速(m/s)', value: 'wsInst110'})
-                this.listhquery.push({key: '110米风速(m/s)', value: 'wsInst110'})
-                break;
-              case 'wsInst120':
-                this.listh.push({key: '120米风速(m/s)', value: 'wsInst120'})
-                this.listhquery.push({key: '120米风速(m/s)', value: 'wsInst120'})
-                break;
-              case 'wsInstHubHeight':
-                this.listh.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-                this.listhquery.push({key: '轮毂风速(m/s)', value: 'wsInstHubHeight'})
-                break;
-              case 'ws10':
-                this.listh.push({key: this.columns.ws10, value: 'ws10'})
-                this.listhquery.push({key: this.columns.ws10, value: 'ws10'})
-                break;
-              case 'ws30':
-                this.listh.push({key: this.columns.ws30, value: 'ws30'})
-                this.listhquery.push({key: this.columns.ws30, value: 'ws30'})
-                break;
-              case 'ws50':
-                this.listh.push({key: this.columns.ws50, value: 'ws50'})
-                this.listhquery.push({key: this.columns.ws50, value: 'ws50'})
-                break;
-              case 'ws70':
-                this.listh.push({key: this.columns.ws70, value: 'ws70'})
-                this.listhquery.push({key: this.columns.ws70, value: 'ws70'})
-                break;
-              case 'ws80':
-                this.listh.push({key: this.columns.ws80, value: 'ws80'})
-                this.listhquery.push({key: this.columns.ws80, value: 'ws80'})
-                break;
-              case 'ws90':
-                this.listh.push({key: this.columns.ws90, value: 'ws90'})
-                this.listhquery.push({key: this.columns.ws90, value: 'ws90'})
-                break;
-              case 'ws100':
-                this.listh.push({key: this.columns.ws100, value: 'ws100'})
-                this.listhquery.push({key: this.columns.ws100, value: 'ws100'})
-                break;
-              case 'ws170':
-                this.listh.push({key: this.columns.ws170, value: 'ws170'})
-                this.listhquery.push({key: this.columns.ws170, value: 'ws170'})
-                break;
-              case 'swr':
-                this.listh.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-                this.listhquery.push({key: 'nwp辐射(W/㎡)', value: 'swr'})
-                break;
-              case 'directRadiation':
-                this.listh.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-                this.listhquery.push({key: 'nwp直辐射(W/㎡)', value: 'directRadiation'})
-                break;
-              case 'diffuseRadiation':
-                this.listh.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-                this.listhquery.push({key: 'nwp散辐射(W/㎡)', value: 'diffuseRadiation'})
-                break;
               case 'realValue':
                 this.lists.push({key:'实际功率(MW)',value:'realValue'})
                 this.listsquery.push({key:'实际功率(MW)',value:'realValue'})
@@ -721,10 +354,6 @@ export default {
                 this.listh.push({key: '实时短期(MW)', value: 'rDq'})
                 this.listhquery.push({key: '实时短期(MW)', value: 'rDq'})
                 break;
-              case 'rCdq':
-                this.listh.push({key: '实时超短期(MW)', value: 'rCdq'})
-                this.listhquery.push({key: '实时超短期(MW)', value: 'rCdq'})
-                break;
             }
           }
         }
@@ -785,7 +414,7 @@ export default {
       if (isNaN(this.nwpAgo)) {
         this.nwpAgo = 1
       }
-      this.$axios.get('realTimeComprehensiveContrast/' + startTime + '/' + endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime).then((res) => {
+      this.$axios.get('realTimeComprehensiveContrast/' + startTime + '/' + endTime + '/'  + this.jgTime).then((res) => {
 
         this.tableColumn = [
           { field: 'times', title: '时间', width:200},
@@ -795,52 +424,12 @@ export default {
           var colunm = {
             field:this.listsquery[i].value , title: this.listsquery[i].key
           }
-
           this.tableColumn.push(colunm)
-          if(this.listsquery[i].value == 'realValue'&&res.data.displayKyLl=="1"){
-            this.tableColumn.push({ field: 'ableValue', title: '可用功率' })
-            this.tableColumn.push({ field: 'theoryValue', title: '理论功率' })
-            this.tableColumn.push({ field: 'referencePowerBySample', title: '参照功率(样板机)' })
-            this.tableColumn.push({ field: 'referencePowerByMeasuring', title: '参照功率(测风、测光)' })
-          }
         }
-
-
         this.drawData = {
           times: [],
           realValue: [],
-          ableValue: [],
-          referencePowerBySample: [],
-          referencePowerByMeasuring: [],
-          theoryValue: [],
           rDq: [],
-          rCdq: [],
-          directR: [],
-          diffuseR: [],
-          globalR: [],
-          obliqueR: [],
-          wsInst10: [],
-          wsInst30: [],
-          wsInst50: [],
-          wsInst60: [],
-          wsInst70: [],
-          wsInst80: [],
-          wsInst90: [],
-          wsInst100: [],
-          wsInst110: [],
-          wsInst120: [],
-          wsInstHubHeight: [],
-          ws10: [],
-          ws30: [],
-          ws50: [],
-          ws70: [],
-          ws80: [],
-          ws90: [],
-          ws100: [],
-          ws170: [],
-          swr: [],
-          directRadiation: [],
-          diffuseRadiation: [],
           electricField: this.electricField,
           columns: this.columns
         }
@@ -859,138 +448,12 @@ export default {
             this.drawData.realValue.push(data[i].realValue)
             object.realValue = data[i].realValue;
           }
-          if (data[i].ableValue != undefined) {
-            this.drawData.ableValue.push(data[i].ableValue)
-            object.ableValue = data[i].ableValue;
-          }
-          if (data[i].theoryValue != undefined) {
-            this.drawData.theoryValue.push(data[i].theoryValue)
-            object.theoryValue = data[i].theoryValue;
-          }
-          if (data[i].referencePowerBySample != undefined) {
-            this.drawData.referencePowerBySample.push(data[i].referencePowerBySample)
-            object.referencePowerBySample = data[i].referencePowerBySample;
-          }
-          if (data[i].referencePowerByMeasuring != undefined) {
-            this.drawData.referencePowerByMeasuring.push(data[i].referencePowerByMeasuring)
-            object.referencePowerByMeasuring = data[i].referencePowerByMeasuring;
-          }
 
           if (data[i].rDq != undefined) {
             this.drawData.rDq.push(data[i].rDq)
             object.rDq = data[i].rDq;
           }
-          if (data[i].rCdq != undefined) {
-            this.drawData.rCdq.push(data[i].rCdq)
-            object.rCdq = data[i].rCdq;
-          }
 
-          // }
-          // for(let i = 0;i<data1.length;i++){
-          if (data1[i].directR != undefined) {
-            this.drawData.directR.push(data1[i].directR)
-            object.directR = data1[i].directR;
-          }
-          if (data1[i].diffuseR != undefined) {
-            this.drawData.diffuseR.push(data1[i].diffuseR)
-            object.diffuseR = data1[i].diffuseR;
-          }
-          if (data1[i].globalR != undefined) {
-            this.drawData.globalR.push(data1[i].globalR)
-            object.globalR = data1[i].globalR;
-          }
-          if (data1[i].obliqueR != undefined) {
-            this.drawData.obliqueR.push(data1[i].obliqueR)
-            object.obliqueR = data1[i].obliqueR;
-          }
-          if (data1[i].wsInst10 != undefined) {
-            this.drawData.wsInst10.push(data1[i].wsInst10)
-            object.wsInst10 = data1[i].wsInst10;
-          }
-          if (data1[i].wsInst30 != undefined) {
-            this.drawData.wsInst30.push(data1[i].wsInst30)
-            object.wsInst30 = data1[i].wsInst30;
-          }
-          if (data1[i].wsInst50 != undefined) {
-            this.drawData.wsInst50.push(data1[i].wsInst50)
-            object.wsInst50 = data1[i].wsInst50;
-          }
-          if (data1[i].wsInst60 != undefined) {
-            this.drawData.wsInst60.push(data1[i].wsInst60)
-            object.wsInst60 = data1[i].wsInst60;
-          }
-          if (data1[i].wsInst70 != undefined) {
-            this.drawData.wsInst70.push(data1[i].wsInst70)
-            object.wsInst70 = data1[i].wsInst70;
-          }
-          if (data1[i].wsInst80 != undefined) {
-            this.drawData.wsInst80.push(data1[i].wsInst80)
-            object.wsInst80 = data1[i].wsInst80;
-          }
-          if (data1[i].wsInst90 != undefined) {
-            this.drawData.wsInst90.push(data1[i].wsInst90)
-            object.wsInst90 = data1[i].wsInst90;
-          }
-          if (data1[i].wsInst100 != undefined) {
-            this.drawData.wsInst100.push(data1[i].wsInst100)
-            object.wsInst100 = data1[i].wsInst100;
-          }
-          if (data1[i].wsInst110 != undefined) {
-            this.drawData.wsInst110.push(data1[i].wsInst110)
-            object.wsInst110 = data1[i].wsInst110;
-          }
-          if (data1[i].wsInst120 != undefined) {
-            this.drawData.wsInst120.push(data1[i].wsInst120)
-            object.wsInst120 = data1[i].wsInst120;
-          }
-          if (data1[i].wsInstHubHeight != undefined) {
-            this.drawData.wsInstHubHeight.push(data1[i].wsInstHubHeight)
-            object.wsInstHubHeight = data1[i].wsInstHubHeight;
-          }
-          if (data1[i].ws10 != undefined) {
-            this.drawData.ws10.push(data1[i].ws10)
-            object.ws10 = data1[i].ws10;
-          }
-          if (data1[i].ws30 != undefined) {
-            this.drawData.ws30.push(data1[i].ws30)
-            object.ws30 = data1[i].ws30;
-          }
-          if (data1[i].ws50 != undefined) {
-            this.drawData.ws50.push(data1[i].ws50)
-            object.ws50 = data1[i].ws50;
-          }
-          if (data1[i].ws70 != undefined) {
-            this.drawData.ws70.push(data1[i].ws70)
-            object.ws70 = data1[i].ws70;
-          }
-          if (data1[i].ws80 != undefined) {
-            this.drawData.ws80.push(data1[i].ws80)
-            object.ws80 = data1[i].ws80;
-          }
-          if (data1[i].ws90 != undefined) {
-            this.drawData.ws90.push(data1[i].ws90)
-            object.ws90 = data1[i].ws90;
-          }
-          if (data1[i].ws100 != undefined) {
-            this.drawData.ws100.push(data1[i].ws100)
-            object.ws100 = data1[i].ws100;
-          }
-          if (data1[i].ws170 != undefined) {
-            this.drawData.ws170.push(data1[i].ws170)
-            object.ws170 = data1[i].ws170;
-          }
-          if (data1[i].swr != undefined) {
-            this.drawData.swr.push(data1[i].swr)
-            object.swr = data1[i].swr;
-          }
-          if (data1[i].diffuseRadiation != undefined) {
-            this.drawData.diffuseRadiation.push(data1[i].diffuseRadiation)
-            object.diffuseRadiation = data1[i].diffuseRadiation;
-          }
-          if (data1[i].directRadiation != undefined) {
-            this.drawData.directRadiation.push(data1[i].directRadiation)
-            object.directRadiation = data1[i].directRadiation;
-          }
 
           this.tableData.push(object)
 
@@ -1132,118 +595,118 @@ export default {
 
 <style scoped>
 /*.chart-container {*/
-  /*position: relative;*/
-  /*width: 100%;*/
-  /*height: calc(100vh - 50px);*/
+/*position: relative;*/
+/*width: 100%;*/
+/*height: calc(100vh - 50px);*/
 /*}*/
 
 /*.filter {*/
-  /*position: relative;*/
-  /*display: flex;*/
-  /*padding: 20px 0 10px 15px;*/
-  /*font-size: 12px;*/
-  /*line-height: 11px;*/
-  /*color: white;*/
+/*position: relative;*/
+/*display: flex;*/
+/*padding: 20px 0 10px 15px;*/
+/*font-size: 12px;*/
+/*line-height: 11px;*/
+/*color: white;*/
 /*}*/
 
 /*input {*/
-  /*background: transparent;*/
-  /*border: none;*/
-  /*color: white;*/
+/*background: transparent;*/
+/*border: none;*/
+/*color: white;*/
 /*}*/
 
 /*.timeText {*/
-  /*opacity: 0.69;*/
-  /*padding-right: 7px;*/
-  /*font-size: 14px;*/
+/*opacity: 0.69;*/
+/*padding-right: 7px;*/
+/*font-size: 14px;*/
 /*}*/
 
 /*.startTime {*/
-  /*display: inline-block;*/
+/*display: inline-block;*/
 /*}*/
 
 /*.endTime {*/
-  /*display: inline-block;*/
-  /*padding-left: 42px;*/
+/*display: inline-block;*/
+/*padding-left: 42px;*/
 /*}*/
 
 
 /*.timeQuery {*/
-  /*background: transparent;*/
+/*background: transparent;*/
 /*}*/
 
 /*.el-button {*/
-  /*background: transparent;*/
-  /*color: white;*/
+/*background: transparent;*/
+/*color: white;*/
 /*}*/
 
 /*.filter {*/
-  /*width: 100%;*/
-  /*background-color: transparent;*/
-  /*height: 10%*/
+/*width: 100%;*/
+/*background-color: transparent;*/
+/*height: 10%*/
 /*}*/
 
 /*.filter >>> input {*/
-  /*background: transparent;*/
-  /*border: none;*/
-  /*color: white;*/
+/*background: transparent;*/
+/*border: none;*/
+/*color: white;*/
 /*}*/
 
 /*.content {*/
-  /*width: 100%;*/
-  /*background-color: transparent;*/
-  /*height: 90%;*/
-  /*padding-left: 5px;*/
-  /*padding-right: 5px;*/
+/*width: 100%;*/
+/*background-color: transparent;*/
+/*height: 90%;*/
+/*padding-left: 5px;*/
+/*padding-right: 5px;*/
 /*}*/
 
 /*.content >>> .el-tabs__item {*/
-  /*color: white;*/
+/*color: white;*/
 /*}*/
 
 /*.content >>> .el-tabs__item.is-active {*/
-  /*color: #409EFF;*/
+/*color: #409EFF;*/
 /*}*/
 
 
 /*.tableContent {*/
-  /*width: 100%;*/
-  /*height: calc(80vh - 50px);*/
+/*width: 100%;*/
+/*height: calc(80vh - 50px);*/
 /*}*/
 
 /*.tableContent >>> td {*/
-  /*border: 1px solid #ffffff;*/
+/*border: 1px solid #ffffff;*/
 /*}*/
 
 /*.rtPageturning >>> button,*/
 /*.rtPageturning >>> span,*/
 /*.rtPageturning >>> input,*/
 /*.rtPageturning >>> .vxe-pager--btn-wrapper li {*/
-  /*background-color: transparent !important;*/
-  /*color: #ffffff !important;*/
-  /*border: 1px solid #ffffff;*/
+/*background-color: transparent !important;*/
+/*color: #ffffff !important;*/
+/*border: 1px solid #ffffff;*/
 /*}*/
 
 /*.rtPageturning >>> span {*/
-  /*border: none*/
+/*border: none*/
 /*}*/
 
 /*.rtPageturning >>> .vxe-pager--wrapper .vxe-pager--btn-wrapper li:not(.disabled).is--active {*/
-  /*background-color: #9f9fa0 !important;*/
+/*background-color: #9f9fa0 !important;*/
 /*}*/
 
 /*.toolbar {*/
-  /*position: absolute;*/
-  /*right: 0px;*/
+/*position: absolute;*/
+/*right: 0px;*/
 /*}*/
 
 /*.toolbar >>> .vxe-button.type--button.is--circle {*/
-  /*padding: 0 .5em;*/
-  /*min-width: 34px;*/
-  /*border-radius: 10%;*/
-  /*border: none;*/
-  /*background: transparent;*/
-  /*color: white;*/
+/*padding: 0 .5em;*/
+/*min-width: 34px;*/
+/*border-radius: 10%;*/
+/*border: none;*/
+/*background: transparent;*/
+/*color: white;*/
 /*}*/
 
 .drag-box-item {

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

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

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

@@ -0,0 +1,184 @@
+<template>
+  <div style="width: 100%;height: 100%" >
+    <div id="fpcharts"></div>
+  </div>
+</template>
+
+<script>
+  import resize from '../../../../components/Charts/mixins/resize'
+  import echarts from 'echarts'
+  export default {
+    mixins: [resize],
+    watch: {
+      drawData:{
+        handler(newValue, oldValue) {
+          this.draw(newValue.times, newValue.datas,newValue.cap)
+        },
+        deep: true
+      },
+      resizeKey:function(newQuestion, oldQuestion){
+        if(this.chart !=null){
+          this.chart.resize();
+        }
+      }
+    },
+    props: {
+      drawData:{
+        type:Object,
+      },
+      resizeKey:{
+        type:Number
+      }
+    },
+    data() {
+      return {
+        chart: null,
+      }
+    },
+    mounted() {
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      draw(timeaxis,realpower,cap) {
+        this.chart = echarts.init(document.getElementById('fpcharts'))
+        var option ={
+          backgroundColor: 'transparent',
+          title: {
+            top: 20,
+            text: '短期预测实时查询',
+            textStyle: {
+              fontWeight: 'normal',
+              fontSize: 16,
+              color: '#F1F1F3'
+            },
+            left: '1%'
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              lineStyle: {
+                color: '#57617B'
+              }
+            }
+          },
+          legend: {
+            top: 20,
+            icon: 'rect',
+            itemWidth: 14,
+            itemHeight: 5,
+            itemGap: 13,
+            data: ['实时短期预测'],
+            right: '4%',
+            textStyle: {
+              fontSize: 12,
+              color: '#F1F1F3'
+            }
+          },
+          dataZoom: [{
+            show: true,
+            realtime: true,
+            start: 0,
+            end: 100,
+            left:"15%",
+            right:"15%",
+            textStyle:{
+              color:"#ffffff"
+            }
+          }, {
+            type: 'inside'
+          }],
+          grid: {
+            top: 100,
+            left: '2%',
+            right: '2%',
+            bottom: '10%',
+            containLabel: true
+          },
+          xAxis: [{
+            type: 'category',
+            boundaryGap: false,
+            axisLine: {
+              lineStyle: {
+                color: '#ffffff'
+              }
+            },
+            data: timeaxis
+          }],
+          yAxis: [{
+            type: 'value',
+            name: '(MW)',
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              lineStyle: {
+                color: '#ffffff'
+              }
+            },
+            axisLabel: {
+              margin: 10,
+              textStyle: {
+                fontSize: 14
+              }
+            },
+            splitLine: {
+              lineStyle: {
+                color: '#57617B'
+              }
+            }
+          }],
+          series: [{
+            name: '实时短期预测',
+            type: 'line',
+            smooth: true,
+            symbol: 'circle',
+            symbolSize: 5,
+            showSymbol: false,
+            lineStyle: {
+              normal: {
+                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
+              }
+            },
+            itemStyle: {
+              normal: {
+
+                color: 'rgb(50,194,219)',
+                borderColor: 'rgba(50,194,219,0.2)',
+                borderWidth: 12
+              }
+            },
+            data: realpower
+          }]
+        }
+        option.yAxis[0].max = cap
+        this.chart.setOption(option,true)
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  #fpcharts{
+    width: 100%;
+    height:calc(80vh - 50px);
+  }
+</style>

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

@@ -0,0 +1,394 @@
+<template>
+  <div class="chart-container">
+    <div class="filter">
+      <div class="startTime">
+        <span class="timeText">起始时间</span>
+        <el-date-picker
+          v-model="startTime"
+          :clearable="false"
+          type="datetime"
+          value-format="timestamp"
+          placeholder="选择日期">
+        </el-date-picker>
+      </div>
+      <div class="endTime">
+        <span class="timeText">截止时间</span>
+        <el-date-picker
+          v-model="endTime"
+          :clearable="false"
+          type="datetime"
+          value-format="timestamp"
+          placeholder="选择日期">
+        </el-date-picker>
+      </div>
+      <div class="timeQuery">
+        <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 style="background:transparent;border:none"  @click="exportDataEvent"><i class="vxe-icon--download" style="color: white"></i></vxe-button>
+        </template>
+      </vxe-toolbar></div>
+    </div>
+
+    <div class="content">
+      <el-tabs type="card" v-model="activeName" @tab-click="Byresize">
+        <el-tab-pane label="图表" name="first">
+          <chart :drawData = this.drawData :resizeKey=this.resizeKey  />
+        </el-tab-pane>
+        <el-tab-pane label="表格" name="second">
+          <div class="tableContent">
+            <vxe-table
+              id="fstTable"
+              ref="fstRef"
+              border
+              export-config
+              beforeExportMethod=""
+              :loading="loading"
+              @sort-change="sortChangeEvent"
+              :custom-config="{storage: true, checkMethod: checkColumnMethod}"
+              :auto-resize="true"
+              highlight-hover-row
+              :header-cell-style="{background:'black',color:'white',border:'white'}"
+              max-height="90%"
+              :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="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="predictionModelEnum" title="预测模型" min-width="60" :formatter="enumToWord"></vxe-table-column>-->
+            </vxe-table>
+            <div class="rtPageturning">
+              <vxe-pager
+                background
+                :loading="loading"
+                :current-page="currentPage"
+                :page-size="pageSize"
+                :total="total"
+                @page-change="handlePageChange"
+                :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']">
+              </vxe-pager>
+            </div>
+          </div>
+          <!-- <Table height="100%" width="100%" :queryTime=this.queryTime @sendLoading="getLoadingFormTable"></Table>-->
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Chart from './charts'
+  import resize from '../../../components/Charts/mixins/resize'
+  import moment from "moment";
+  export default {
+    name: 'nwp',
+    components: { Chart},
+    mixins: [resize],
+    data(){
+      return{
+        chart: null,
+        queryStartTime:'',
+        queryEndTime:'',
+        startTime:new Date(new Date().toLocaleDateString()).getTime()+ 60 * 60 * 24 * 1000,
+        endTime:new Date(new Date().toLocaleDateString()).getTime() + 60 * 60 * 24 * 1000*4-1,
+        loading:true,
+        drawLoading:true,
+        tableLoading:true,
+        resizeKey:1,
+        activeName: 'first',
+        drawData:{datas:[],times:[]},
+        tableData:[],
+        total:0,
+        sortOrder:'asc',
+        pageSize: 10,
+        currentPage: 1,
+        showToolBar:false,
+        /*menuKey:1,
+        isRenderingTime : new Date().getTime()*/
+
+      }
+    },
+    created () {
+      this.$nextTick(() => {
+        // 手动将表格和工具栏进行关联
+        this.$refs.fstRef.connect(this.$refs.fstToolBar)
+      })
+    },
+    mounted() {
+      this.getPageSize()
+
+
+    },
+    methods:{
+        exportDataEvent() {
+          this.loading = true
+          const params = new URLSearchParams()
+          params.append('startTime', this.queryStartTime)
+          params.append('endTime', this.queryEndTime)
+          params.append('eqId', this.equipmentId)
+          this.$axios.get('/exportFile/exportForecastPowerShortTerm/'+this.queryStartTime+"/"+this.queryEndTime, {
+            responseType: 'blob'// 用于解决中文乱码
+          }).then((response) => {
+            this.loading = false
+          }).catch((error) => {
+            this.loading = false
+            this.$message.error('导出失败' + error)
+          })
+        },
+
+      getPageSize(){
+        this.$axios.get('displayConfig/pageSize').then((res) => {
+          this.displayConfigPageSize = res.data
+          this.pageSize = parseInt(this.displayConfigPageSize.showCode)
+          // this.$message.success('PageSize获取成功' )
+          this.init()
+        }).catch((error) => {
+          this.$message.error('PageSize获取出错' + error)
+        })
+
+      },
+      init(){
+        this.queryStartTime = this.startTime
+        this.queryEndTime = this.endTime
+        this.loading = true
+        this.getDraw(this.queryStartTime,this.queryEndTime)
+        this.getTable()
+
+      },
+      getDraw(startTime,endTime){
+        this.drawLoading = true
+        this.$axios.get('/forecastPowerShortTermOne/'+startTime+'/'+endTime).then((res) => {
+          this.drawData = res.data
+          this.drawLoading = false
+          if(!this.drawLoading && !this.tableLoading){
+            this.loading = false
+          }
+        }).catch((error) => {
+          this.drawLoading = false
+          if(!this.drawLoading && !this.tableLoading){
+            this.loading = false
+          }
+          this.$message.error('查询实时预测短期echarts出错' + error)
+        })
+      },
+      getTable(){
+        this.tableLoading = true
+        this.$axios.get('/forecastPowerShortTermOne/'+this.queryStartTime+'/'+this.queryEndTime+'/'+this.currentPage+'/'+this.pageSize+'?sortOrder='+this.sortOrder).then((res) => {
+          this.tableData = res.data.content
+          // 表分页格数据总条数
+          this.total = res.data.count
+          this.tableLoading = false
+          if(!this.drawLoading && !this.tableLoading){
+            this.loading = false
+          }
+        }).catch((error) => {
+          this.tableLoading = false
+          if(!this.drawLoading && !this.tableLoading){
+            this.loading = false
+          }
+          this.$message.error('查询table出错' + error)
+        })
+
+      },
+      handlePageChange ({ currentPage, pageSize }) {
+        this.currentPage = currentPage
+        if(this.pageSize!=pageSize){
+          this.changePageSize(pageSize)
+        }
+        this.pageSize = pageSize
+        this.startTime = this.queryStartTime
+        this.endTime = this.queryEndTime
+        this.loading = true
+        this.getTable();
+      },
+      changePageSize(pageSize){
+        this.displayConfigPageSize.showCode = pageSize
+        this.$axios.post('displayConfig/',this.displayConfigPageSize).then((res) => {
+          this.displayConfigPageSize = res.data
+          // this.$message.success('PageSize设置成功' )
+          this.dialogVisible = false
+        }).catch((error) => {
+          this.$message.error('PageSize设置出错' + error)
+        })
+      },
+      dateFormat({ cellValue, row, column }) {
+        return this.$XEUtils.toDateString(cellValue, 'yyyy-MM-dd HH:mm:ss')
+      },
+      enumToWord({ cellValue, row, column }) {
+        if(cellValue == "E1"){
+          return "云端模型"
+        }
+        if(cellValue == 'E2'){
+          return "物理模型"
+        }
+        if(cellValue == 'E3'){
+          return "统计模型"
+        }
+        if(cellValue == 'E4'){
+          return "补录数据"
+        }
+        if(cellValue == 'E5'){
+          return "差值模型"
+        }
+      },
+      dateMoment({ cellValue, row, column }) {
+        return moment(cellValue).format('YYYY-MM-DD HH:mm:ss')
+      },
+      sortChangeEvent ({ column, property, order }) {
+        if(order == null){
+          order = 'asc'
+        }
+        this.currentPage = 1
+        this.sortOrder = order
+        this.loading = true
+        this.getTable()
+      },
+
+      checkColumnMethod ({ column }) {
+        if (column.property === 'preTime') {
+          return false
+        }
+        return true
+      },
+      dateQuery(){
+        this.loading = true
+        if(this.endTime<=this.startTime){
+          this.$message.error("开始时间不能大于结束时间")
+          this.startTime = this.queryStartTime
+          this.endTime = this.queryEndTime
+          this.loading = false
+          return
+        }
+        if(this.endTime-this.startTime> 60 * 60 * 24 * 1000*31){
+          this.startTime = this.queryStartTime
+          this.endTime = this.queryEndTime
+          this.$message.error("只能最多查询31天的数据哦")
+          this.loading = false
+          return
+        }
+        this.queryStartTime = this.startTime
+        this.queryEndTime = this.endTime
+        this.getDraw(this.queryStartTime,this.queryEndTime)
+        this.getTable()
+      },
+      Byresize(tab){
+        if(tab.name =='first'){
+          this.resizeKey++
+          this.showToolBar = false
+        }else{
+          this.showToolBar = true
+        }
+
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .chart-container{
+    position:relative;
+    width:100%;
+    height:calc(100vh - 50px);
+  }
+
+  .filter{
+    position:relative;
+    display:flex;
+    padding:20px 0 10px 15px;
+    font-size:12px;
+    line-height:11px;
+    color:white;
+  }
+
+  input{
+    background:transparent;
+    border:none;
+    color:white;
+  }
+
+  .timeText{
+    opacity:0.69;
+    padding-right:7px;
+    font-size:14px;
+  }
+
+  .startTime{
+    display:inline-block;
+  }
+
+  .endTime{
+    display:inline-block;
+    padding-left:42px;
+  }
+
+
+  .timeQuery{
+    background:transparent;
+  }
+
+  .el-button{
+    background:transparent;
+    color:white;
+  }
+  .filter{
+    width: 100%;background-color: transparent;height: 10%
+  }
+  .filter >>> input{
+    background:transparent;
+    border:none;
+    color:white;
+  }
+  .content{
+    width: 100%;
+    background-color: transparent;
+    height: 90%;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+  .content >>> .el-tabs__item{
+    color: white;
+  }
+  .content >>> .el-tabs__item.is-active {
+    color: #409EFF;
+  }
+
+
+  .tableContent{
+    width: 100%;
+    height:calc(80vh - 50px);
+  }
+  .tableContent >>> td{
+    border:1px solid #ffffff;
+  }
+
+  .rtPageturning >>> button,
+  .rtPageturning >>> span,
+  .rtPageturning >>> input,
+  .rtPageturning >>> .vxe-pager--btn-wrapper li{
+    background-color: transparent !important;
+    color: #ffffff !important;
+    border: 1px solid #ffffff;
+  }
+  .rtPageturning >>> span{
+    border:none
+  }
+  .rtPageturning >>> .vxe-pager--wrapper .vxe-pager--btn-wrapper li:not(.disabled).is--active {
+    background-color: #9f9fa0 !important;
+  }
+  .toolbar{
+    position:absolute;right:0px;
+  }
+  .toolbar >>> .vxe-button.type--button.is--circle {
+    padding: 0 .5em;
+    min-width: 34px;
+    border-radius: 10%;
+    border: none;
+    background: transparent;
+    color: white;
+  }
+
+
+</style>
+

+ 171 - 0
ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ForecastPowerShortTermOneController.java

@@ -0,0 +1,171 @@
+package com.jiayue.ipfcst.controller;
+
+import com.jiayue.ipfcst.common.core.exception.BusinessException;
+import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.entity.ElectricField;
+import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTerm;
+import com.jiayue.ipfcst.common.data.entity.ForecastPowerShortTermOne;
+import com.jiayue.ipfcst.common.data.entity.Nwp;
+import com.jiayue.ipfcst.service.ElectricFieldService;
+import com.jiayue.ipfcst.service.ForecastPowerShortTermOneService;
+import com.jiayue.ipfcst.service.ForecastPowerShortTermService;
+import com.jiayue.ipfcst.service.NwpService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 短期预测信息restful接口
+ *
+ * @author yh
+ * @version 1.0
+ * @since 2019/8/7 10:12
+ */
+@RestController
+@Slf4j
+public class ForecastPowerShortTermOneController {
+  private final ForecastPowerShortTermOneService forecastPowerShortTermOneService;
+  private final ElectricFieldService electricFieldService;
+  private final NwpService nwpService;
+  @Autowired
+  public ForecastPowerShortTermOneController(ForecastPowerShortTermService forecastPowerShortTermService, ForecastPowerShortTermOneService forecastPowerShortTermOneService, ElectricFieldService electricFieldService, NwpService nwpService){
+    this.forecastPowerShortTermOneService = forecastPowerShortTermOneService;
+    this.electricFieldService = electricFieldService;
+    this.nwpService = nwpService;
+  }
+
+  /**
+   * 按时间查询实时预测短期 yh
+   * @param startTime 开始时间
+   * @param endTime 结束时间
+   * @return 结果集
+   */
+  @GetMapping(value = "/forecastPowerShortTermOne/{startTime}/{endTime}")
+  public ResponseVO findByForecastTimeBetween(@PathVariable("startTime") Long startTime,
+                                          @PathVariable("endTime") Long endTime){
+    Map<String,Object> map = new HashMap<>();
+    try{
+      map = forecastPowerShortTermOneService.findByForecastTimeBetween(startTime,endTime);
+      return ResponseVO.success(map);
+    }catch(Exception e){
+      e.printStackTrace();
+      return ResponseVO.fail(e.getMessage());
+    }
+  }
+
+  /**
+   * 分页查询  实时短期预测
+   * @param startTime 开始时间
+   * @param endTime 结束时间
+   * @param page 页码
+   * @param size 条数
+   * @param sortOrder 排序
+   * @return
+   */
+  @GetMapping(value = "/forecastPowerShortTermOne/{startTime}/{endTime}/{page}/{size}")
+  public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
+                                               @PathVariable("endTime") Long endTime,
+                                               @PathVariable("page") Integer page,
+                                               @PathVariable("size") Integer size,
+                                               String sortOrder){
+    Map<String,Object> map = new HashMap<>();
+    try{
+      map =  forecastPowerShortTermOneService.findByTimeBetweenAndNoForPaging(startTime,endTime,page,size,sortOrder);
+      return ResponseVO.success(map);
+    }catch(Exception e){
+      e.printStackTrace();
+      return ResponseVO.fail(e.toString());
+    }
+  }
+  /**
+   *根据条件查询
+   * @param startTimeStr 开始时间
+   * @return map
+   */
+  @GetMapping(value = "/forecastPowerShortTermOne/getElectricEnergyTotal/{startTimeStr}")
+  public ResponseVO getElectricEnergyTotal(@PathVariable("startTimeStr") Long startTimeStr) throws BusinessException {
+
+    Map<String,Map<String,String>> map = new HashMap<>();
+    Map<String,String> mapDay = new HashMap<>();
+    Map<String,String> nwpDay = new HashMap<>();
+    Map<String,String> mapDate = new HashMap<>();
+    Map<String,String> type = new HashMap<>();
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    BigDecimal radio = new BigDecimal(0.025);
+    Date date;
+    String dateStr;
+    String[] datas;
+    int a;
+    BigDecimal sumValue;
+    BigDecimal sumNwp;
+    ElectricField electricField = electricFieldService.get();
+    List<ForecastPowerShortTermOne> sendDataForTimeBetween = forecastPowerShortTermOneService.findSendDataForTimeBetween(startTimeStr, startTimeStr + 1000 * 60 * 60 * 24 * 7 - 1000 * 60 * 15);
+    //累计发电量公式  发电量= 预测值*0.25*0.1  累加96个点的发电量得出1天的累计发电量
+    for(int i = 1;i<=7;i++){
+      String key = "day"+i;
+      String nwpKey = "nwpKey"+i;
+      sumValue = new BigDecimal(0);
+      sumNwp = new BigDecimal(0);
+      date = new Date(startTimeStr+1000*60*60*24*(i-1));
+      dateStr = sdf.format(date);
+      mapDate.put("date"+i,dateStr);
+      datas = forecastPowerShortTermOneService.findSendData(startTimeStr+1000*60*60*24*(i-1),startTimeStr+1000*60*60*24*i-1000*60*15,sendDataForTimeBetween);
+      List<Nwp> nwpList = nwpService.findByTimeBetween(startTimeStr+1000*60*60*24*(i-1),startTimeStr+1000*60*60*24*i-1000*60*15);
+      //预测发电量
+      if(datas.length>0){
+        BigDecimal value;
+        for(String s:datas){
+          if(s!=null){
+            value = new BigDecimal(s).multiply(radio).setScale(3, BigDecimal.ROUND_HALF_UP);
+            sumValue = sumValue.add(value);
+          }
+        }
+        mapDay.put(key,sumValue.toString());
+      }else{
+        mapDay.put(key,"0");
+      }
+      //预测平均风速/预测辐射值
+      if(nwpList.size()>0){
+        BigDecimal nwp = new BigDecimal(0);
+        if(electricField.getElectricFieldTypeEnum().getCode() == 1){
+          //光
+          //辐射累计值=sum累加(辐射瞬时值*1*60/10的六次方),计算的时间分辨率是1分钟。
+          for(Nwp n : nwpList){
+            nwp = n.getSwr().multiply(new BigDecimal(15)).multiply(new BigDecimal(60)).divide(new BigDecimal(1000000), 2, BigDecimal.ROUND_HALF_UP);
+           sumNwp = sumNwp.add(nwp);
+          }
+        nwpDay.put(nwpKey,sumNwp.toString());
+        }else {
+          //风
+          //风速平均值
+        for (Nwp n : nwpList){
+          nwp = nwp.add(n.getWs100());
+        }
+        sumNwp = nwp.divide(BigDecimal.valueOf(nwpList.size()),2, BigDecimal.ROUND_HALF_UP);
+        nwpDay.put(nwpKey,sumNwp.toString());
+        }
+      }else{
+        nwpDay.put(nwpKey,"0");
+      }
+
+    }
+    type.put("elType",electricField.getElectricFieldTypeEnum().getCode().toString());
+    map.put("nwpDay",nwpDay);
+    map.put("nwpDate",mapDate);
+    map.put("mapDay",mapDay);
+    map.put("mapDate",mapDate);
+    map.put("type",type);
+    return ResponseVO.success(map);
+
+  }
+
+}