diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
index 79da17a2..5bb94d49 100644
--- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
+++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue
@@ -22,17 +22,22 @@
- {{ t('statAnalysis.interval') }}
-
-
+ 风速来源
+
+
@@ -73,17 +78,12 @@ const { t } = useI18n()
const statAnalysisFatory = ref('')
const statAnalysisFatoryList: any = ref([])
-const statAnalysisInterval = ref('1h')
+const statAnalysisSpeedSource = ref('AvgWindSpeed_10min')
const statAnalysisDeviceId = ref('')
const statAnalysisSelectOptions: any = reactive({
- interval: [
- { label: '一分钟', value: '1m' },
- { label: '五分钟', value: '5m' },
- { label: '十分钟', value: '10m' },
- { label: '十五分钟', value: '15m' },
- { label: '一小时', value: '1h' },
- { label: '一天', value: '1d' },
- { label: '原始', value: 'NONE' },
+ speedSource: [
+ { label: '原始风速', value: 'AvgWindSpeed_10min' },
+ { label: '处理后风速', value: 'AvgWindSpeedCal_10min' },
],
deviceId: [],
})
@@ -278,10 +278,9 @@ const statAnalysisOperate = () => {
devices: [
{
deviceId: deviceId,
- attributes: ['iGenPower', 'iWindSpeed'],
+ attributes: [statAnalysisSpeedSource.value, 'AvgActivePower_10min'],
},
],
- interval: statAnalysisInterval.value || '5m',
startTime: new Date(statAnalysisTime.value[0]).getTime(),
endTime: new Date(statAnalysisTime.value[1]).getTime(),
}
@@ -323,8 +322,8 @@ const statAnalysisOperate = () => {
const resData0 = results[1][statAnalysisDeviceId.value.split(':')[2]]
const resData1 = results[0]
if (resData0) {
- const iGenPower = resData0['iGenPower']['values']
- const iWindSpeed = resData0['iWindSpeed']['values']
+ const iGenPower = resData0['AvgActivePower_10min']['values']
+ const iWindSpeed = resData0[statAnalysisSpeedSource.value]['values']
if (!iWindSpeed.length) {
ElMessage.info(`实时值数据为空`)
} else {
@@ -336,7 +335,7 @@ const statAnalysisOperate = () => {
})
const series = {
- type: 'line',
+ type: 'scatter',
data: seriesData,
name: '实际值',
smooth: true,
@@ -356,6 +355,8 @@ const statAnalysisOperate = () => {
name: '理论值',
smooth: true,
animation: false,
+ symbolSize: 0.1,
+ symbol: 'circle',
}
option.series.push(series)
option.legend.data.push('理论值')
@@ -374,16 +375,14 @@ const statAnalysisExport = () => {
devices: [
{
deviceId: statAnalysisDeviceId.value.split(':')[2],
- attributes: ['iGenPower', 'iWindSpeed'],
+ attributes: [statAnalysisSpeedSource.value, 'AvgActivePower_10min'],
},
],
- interval: statAnalysisInterval.value || '5m',
startTime: new Date(statAnalysisTime.value[0]).getTime(),
endTime: new Date(statAnalysisTime.value[1]).getTime(),
madeinfactory: params.split(':')[0],
model: params.split(':')[1],
}
- console.log(requestData)
powerCurveExport(requestData).then((res: any) => {
const downloadUrl = window.URL.createObjectURL(res)
const a = document.createElement('a')