重构

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

@@ -42,7 +42,7 @@
                   class="sjgl-col power-col"
               >
                 <div class="sjgl-wrapper">
-                  <div class="sjgl-title">装机功率(MW)</div>
+                  <div class="sjgl-title">装机功率(MWh)</div>
                   <div class="sjgl-value">
                     <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
                     <span v-else>{{ info.installPower | formatNumber }}</span>
@@ -54,7 +54,7 @@
                   class="sjgl-col power-col"
               >
                 <div class="sjgl-wrapper">
-                  <div class="sjgl-title">装机容量(MW)</div>
+                  <div class="sjgl-title">装机容量(MWh)</div>
                   <div class="sjgl-value">
                     <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
                     <span v-else>{{ info.installCapacity | formatNumber }}</span>
@@ -151,7 +151,7 @@
 <script>
 import * as echarts from "echarts";
 import {getSingleSiteBaseInfo} from "@/api/ems/zddt";
-import {getDzjkHomeView, getProjectDisplayData} from "@/api/ems/dzjk";
+import {getDzjkHomeTotalView, getProjectDisplayData} from "@/api/ems/dzjk";
 import {getPointConfigCurve} from "@/api/ems/site";
 import WeekChart from "./WeekChart.vue";
 import ActiveChart from "./ActiveChart.vue";
@@ -482,7 +482,7 @@ export default {
         this.setRunningInfoLoading(true);
       }
       return Promise.all([
-        getDzjkHomeView(this.siteId),
+        getDzjkHomeTotalView(this.siteId),
         getProjectDisplayData(this.siteId),
       ]).then(([homeResponse, displayResponse]) => {
         const nextRunningInfo = homeResponse?.data || {};

src/views/ems/dzjk/tjbb/dbbb/index.vue

@@ -149,7 +149,7 @@ export default {
     exportTable() {
       if (!this.dateRange?.length) return
       const [startTime, endTime] = this.dateRange
-      this.download('ems/statsReport/exportAmmeterData', {
+      this.download('ems/statsReport/exportAmmeterDataFromDaily', {
         siteId: this.siteId,
         startTime,
         endTime,

src/views/ems/dzjk/tjbb/sybb/index.vue

@@ -39,6 +39,17 @@
             label="日期"
             min-width="100px" align="center">
         </el-table-column>
+        <el-table-column
+            prop="dayType"
+            label="日期类型"
+            min-width="100px" align="center">
+        </el-table-column>
+        <el-table-column
+            prop="weatherDesc"
+            label="天气情况"
+            min-width="180px"
+            align="center">
+        </el-table-column>
       </el-table-column>
       <!--充电量列-->
       <el-table-column label="充电价格" align="center">
@@ -187,8 +198,9 @@ export default {
       const {siteId, pageNum, pageSize} = this
       const [startTime = '', endTime = ''] = (this.dateRange || [])
       getAmmeterRevenueData({siteId: siteId, startTime, endTime, pageSize, pageNum}).then(response => {
-        this.tableData = response?.rows || [];
+        const rows = response?.rows || [];
         this.totalSize = response?.total || 0
+        this.tableData = rows
       }).finally(() => {
         this.loading = false
       })