重构

src/views/ems/dzjk/home/WeekChart.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 {getSevenChargeData} from '@/api/ems/dzjk'
+import {getProjectDisplayData} from '@/api/ems/dzjk'
+import {getPointConfigCurve} from '@/api/ems/site'
 
 export default {
   mixins: [resize],
@@ -45,8 +46,34 @@ export default {
     getWeekKData() {
       this.showLoading()
       const {siteId, timeRange} = this
-      getSevenChargeData({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) {
@@ -65,18 +92,23 @@ export default {
     hideLoading() {
       this.chart && this.chart.hideLoading()
     },
-    setOption(data, unit) {
-      const source = [['日期', '充电量', '放电量']]
-      data.forEach(item => {
-        source.push([item.ammeterDate, item.chargedCap, item.disChargedCap])
-      })
+    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 && this.chart.setOption({
         color: ['#4472c4', '#70ad47'],//所有充放电颜色保持统一
         tooltip: {
           trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          axisPointer: { type: 'cross' }
         },
         grid: {
           containLabel: true
@@ -86,9 +118,7 @@ export default {
           bottom: '15',
         },
         xAxis: {
-          type: 'category',
-          name: unit,
-          nameLocation: 'center'
+          type: 'time'
         },
         yAxis: [{
           type: 'value',
@@ -100,19 +130,12 @@ export default {
             onZero: false
           }
         }],
-        dataset: {
-          source
-        },
-        series: [
-          {
-            yAxisIndex: 0,
-            type: 'bar',
-          },
-          {
-            yAxisIndex: 0,
-            type: 'bar',
-          },
-        ]
+        series: seriesData.map(item => ({
+          name: item.name,
+          yAxisIndex: 0,
+          type: 'bar',
+          data: item.data
+        }))
       })
     }
   }