From 5f32b3141d10102bdc178e370b6e7c1e91f0233e Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 28 Aug 2025 01:22:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(property):=20=E6=B7=BB=E5=8A=A0=E7=94=B5?= =?UTF-8?q?=E8=A1=A8=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energyManagement/meterRecord/index.ts | 12 +- .../energyManagement/meterRecord/model.d.ts | 33 ++ .../electricEnergy/components/floor-tree.vue | 80 ++-- .../electricEnergy/electricTrend/index.vue | 435 +++++++++++------- .../energyManagement/lightInfo/floor-tree.vue | 82 ++-- 5 files changed, 405 insertions(+), 237 deletions(-) diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts index 8074dadf..a9465c99 100644 --- a/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts +++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/index.ts @@ -1,4 +1,4 @@ -import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery } from './model'; +import type { MeterRecordVO, MeterRecordForm, MeterRecordQuery, MeterRecordTrend } from './model'; import type { ID, IDS } from '#/api/common'; import type { PageResult } from '#/api/common'; @@ -59,3 +59,13 @@ export function meterRecordUpdate(data: MeterRecordForm) { export function meterRecordRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/property/meterRecord/${id}`); } + +/** + * 获取用电/气/水趋势分析数据 + * + * @param params + * @returns 用电/气/水趋势分析数据 + */ +export function meterRecordTrend(params: MeterRecordTrend) { + return requestClient.get('/property/meterRecord/trend', { params }); +} diff --git a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts index 2ae4e5a9..a5d60084 100644 --- a/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts +++ b/apps/web-antd/src/api/property/energyManagement/meterRecord/model.d.ts @@ -147,3 +147,36 @@ export interface MeterRecordQuery extends PageQuery { */ params?: any } + + +export interface MeterRecordTrend { + /** + * 仪表类型 + */ + meterType?: string | number + + /** + * 仪表ID + */ + meterId: string | number + + /** + * 楼层ID + */ + floorId: string | number + + /** + * 日期 + */ + day?: string + + /** + * 月份 + */ + month?: string + + /** + * 年份 + */ + year?: string +} diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue index 0be24cfd..7b99045b 100644 --- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue +++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/components/floor-tree.vue @@ -1,59 +1,60 @@