From 8601505e6e39bc4e59320a7760ca3d1060b1268d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Thu, 1 Aug 2024 16:21:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BD=AF=E4=BB=B6=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BD=92=E5=B9=B6=E7=8E=87=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device-type-ver/index.ts | 6 + src/api/report/index.ts | 22 +- src/api/report/types.ts | 37 +- .../statement/soft-merge-statistics/index.vue | 372 ++++++++++++++++++ 4 files changed, 434 insertions(+), 3 deletions(-) create mode 100644 src/views/family/statement/soft-merge-statistics/index.vue diff --git a/src/api/device-type-ver/index.ts b/src/api/device-type-ver/index.ts index 1f69de5..2c3d293 100644 --- a/src/api/device-type-ver/index.ts +++ b/src/api/device-type-ver/index.ts @@ -166,3 +166,9 @@ export function getSoftVerOption(): AxiosPromise { method: "GET", }); } +export function getMergeSoftVerOption(): AxiosPromise { + return request({ + url: `/api/device-type-ver/v1/merge-soft-ver-option`, + method: "GET", + }); +} diff --git a/src/api/report/index.ts b/src/api/report/index.ts index 4761ca5..5e44ece 100644 --- a/src/api/report/index.ts +++ b/src/api/report/index.ts @@ -4,7 +4,7 @@ import { DeviceTypeHardSoftReportQuery, DeviceTypeHardSoftVerVO, ReportBasicQuery, - ReportDetailPageResult, + ReportDetailPageResult, SoftMergePageResult, SoftMergeReportQuery, TerminalCapabilityStatisticsVO } from "@/api/report/types"; @@ -60,7 +60,7 @@ export function reportDevTypeSoftVerStatistics( } export function reportExportDeviceTypeHardSoftVer( - queryParams: ReportBasicQuery + queryParams: DeviceTypeHardSoftReportQuery ) { return request({ url: `/api/report/v1/_export/device-type-soft-ver`, @@ -69,3 +69,21 @@ export function reportExportDeviceTypeHardSoftVer( responseType: "arraybuffer", }); } + +export function reportSoftVerMergeStatistics( + data: SoftMergeReportQuery +): AxiosPromise { + return request({ + url: `/api/report/v1/device-type-soft-merge`, + method: "POST", + data, + }); +} +export function exportSoftMergeVer(queryParams: SoftMergeReportQuery) { + return request({ + url: `/api/report/v1/_export/soft-ver-merge`, + method: "get", + params: queryParams, + responseType: "arraybuffer", + }); +} diff --git a/src/api/report/types.ts b/src/api/report/types.ts index 0d24e8e..7d1e478 100644 --- a/src/api/report/types.ts +++ b/src/api/report/types.ts @@ -104,7 +104,7 @@ export interface DeviceTypeHardSoftReportQuery extends PageQuery { onLineEndTime?: string; } export interface DeviceTypeHardSoftVerVO { - area?: String; + area?: string; subArea?: string; @@ -118,3 +118,38 @@ export interface DeviceTypeHardSoftVerVO { devCount?: number; } +export interface SoftMergeReportQuery extends PageQuery { + area?: number; + + devName?: string; + + devType?: string; + + devHardVer?: string; + + category?: string; + + softVer?: string; + + onLineStartTime?: string; + + onLineEndTime?: string; +} +export interface SoftVerMergeVO { + category?: string; + + devName?: string; + + devHard?: string; + + hardCount?: number; + + softVer?: string; + + softCount?: string; + + devType?: string; + + softAvg?: string; +} +export type SoftMergePageResult = PageResult; diff --git a/src/views/family/statement/soft-merge-statistics/index.vue b/src/views/family/statement/soft-merge-statistics/index.vue new file mode 100644 index 0000000..a59124d --- /dev/null +++ b/src/views/family/statement/soft-merge-statistics/index.vue @@ -0,0 +1,372 @@ + + + + +