From 8416806539f75d8865fc24a2692f03a071745ea0 Mon Sep 17 00:00:00 2001
From: selia-zx <1771203023@qq.com>
Date: Thu, 3 Jul 2025 13:46:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=83=AD=E6=B0=B4-?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=80=BB=E8=A7=88=EF=BC=8C=E9=A5=BC=E5=9B=BE?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=202.=E4=BF=AE=E6=94=B9=E7=83=AD=E6=B0=B4-?=
=?UTF-8?q?=E7=94=A8=E8=83=BD=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=B0=B4=E7=94=B5?=
=?UTF-8?q?=E8=A1=A8=E8=AF=BB=E6=95=B0=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=203.=E4=BF=AE=E6=94=B9=E7=83=AD=E6=B0=B4-=E8=83=BD=E6=BA=90?=
=?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E6=B8=A9=E5=BA=A6=E5=8F=98=E5=8C=96?=
=?UTF-8?q?=E8=A1=A8=E3=80=81=E6=B0=B4=E4=BD=8D=E5=8F=98=E5=8C=96=E8=A1=A8?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=83=A8=E6=97=B6=E9=97=B4=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
.../energyAnalysis/components/temReport.vue | 50 +++++++++++++++--
.../energyAnalysis/components/waterReport.vue | 54 ++++++++++++++++---
.../energyQuery/components/electReading.vue | 8 +--
.../energyQuery/components/waterReading.vue | 8 +--
src/views/hotWater/overview/index.vue | 6 +--
src/views/region/index.vue | 2 +-
7 files changed, 105 insertions(+), 24 deletions(-)
diff --git a/package.json b/package.json
index f937b4a..969eb34 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0",
+ "html-webpack-plugin": "^5.6.3",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.13",
diff --git a/src/views/hotWater/energyAnalysis/components/temReport.vue b/src/views/hotWater/energyAnalysis/components/temReport.vue
index 441b147..fcade05 100644
--- a/src/views/hotWater/energyAnalysis/components/temReport.vue
+++ b/src/views/hotWater/energyAnalysis/components/temReport.vue
@@ -35,7 +35,7 @@
:data="tableData"
@row-click="handlerow"
highlight-current-row
- height="500"
+ height="400"
ref="maintable"
:cell-style="tableRowStyle"
>
@@ -44,10 +44,18 @@
+
+
+
+
+
+
+
+
@@ -251,10 +259,18 @@ export default {
var tHeader = [
"楼栋名称",
"0点",
- "02点",
- "06点",
+ "1点",
+ "2点",
+ "3点",
+ "4点",
+ "5点",
+ "6点",
+ "7点",
"8点",
+ "9点",
+ "10点",
"11点",
+ "12点",
"13点",
"14点",
"15点",
@@ -270,10 +286,18 @@ export default {
var filterVal = [
"buildingName",
"temp00",
+ "temp01",
"temp02",
+ "temp03",
+ "temp04",
+ "temp05",
"temp06",
+ "temp07",
"temp08",
+ "temp09",
+ "temp10",
"temp11",
+ "temp12",
"temp13",
"temp14",
"temp15",
@@ -290,10 +314,18 @@ export default {
var tHeader = [
"热泵名称",
"0点",
- "02点",
- "06点",
+ "1点",
+ "2点",
+ "3点",
+ "4点",
+ "5点",
+ "6点",
+ "7点",
"8点",
+ "9点",
+ "10点",
"11点",
+ "12点",
"13点",
"14点",
"15点",
@@ -309,10 +341,18 @@ export default {
var filterVal = [
"deviceName",
"temp00",
+ "temp01",
"temp02",
+ "temp03",
+ "temp04",
+ "temp05",
"temp06",
+ "temp07",
"temp08",
+ "temp09",
+ "temp10",
"temp11",
+ "temp12",
"temp13",
"temp14",
"temp15",
diff --git a/src/views/hotWater/energyAnalysis/components/waterReport.vue b/src/views/hotWater/energyAnalysis/components/waterReport.vue
index 545f710..6553c2a 100644
--- a/src/views/hotWater/energyAnalysis/components/waterReport.vue
+++ b/src/views/hotWater/energyAnalysis/components/waterReport.vue
@@ -35,7 +35,7 @@
:data="tableData"
@row-click="handlerow"
highlight-current-row
- height="500"
+ height="400"
ref="maintable"
:cell-style="tableRowStyle"
>
@@ -43,10 +43,18 @@
+
+
+
+
+
+
+
+
@@ -235,7 +243,7 @@ export default {
const data = params[0];
const month = data.name;
const value = data.value;
- return `${month}
温度: ${value} ℃`;
+ return `${month}
水位: ${value} %`;
},
};
this.brokenOption.xAxis.data = this.brokenTime;
@@ -250,10 +258,18 @@ export default {
"楼栋名称",
"设备名称",
"0点",
- "02点",
- "06点",
+ "1点",
+ "2点",
+ "3点",
+ "4点",
+ "5点",
+ "6点",
+ "7点",
"8点",
+ "9点",
+ "10点",
"11点",
+ "12点",
"13点",
"14点",
"15点",
@@ -270,10 +286,18 @@ export default {
"buildingName",
"deviceName",
"temp00",
+ "temp01",
"temp02",
+ "temp03",
+ "temp04",
+ "temp05",
"temp06",
+ "temp07",
"temp08",
+ "temp09",
+ "temp10",
"temp11",
+ "temp12",
"temp13",
"temp14",
"temp15",
@@ -290,10 +314,18 @@ export default {
var tHeader = [
"楼栋名称",
"0点",
- "02点",
- "06点",
+ "1点",
+ "2点",
+ "3点",
+ "4点",
+ "5点",
+ "6点",
+ "7点",
"8点",
+ "9点",
+ "10点",
"11点",
+ "12点",
"13点",
"14点",
"15点",
@@ -309,10 +341,18 @@ export default {
var filterVal = [
"buildingName",
"temp00",
+ "temp01",
"temp02",
+ "temp03",
+ "temp04",
+ "temp05",
"temp06",
+ "temp07",
"temp08",
+ "temp09",
+ "temp10",
"temp11",
+ "temp12",
"temp13",
"temp14",
"temp15",
@@ -331,7 +371,7 @@ export default {
excel.export_json_to_excel({
header: tHeader, //表头
data, //数据
- filename: "温度变化报表", //名称
+ filename: "水位变化报表", //名称
autoWidth: true, //宽度自适应
});
});
diff --git a/src/views/hotWater/energyQuery/components/electReading.vue b/src/views/hotWater/energyQuery/components/electReading.vue
index d462445..170cf2e 100644
--- a/src/views/hotWater/energyQuery/components/electReading.vue
+++ b/src/views/hotWater/energyQuery/components/electReading.vue
@@ -52,9 +52,9 @@
-
+
-
+
-
+
-
+