重构

src/views/ems/dzjk/home/ActiveChart.vue

@@ -12,7 +12,8 @@
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
-import {getPointData} from '@/api/ems/dzjk'
+import {getProjectDisplayData} from '@/api/ems/dzjk'
+import {getPointConfigCurve} from '@/api/ems/site'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
@@ -48,8 +49,34 @@ export default {
     getGVQXData() {
       this.showLoading()
       const {siteId, timeRange} = this
-      getPointData({siteId, startDate: timeRange[0], endDate: timeRange[1]}).then(response => {
-        this.setOption(response?.data || [])
+      getProjectDisplayData(siteId).then(response => {
+        const displayData = response?.data || []
+        const sectionRows = displayData.filter(item =>
+          item && item.sectionName === '当日功率曲线' && item.useFixedDisplay !== 1 && item.dataPoint
+        )
+        const tasks = sectionRows.map(row => {
+          const pointId = String(row.dataPoint || '').trim()
+          if (!pointId) return Promise.resolve(null)
+          return getPointConfigCurve({
+            siteId,
+            pointId,
+            pointType: 'data',
+            rangeType: 'custom',
+            startTime: this.normalizeDateTime(timeRange[0], false),
+            endTime: this.normalizeDateTime(timeRange[1], true)
+          }).then(curveResponse => {
+            const list = curveResponse?.data || []
+            return {
+              name: row.fieldName || row.fieldCode || pointId,
+              data: list
+                .map(item => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
+                .filter(item => item[0] && !Number.isNaN(item[1]))
+            }
+          }).catch(() => null)
+        })
+        return Promise.all(tasks)
+      }).then(series => {
+        this.setOption((series || []).filter(Boolean))
       }).finally(() => this.hideLoading())
     },
     init(siteId) {
@@ -70,12 +97,18 @@ export default {
     hideLoading() {
       this.chart && this.chart.hideLoading()
     },
-    setOption(data) {
-      const source = [['日期', '电网功率', '负载功率', '储能功率', '光伏功率', 'soc平均值', 'soh平均值', '电池平均温度平均值']]
-      console.log('source.slice(1)', source[0].slice(1))
-      this.chart && data.forEach((item) => {
-        source.push([item.statisDate, item.gridPower, item.loadPower, item.storagePower, item.pvPower, item.avgSoc, item.avgSoh, item.avgTemp])
-      })
+    normalizeDateTime(value, endOfDay) {
+      const raw = String(value || '').trim()
+      if (!raw) return ''
+      if (raw.includes(' ')) return raw
+      return `${raw} ${endOfDay ? '23:59:59' : '00:00:00'}`
+    },
+    parseToTimestamp(value) {
+      if (!value) return null
+      const t = new Date(value).getTime()
+      return Number.isNaN(t) ? null : t
+    },
+    setOption(seriesData = []) {
       this.chart.setOption({
         grid: {
           containLabel: true
@@ -86,35 +119,28 @@ export default {
         },
         tooltip: {
           trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          axisPointer: { type: 'cross' }
         },
         textStyle: {
           color: "#333333",
         },
         xAxis: {
-          type: 'category',
+          type: 'time',
         },
-        yAxis: [
-          {
-            type: 'value',
-          },
-          {
-            type: 'value',
-          },
-        ],
-        dataset: {source},
-        series: source[0].slice(1).map((item, index) => {
+        yAxis: [{
+          type: 'value',
+        }],
+        series: seriesData.map((item) => {
           return {
-            type: 'line',//index === 5 ? 'bar' : 'line',
+            name: item.name,
+            type: 'line',
             showSymbol: false,
             symbolSize: 2,
             smooth: true,
             areaStyle: {
               opacity: 0.5,
             },
-            yAxisIndex: index <= 4 ? 0 : 1
+            data: item.data
           }
         })
       })
@@ -124,4 +150,3 @@ export default {
 }
 
 </script>
-