From d45adba0df6e42887591314bc7d347984d5034a0 Mon Sep 17 00:00:00 2001
From: xiaoyang <17515057146@163.com>
Date: Tue, 21 Apr 2026 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E6=80=BB=E7=B4=AF=E8=AE=A1?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=BA=E7=94=B5=E8=A1=A8=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/dzjk.js               |   8 +
 src/views/ems/dzjk/home/index.vue | 238 ++++++++----------------------
 2 files changed, 71 insertions(+), 175 deletions(-)

diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js
index c44e6d2..174edfd 100644
--- a/src/api/ems/dzjk.js
+++ b/src/api/ems/dzjk.js
@@ -16,6 +16,14 @@ export function getDzjkHomeTotalView(siteId) {
     })
 }
 
+// 获取单个站点首页总累计运行数据（首页专用）
+export function getDzjkHomeRunningData(siteId) {
+    return request({
+        url: `/ems/siteMonitor/homeRunningData?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
 // 鍗曠珯鐩戞帶椤圭洰鐐逛綅閰嶇疆锛堜緵鍗曠珯鐩戞帶鍔熻兘鏌ヨ锛?
 export function getProjectPointMapping(siteId) {
     return request({
diff --git a/src/views/ems/dzjk/home/index.vue b/src/views/ems/dzjk/home/index.vue
index 73dd427..9e1781a 100644
--- a/src/views/ems/dzjk/home/index.vue
+++ b/src/views/ems/dzjk/home/index.vue
@@ -1,8 +1,8 @@
-<template>
+<template>
   <div>
     <el-row style="background: #fff" class="row-container" :gutter="15">
       <el-col :xs="24" :sm="24" :lg="5">
-        <!--      站点信息-->
+        <!-- 站点信息 -->
         <el-card
             shadow="always"
             class="common-card-container common-card-container-body-no-padding"
@@ -16,7 +16,7 @@
           <div
               style="box-sizing: border-box; height: 218px; padding: 20px 15px"
           >
-            <!--            地址、运行时间-->
+            <!-- 地址、运行时间 -->
             <div class="site-info site-info-address">
               <div class="title">
                 <i class="el-icon-location"></i>
@@ -35,7 +35,7 @@
                 <span v-else>{{ info.runningTime || '-' }}</span>
               </div>
             </div>
-            <!--      装机功率、容量      -->
+            <!-- 装机功率、容量 -->
             <el-row :gutter="10" style="margin-top:20px;">
               <el-col
                   :span="12"
@@ -65,7 +65,7 @@
           </div>
         </el-card>
       </el-col>
-      <!--      总累计运行数据-->
+      <!-- 总累计运行数据 -->
       <el-col :xs="24" :sm="24" :lg="19">
         <el-card
             shadow="always"
@@ -151,7 +151,7 @@
 <script>
 import * as echarts from "echarts";
 import {getSingleSiteBaseInfo} from "@/api/ems/zddt";
-import {getAmmeterData, getDzjkHomeTotalView, getProjectDisplayData} from "@/api/ems/dzjk";
+import {getDzjkHomeRunningData, getProjectDisplayData} from "@/api/ems/dzjk";
 import {getPointConfigCurve} from "@/api/ems/site";
 import WeekChart from "./WeekChart.vue";
 import ActiveChart from "./ActiveChart.vue";
@@ -225,11 +225,15 @@ export default {
           attr: "yesterdayRevenue",
           color: '#f67438'
         },
+        {
+          title: "总收入（元）",
+          attr: "totalRevenue",
+          color: '#f67438'
+        },
       ],
-      info: {}, //基本信息
-      runningInfo: {}, //总累计运行数据+报警表格
-      runningDisplayData: [], //单站监控项目配置展示数据
-      ammeterDailySummary: {},
+      info: {},
+      runningInfo: {},
+      runningDisplayData: [],
     };
   },
   computed: {
@@ -238,40 +242,21 @@ export default {
     },
     isRunningInfoLoading() {
       const state = this.$data || {};
-      return !!(state.runningInfoLoading || state.runningUpdateSpinning || state.loading);
+      return !!(state.runningInfoLoading || state.loading);
     },
     tableData() {
       return this.runningInfo?.siteMonitorHomeAlarmVo || [];
     },
-    totalRunningSectionData() {
-      return (this.runningDisplayData || []).filter(item => item.sectionName === "总累计运行数据");
-    },
     totalRevenueDisplayItem() {
-      const sectionData = this.totalRunningSectionData || [];
-      const byFieldCode = sectionData.find(item => item.fieldCode === "totalRevenue");
-      if (byFieldCode) {
-        return byFieldCode;
-      }
-      return sectionData.find(item => item.fieldName === "总收入");
+      return this.fallbackSjglData.find(item => item.attr === "totalRevenue") || null;
     },
     totalRevenueDisplayValue() {
-      return this.totalRevenueDisplayItem ? this.totalRevenueDisplayItem.fieldValue : this.runningInfo.totalRevenue;
+      return this.runningInfo.totalRevenue;
     },
     runningDataCards() {
-      const sectionData = this.totalRunningSectionData || [];
-      if (sectionData.length > 0) {
-        const revenueFieldCode = this.totalRevenueDisplayItem ? this.totalRevenueDisplayItem.fieldCode : "";
-        return sectionData
-            .filter(item => item.fieldCode !== revenueFieldCode)
-            .map((item, index) => ({
-              title: item.fieldName,
-              value: this.getRunningCardValue(item),
-              color: this.getCardColor(index),
-              loading: this.isRunningInfoLoading,
-              raw: item,
-            }));
-      }
-      return this.fallbackSjglData.map(item => ({
+      return this.fallbackSjglData
+        .filter(item => item.attr !== "totalRevenue")
+        .map(item => ({
         title: item.title,
         value: this.getRunningCardValue(item),
         color: item.color,
@@ -321,7 +306,7 @@ export default {
     openCurveDialog({pointId, title}) {
       const range = this.getDefaultCurveRange();
       this.curveCustomRange = range;
-      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveDialogTitle = `鐐逛綅鏇茬嚎 - ${title || pointId}`;
       this.curveQuery = {
         siteId: this.siteId,
         pointId,
@@ -496,103 +481,17 @@ export default {
       return Number.isNaN(num) ? value : num;
     },
     getAmmeterSummaryAttr(item) {
-      const fieldCode = String(item?.fieldCode || item?.attr || "").trim();
-      const fieldName = String(item?.fieldName || item?.title || "").trim();
-      if (["dayChargedCap", "今日充电量（kWh）"].includes(fieldCode) || fieldName === "今日充电量（kWh）") {
-        return "dayChargedCap";
-      }
-      if (["dayDisChargedCap", "今日放电量（kWh）"].includes(fieldCode) || fieldName === "今日放电量（kWh）") {
-        return "dayDisChargedCap";
-      }
-      if (["yesterdayChargedCap", "昨日充电量（kWh）"].includes(fieldCode) || fieldName === "昨日充电量（kWh）") {
-        return "yesterdayChargedCap";
-      }
-      if (["yesterdayDisChargedCap", "昨日放电量（kWh）"].includes(fieldCode) || fieldName === "昨日放电量（kWh）") {
-        return "yesterdayDisChargedCap";
-      }
-      if (["totalChargedCap", "总充电量（kWh）"].includes(fieldCode) || fieldName === "总充电量（kWh）") {
-        return "totalChargedCap";
-      }
-      if (["totalDischargedCap", "总放电量（kWh）"].includes(fieldCode) || fieldName === "总放电量（kWh）") {
-        return "totalDischargedCap";
+      return String(item?.attr || "").trim();
+    },
+    getRunningValueFromApi(item, source = this.runningInfo) {
+      const mappedAttr = this.getAmmeterSummaryAttr(item);
+      if (mappedAttr) {
+        return source?.[mappedAttr];
       }
       return "";
     },
     getRunningCardValue(item) {
-      const summaryAttr = this.getAmmeterSummaryAttr(item);
-      if (summaryAttr) {
-        const summaryValue = this.ammeterDailySummary?.[summaryAttr];
-        if (summaryValue !== undefined && summaryValue !== null && summaryValue !== "") {
-          return summaryValue;
-        }
-      }
-      const rawValue = item?.fieldValue !== undefined ? item.fieldValue : this.runningInfo?.[item?.attr];
-      return this.toDisplayNumber(rawValue);
-    },
-    queryAllAmmeterDailyRows({ startTime = "", endTime = "", pageSize = 500, pageNum = 1, rows = [] } = {}) {
-      return getAmmeterData({
-        siteId: this.siteId,
-        startTime,
-        endTime,
-        pageSize,
-        pageNum,
-      }).then((response) => {
-        const currentRows = Array.isArray(response?.rows) ? response.rows : [];
-        const allRows = rows.concat(currentRows);
-        const total = Number(response?.total) || 0;
-        if (allRows.length >= total || currentRows.length < pageSize) {
-          return allRows;
-        }
-        return this.queryAllAmmeterDailyRows({
-          startTime,
-          endTime,
-          pageSize,
-          pageNum: pageNum + 1,
-          rows: allRows,
-        });
-      });
-    },
-    getAmmeterDailySummary() {
-      const today = new Date();
-      const yesterday = new Date(today);
-      yesterday.setDate(yesterday.getDate() - 1);
-      const startTime = this.formatDateOnly(yesterday);
-      const endTime = this.formatDateOnly(today);
-      return Promise.all([
-        this.queryAllAmmeterDailyRows({
-          startTime,
-          endTime,
-          pageSize: 20,
-          pageNum: 1,
-        }),
-        this.queryAllAmmeterDailyRows(),
-      ]).then(([recentRows, allRows]) => {
-        const rowMap = recentRows.reduce((result, row) => {
-          const dateKey = this.normalizeDateOnly(row?.dataTime);
-          if (dateKey) {
-            result[dateKey] = row;
-          }
-          return result;
-        }, {});
-        const todayKey = this.formatDateOnly(today);
-        const yesterdayKey = this.formatDateOnly(yesterday);
-        const todayRow = rowMap[todayKey] || {};
-        const yesterdayRow = rowMap[yesterdayKey] || {};
-        const totalChargedCap = allRows.reduce((result, row) => {
-          return result + (Number(row?.activeTotalKwh) || 0);
-        }, 0);
-        const totalDischargedCap = allRows.reduce((result, row) => {
-          return result + (Number(row?.reActiveTotalKwh) || 0);
-        }, 0);
-        return {
-          dayChargedCap: this.toDisplayNumber(todayRow.activeTotalKwh),
-          dayDisChargedCap: this.toDisplayNumber(todayRow.reActiveTotalKwh),
-          yesterdayChargedCap: this.toDisplayNumber(yesterdayRow.activeTotalKwh),
-          yesterdayDisChargedCap: this.toDisplayNumber(yesterdayRow.reActiveTotalKwh),
-          totalChargedCap: this.toDisplayNumber(totalChargedCap),
-          totalDischargedCap: this.toDisplayNumber(totalDischargedCap),
-        };
-      }).catch(() => ({}));
+      return this.toDisplayNumber(this.getRunningValueFromApi(item));
     },
     toAlarm() {
       this.$router.push({path: "/dzjk/gzgj", query: this.$route.query});
@@ -607,25 +506,28 @@ export default {
       if (!hasOldData) {
         this.setRunningInfoLoading(true);
       }
-      return Promise.all([
-        getDzjkHomeTotalView(this.siteId),
-        getProjectDisplayData(this.siteId),
-        this.getAmmeterDailySummary(),
-      ]).then(([homeResponse, displayResponse, ammeterDailySummary]) => {
-        const nextRunningInfo = homeResponse?.data || {};
-        const nextRunningDisplayData = displayResponse?.data || [];
-        const changed = hasOldData && this.hasTotalRunningChanged(nextRunningInfo, nextRunningDisplayData, ammeterDailySummary || {});
-        this.runningInfo = nextRunningInfo;
-        this.runningDisplayData = nextRunningDisplayData;
-        this.ammeterDailySummary = ammeterDailySummary || {};
-        if (changed) {
-          this.triggerRunningUpdateSpinner();
-        }
-      }).finally(() => {
-        if (!hasOldData) {
-          this.setRunningInfoLoading(false);
-        }
-      });
+      const homeTask = getDzjkHomeRunningData(this.siteId)
+        .then((homeResponse) => {
+          const nextRunningInfo = homeResponse?.data || {};
+          const changed = hasOldData && this.hasTotalRunningChanged(nextRunningInfo);
+          this.runningInfo = nextRunningInfo;
+          if (changed) {
+            this.triggerRunningUpdateSpinner();
+          }
+        })
+        .finally(() => {
+          if (!hasOldData) {
+            this.setRunningInfoLoading(false);
+          }
+        });
+
+      const displayTask = getProjectDisplayData(this.siteId)
+        .then((displayResponse) => {
+          this.runningDisplayData = displayResponse?.data || [];
+        })
+        .catch(() => {});
+
+      return Promise.allSettled([homeTask, displayTask]);
     },
     triggerRunningUpdateSpinner() {
       if (this.runningUpdateTimer) {
@@ -637,32 +539,17 @@ export default {
         this.runningUpdateTimer = null;
       }, 800);
     },
-    hasTotalRunningChanged(nextRunningInfo, nextRunningDisplayData, nextAmmeterDailySummary = {}) {
-      const oldSnapshot = this.getTotalRunningSnapshot(this.runningInfo, this.runningDisplayData, this.ammeterDailySummary || {});
-      const newSnapshot = this.getTotalRunningSnapshot(nextRunningInfo, nextRunningDisplayData, nextAmmeterDailySummary);
+    hasTotalRunningChanged(nextRunningInfo) {
+      const oldSnapshot = this.getTotalRunningSnapshot(this.runningInfo);
+      const newSnapshot = this.getTotalRunningSnapshot(nextRunningInfo);
       return JSON.stringify(oldSnapshot) !== JSON.stringify(newSnapshot);
     },
-    getTotalRunningSnapshot(runningInfo, runningDisplayData, ammeterDailySummary = {}) {
+    getTotalRunningSnapshot(runningInfo) {
       const snapshot = {};
-      const sectionData = (runningDisplayData || []).filter(item => item.sectionName === "总累计运行数据");
-      if (sectionData.length > 0) {
-        sectionData.forEach(item => {
-          const key = item.fieldCode || item.fieldName;
-          if (!key) return;
-          const summaryAttr = this.getAmmeterSummaryAttr(item);
-          const value = summaryAttr ? ammeterDailySummary?.[summaryAttr] : item.fieldValue;
-          snapshot[`cfg:${key}`] = this.normalizeRunningCompareValue(value);
-        });
-        return snapshot;
-      }
       this.fallbackSjglData.forEach(item => {
-        const summaryAttr = this.getAmmeterSummaryAttr(item);
-        const value = summaryAttr
-          ? ammeterDailySummary?.[summaryAttr]
-          : runningInfo?.[item.attr];
+        const value = this.getRunningValueFromApi(item, runningInfo);
         snapshot[`fallback:${item.attr}`] = this.normalizeRunningCompareValue(value);
       });
-      snapshot["fallback:totalRevenue"] = this.normalizeRunningCompareValue(runningInfo?.totalRevenue);
       return snapshot;
     },
     normalizeRunningCompareValue(value) {
@@ -676,10 +563,10 @@ export default {
     init() {
       // 功率曲线
       this.$refs.activeChart.init(this.siteId);
-      // 一周冲放曲线
+      // 一周充放曲线
       this.$refs.weekChart.init(this.siteId);
-      // 静态信息  this.getBaseInfo()
-      // 总累计运行数据+故障告警 this.getRunningInfo()
+      // 静态信息 this.getBaseInfo()
+      // 总累计运行数据/故障告警 this.getRunningInfo()
       Promise.all([this.getBaseInfo(), this.getRunningInfo()]);
       // 一分钟循环一次总累计运行数据
       this.updateInterval(this.getRunningInfo);
@@ -689,7 +576,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-//设备告警
+//璁惧鍛婅
 .alarm-msg {
   background: #ff4949;
   padding: 2px 5px;
@@ -705,7 +592,7 @@ export default {
   transform: translateY(-50%);
 }
 
-//基本信息-地址 运行️时间
+//鍩烘湰淇℃伅-鍦板潃 杩愯锔忔椂闂?
 .site-info {
   display: flex;
   font-size: 12px;
@@ -732,7 +619,7 @@ export default {
   }
 }
 
-//总收入
+//鎬绘敹鍏?
 .total-count {
   position: absolute;
   right: 10px;
@@ -778,7 +665,7 @@ export default {
   }
 }
 
-//数据概览
+//鏁版嵁姒傝
 .sjgl-col {
   .sjgl-wrapper {
     text-align: left;
@@ -839,3 +726,4 @@ export default {
   }
 }
 </style>
+