From b25cddd35f654374d427e775ddbffffe268cffc8 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 三月 2026 16:21:39 +0800
Subject: [PATCH] 能耗成本核算
---
src/views/costAccounting/energyCosts/index.vue | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/views/costAccounting/energyCosts/index.vue b/src/views/costAccounting/energyCosts/index.vue
index 655e145..f74f16e 100644
--- a/src/views/costAccounting/energyCosts/index.vue
+++ b/src/views/costAccounting/energyCosts/index.vue
@@ -42,7 +42,7 @@
value="姘�" />
</el-select>
</el-form-item> -->
- <el-form-item label="鑳借�楃敤閫�">
+ <!-- <el-form-item label="鑳借�楃敤閫�">
<el-select
v-model="searchForm.type"
placeholder=""
@@ -53,7 +53,7 @@
<el-option label="鐢熶骇" value="鐢熶骇" />
<el-option label="鍔炲叕" value="鍔炲叕" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鏃堕棿鑼冨洿">
<el-date-picker
v-if="statisticsType === 'day'"
@@ -465,7 +465,7 @@
</div>
</el-card>
</el-col>
- <el-col :xs="24" :lg="12">
+ <!-- <el-col :xs="24" :lg="12">
<el-card class="chart-card" shadow="never">
<template #header>
<div class="chart-head">
@@ -503,7 +503,7 @@
</div>
</div>
</el-card>
- </el-col>
+ </el-col> -->
</el-row>
</div>
</transition>
@@ -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"
@@ -681,7 +681,7 @@
// 鎼滅储琛ㄥ崟
const searchForm = reactive({
// energyType: "",
- type: "",
+ // type: "",
dateRange: (() => {
// 榛樿鏈�杩�7澶�
const end = new Date();
@@ -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)",
@@ -1457,7 +1457,7 @@
const params = {
days: 0,
// energyType: searchForm.energyType || undefined,
- type: searchForm.type || undefined,
+ // type: searchForm.type || undefined,
pageNum: page.current,
pageSize: page.size,
};
@@ -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锛夊凡绂佺敤銆戞帴鍙ｅ紓甯告椂涓嶅啀鐢熸垚闅忔満鍋囨暟鎹紝閬垮厤璇敤鍒扮敓浜ф暟鎹摼璺�
ElMessage.error("鑾峰彇鏁版嵁寮傚父");
tableData.value = [];
page.total = 0;
@@ -1717,7 +1715,7 @@
}
.filter-form {
- flex: 1 1 auto;
+ flex: 0.1 1 auto;
min-width: 0;
}
--
Gitblit v1.9.3