功率曲线

ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue

@@ -22,17 +22,22 @@
                         <el-date-picker
                             class="datetime-picker"
                             v-model="statAnalysisTime"
-                            :type="statAnalysisInterval == '1d' ? 'daterange' : 'datetimerange'"
+                            type="datetimerange"
-                            :value-format="statAnalysisInterval == '1d' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'"
+                            value-format="YYYY-MM-DD HH:mm:ss"
                             :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
                             :teleported="false"
                             :shortcuts="shortcuts"
                         />
                     </div>
                     <div class="selectPart">
-                        <span>{{ t('statAnalysis.interval') }}</span>
+                        <span>风速来源</span>
-                        <el-select v-model="statAnalysisInterval" :placeholder="'请选择' + t('statAnalysis.interval')" class="statAnalysisSelect">
+                        <el-select v-model="statAnalysisSpeedSource" placeholder="请选择风速来源" class="statAnalysisSelect">
-                            <el-option v-for="v in statAnalysisSelectOptions.interval" :key="v.value" :label="v.label" :value="v.value"></el-option>
+                            <el-option
+                                v-for="v in statAnalysisSelectOptions.speedSource"
+                                :key="v.value"
+                                :label="v.label"
+                                :value="v.value"
+                            ></el-option>
                         </el-select>
                     </div>
                     <div class="selectPart">
@@ -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: [
+    speedSource: [
-        { label: '一分钟', value: '1m' },
+        { label: '原始风速', value: 'AvgWindSpeed_10min' },
-        { label: '五分钟', value: '5m' },
+        { label: '处理后风速', value: 'AvgWindSpeedCal_10min' },
-        { label: '十分钟', value: '10m' },
-        { label: '十五分钟', value: '15m' },
-        { label: '一小时', value: '1h' },
-        { label: '一天', value: '1d' },
-        { label: '原始', value: 'NONE' },
     ],
     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 iGenPower = resData0['AvgActivePower_10min']['values']
-                const iWindSpeed = resData0['iWindSpeed']['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')