From f8ad817a1557bf52251639a6ec2b6fc1649be358 Mon Sep 17 00:00:00 2001 From: selia-zx <1771203023@qq.com> Date: Wed, 3 Dec 2025 17:17:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=87=87=E6=9A=96=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=BF=90=E8=A1=8C=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B9=B6=E5=AF=B9=E6=8E=A5=202.=E4=BF=AE=E6=94=B9=E6=B0=B4?= =?UTF-8?q?=E7=94=B5=E6=8A=84=E8=A1=A8=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/boiler/heatingRunPeport.js | 27 + .../boilerSys/heatingRunReport/index.vue | 626 ++++++++++++++++++ .../comprehensiveEnergy/meterRecord/index.vue | 38 +- 4 files changed, 669 insertions(+), 26 deletions(-) create mode 100644 src/api/boiler/heatingRunPeport.js create mode 100644 src/views/boilerSys/heatingRunReport/index.vue diff --git a/.env.development b/.env.development index 13c7001..a08e7e1 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,9 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = '/dev-api' # 后台 -# VUE_APP_BASE_API = 'http://192.168.1.222:8080' +VUE_APP_BASE_API = 'http://192.168.1.222:8080' # 梅州云端 -VUE_APP_BASE_API = 'http://106.55.173.225:8091' +# VUE_APP_BASE_API = 'http://106.55.173.225:8091' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/boiler/heatingRunPeport.js b/src/api/boiler/heatingRunPeport.js new file mode 100644 index 0000000..684864a --- /dev/null +++ b/src/api/boiler/heatingRunPeport.js @@ -0,0 +1,27 @@ +import request from "@/utils/request"; + +// 查询运行记录 +export function boilerSysList(data) { + return request({ + url: "/reportHeating/list", + method: "post", + data, + }); +} +// 编辑运行记录 +export function boilerSysEdit(data) { + return request({ + url: "/reportHeating/edit", + method: "put", + data, + }); +} +// 导出 +export function boilerSysExport(data) { + return request({ + url: "/reportHeating/export", + method: "post", + data, + responseType: "blob", + }); +} diff --git a/src/views/boilerSys/heatingRunReport/index.vue b/src/views/boilerSys/heatingRunReport/index.vue new file mode 100644 index 0000000..2ac3156 --- /dev/null +++ b/src/views/boilerSys/heatingRunReport/index.vue @@ -0,0 +1,626 @@ + + + + diff --git a/src/views/comprehensiveEnergy/meterRecord/index.vue b/src/views/comprehensiveEnergy/meterRecord/index.vue index 7b135fd..6616207 100644 --- a/src/views/comprehensiveEnergy/meterRecord/index.vue +++ b/src/views/comprehensiveEnergy/meterRecord/index.vue @@ -57,13 +57,7 @@ {{ row.location }} @@ -185,13 +179,10 @@ export default { // return "color: #3390ff;!important;text-align:center"; // } if ( - rowIndex === 8 || - rowIndex === 13 || - rowIndex === 18 || - rowIndex === 21 || + rowIndex === 15 || + rowIndex === 20 || rowIndex === 23 || - rowIndex === 25 || - rowIndex === 26 + rowIndex === 24 ) { return "color: #75d148;!important;font-weight: bold;background-color: rgba(0, 71, 125, 0.4)"; } @@ -212,18 +203,16 @@ export default { // } // } if ( - rowIndex === 8 || - rowIndex === 13 || - rowIndex === 18 || - rowIndex === 21 || + rowIndex === 15 || + rowIndex === 20 || rowIndex === 23 || - rowIndex === 25 + rowIndex === 24 ) { if (columnIndex === 0) { - // 当 rowIndex 为 8 且 columnIndex 为 0 时，合并 1 行 6 列 + // 当 rowIndex 为 15 且 columnIndex 为 0 时，合并 1 行 6 列 return [1, 6]; } else if (columnIndex < 6) { - // 当 rowIndex 为 8 且 columnIndex 小于 6 时，隐藏该单元格 + // 当 rowIndex 为 15 且 columnIndex 小于 6 时，隐藏该单元格 return [0, 0]; } } @@ -278,8 +267,8 @@ export default { meterReadingsList(data).then((res) => { console.log("列表返回", res); if (res.code == 200 && res.rows) { - this.tableData = res.rows.slice(0, 27); - this.tableData2 = res.rows.slice(27, 31); + this.tableData = res.rows.slice(0, 25); + this.tableData2 = res.rows.slice(25, 27); this.loading = false; } else { this.tableData = []; @@ -300,12 +289,13 @@ export default { console.log("参数", this.queryParams); weatherTempData(this.queryParams).then((response) => { let data = response.rows; - // console.log("this.dayValue", this.dayValue); + console.log("response.rows", response.rows); + console.log("this.dayValue", this.dayValue); if (data && data.length > 0) { data.forEach((item) => { if (item.dateAndWeek) { let objectDate = item.dateAndWeek.split(" ")[0]; - // console.log(" objectDate", objectDate); + console.log(" objectDate", item.dateAndWeek); if (objectDate == this.dayValue) { this.lowValue = item.minTemp; this.heightValue = item.maxTemp;