From df4a21d1c2af8d05d13725c9791a4df81c4a0dc8 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 三月 2026 15:13:21 +0800
Subject: [PATCH] 能耗成本核算

---
 src/views/costAccounting/energyCosts/index.vue |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/costAccounting/energyCosts/index.vue b/src/views/costAccounting/energyCosts/index.vue
index 655e145..e841483 100644
--- a/src/views/costAccounting/energyCosts/index.vue
+++ b/src/views/costAccounting/energyCosts/index.vue
@@ -568,7 +568,7 @@
         </template>
         <el-table-column type="index" label="搴忓彿" width="60" align="center" />
         <el-table-column
-          prop="timePeriod"
+          prop="meterReadingDate"
           :label="timeColumnLabel"
           align="center"
           sortable="custom"
@@ -774,7 +774,7 @@
   const rows = Array.isArray(tableData.value) ? tableData.value : [];
   const byTime = new Map();
   for (const r of rows) {
-    const t = r?.timePeriod ?? "";
+    const t = r?.meterReadingDate ?? "";
     if (!t) continue;
     if (!byTime.has(t)) byTime.set(t, { total: 0, production: 0, office: 0 });
     const bucket = byTime.get(t);
@@ -1137,7 +1137,7 @@
     },
     xAxis: {
       type: "category",
-      data: data.map((item) => item.timePeriod),
+      data: data.map((item) => item.meterReadingDate),
       axisLabel: {
         rotate: statisticsType.value === "day" ? 45 : 0,
         color: "rgba(15, 23, 42, 0.62)",
@@ -1509,10 +1509,10 @@
     .then((res) => {
       if (res.code === 200) {
         const data = res.data;
-        overview.totalConsumption = data.totalEnergyConsumption || "0";
-        overview.totalAmount = data.totalEnergyCost || "0";
-        overview.avgConsumption = data.averageConsumption || "0";
-        overview.compareRate = data.changeVite || 0;
+        overview.totalCost = data.totalEnergyConsumption || "0";
+        overview.productionCost = data.totalEnergyCost || "0";
+        overview.avgCost = data.averageConsumption || "0";
+        overview.officeCost = data.changeVite || 0;
 
         // 澶勭悊琛ㄦ牸鏁版嵁
         tableData.value = data.energyCostDtos || [];
@@ -1528,8 +1528,6 @@
       }
     })
     .catch((err) => {
-      console.error("鑾峰彇鏁版嵁寮傚父锛�", err);
-      // 銆愬亣鏁版嵁锛圡ock锛夊凡绂佺敤銆戞帴鍙e紓甯告椂涓嶅啀鐢熸垚闅忔満鍋囨暟鎹紝閬垮厤璇敤鍒扮敓浜ф暟鎹摼璺�
       ElMessage.error("鑾峰彇鏁版嵁寮傚父");
       tableData.value = [];
       page.total = 0;

--
Gitblit v1.9.3