From e410e6f49632370c2d5cc1c3846f8e2cd054652e Mon Sep 17 00:00:00 2001 From: geting <13585118195@163.com> Date: Wed, 25 Dec 2024 17:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/backend/statAnalysis/request.ts | 6 +- .../src/views/backend/alarms/index.vue | 28 ++- .../src/views/backend/malfunction/index.vue | 26 ++- .../statAnalysis/powerCurveAnalysis.vue | 3 + .../backend/statAnalysis/trendAnalysis.vue | 1 + .../backend/statAnalysis/trendComparison.vue | 221 ++++++++++++++---- 6 files changed, 223 insertions(+), 62 deletions(-) diff --git a/ui/dasadmin/src/api/backend/statAnalysis/request.ts b/ui/dasadmin/src/api/backend/statAnalysis/request.ts index 7073f374..f4005fe3 100644 --- a/ui/dasadmin/src/api/backend/statAnalysis/request.ts +++ b/ui/dasadmin/src/api/backend/statAnalysis/request.ts @@ -39,7 +39,7 @@ export const runAirBlowerReq = ( }) } -export const getReportTemplateListReq = (data: { category: '单机报表' | '多机报表'; pageNum: number; pageSize: number }) => { +export const getReportTemplateListReq = (data: { category: '单机报表' | '多机报表' | '统计查询'; pageNum: number; pageSize: number }) => { return createAxios< never, Promise<{ @@ -47,7 +47,7 @@ export const getReportTemplateListReq = (data: { category: '单机报表' | '多 msg: string data: { total: number - rows: { id: string; category: '单机报表' | '多机报表'; template: string }[] + rows: { id: string; category: '单机报表' | '多机报表' | '统计查询'; template: string }[] code: number msg: string } @@ -60,7 +60,7 @@ export const getReportTemplateListReq = (data: { category: '单机报表' | '多 }) } -export const addReportTemplateListReq = (data: { category: '单机报表' | '多机报表'; template: string }) => { +export const addReportTemplateListReq = (data: { category: '单机报表' | '多机报表' | '统计查询'; template: string }) => { return createAxios< never, Promise<{ diff --git a/ui/dasadmin/src/views/backend/alarms/index.vue b/ui/dasadmin/src/views/backend/alarms/index.vue index 12865d49..59666ae2 100644 --- a/ui/dasadmin/src/views/backend/alarms/index.vue +++ b/ui/dasadmin/src/views/backend/alarms/index.vue @@ -94,13 +94,16 @@ @change="getcurrentPage" > + + + @@ -511,6 +512,9 @@ $paginationHeight: 32px; justify-content: right; background-color: #fff; } + .malDialog { + height: 540px; + } } } .modelOperate { diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue index 417e08a2..82100c24 100644 --- a/ui/dasadmin/src/views/backend/malfunction/index.vue +++ b/ui/dasadmin/src/views/backend/malfunction/index.vue @@ -1,7 +1,7 @@