diff --git a/src/api/device-type-ver/index.ts b/src/api/device-type-ver/index.ts index d9cde7f..1f69de5 100644 --- a/src/api/device-type-ver/index.ts +++ b/src/api/device-type-ver/index.ts @@ -160,3 +160,9 @@ export function upgradeSoftVerTable( method: "GET", }); } +export function getSoftVerOption(): AxiosPromise { + return request({ + url: `/api/device-type-ver/v1/soft-ver-option`, + method: "GET", + }); +} diff --git a/src/api/report/index.ts b/src/api/report/index.ts index 19a35e5..4761ca5 100644 --- a/src/api/report/index.ts +++ b/src/api/report/index.ts @@ -1,6 +1,12 @@ import { AxiosPromise } from "axios"; import request from "@/utils/request"; -import { ReportBasicQuery, ReportDetailPageResult } from "@/api/report/types"; +import { + DeviceTypeHardSoftReportQuery, + DeviceTypeHardSoftVerVO, + ReportBasicQuery, + ReportDetailPageResult, + TerminalCapabilityStatisticsVO +} from "@/api/report/types"; export function reportArea(groupId?: number): AxiosPromise { return request({ @@ -26,3 +32,40 @@ export function reportExportDetail(queryParams: ReportBasicQuery) { responseType: "arraybuffer", }); } +export function reportTerminalStatistics( + data: ReportBasicQuery +): AxiosPromise { + return request({ + url: `/api/report/v1/terminal-capability-statistics`, + method: "POST", + data, + }); +} +export function reportExportTerminal(queryParams: ReportBasicQuery) { + return request({ + url: `/api/report/v1/_export/terminal`, + method: "get", + params: queryParams, + responseType: "arraybuffer", + }); +} +export function reportDevTypeSoftVerStatistics( + data: DeviceTypeHardSoftReportQuery +): AxiosPromise { + return request({ + url: `/api/report/v1/device-type-soft`, + method: "POST", + data, + }); +} + +export function reportExportDeviceTypeHardSoftVer( + queryParams: ReportBasicQuery +) { + return request({ + url: `/api/report/v1/_export/device-type-soft-ver`, + method: "get", + params: queryParams, + responseType: "arraybuffer", + }); +} diff --git a/src/api/report/types.ts b/src/api/report/types.ts index abe6e5f..0d24e8e 100644 --- a/src/api/report/types.ts +++ b/src/api/report/types.ts @@ -59,3 +59,62 @@ export interface DetailInventoryStatisticsVO { rgMode?: string; } export type ReportDetailPageResult = PageResult; +export interface TerminalCapabilityStatisticsVO { + area?: String; + + subArea?: string; + + category?: string; + + deviceName?: string; + + accessType?: string; + + deviceType?: string; + + gateWayType?: string; + + devCount?: number; +} +export interface DeviceTypeHardSoftReportQuery extends PageQuery { + area?: number; + + subarea?: number; + + category?: string; + + devName?: string; + + devHardVer?: string; + + softVer?: string; + + gateWayType?: string; + + firstStartTime?: string; + + firstEndTime?: string; + + lastStartTime?: string; + + lastEndTime?: string; + + onLineStartTime?: string; + + onLineEndTime?: string; +} +export interface DeviceTypeHardSoftVerVO { + area?: String; + + subArea?: string; + + category?: string; + + deviceName?: string; + + devHardVer?: string; + + softVer?: string; + + devCount?: number; +} diff --git a/src/views/family/statement/detail-inventory-statistics/index.vue b/src/views/family/statement/detail-inventory-statistics/index.vue index a0deb69..982b53c 100644 --- a/src/views/family/statement/detail-inventory-statistics/index.vue +++ b/src/views/family/statement/detail-inventory-statistics/index.vue @@ -9,7 +9,15 @@ >详细清单统计 - 运行报表 +
+ 运行报表 + 查看报表 + +
diff --git a/src/views/family/statement/device-type-soft/index.vue b/src/views/family/statement/device-type-soft/index.vue new file mode 100644 index 0000000..6e8f765 --- /dev/null +++ b/src/views/family/statement/device-type-soft/index.vue @@ -0,0 +1,436 @@ + + + + + diff --git a/src/views/family/statement/terminal-capability-statistics/index.vue b/src/views/family/statement/terminal-capability-statistics/index.vue new file mode 100644 index 0000000..cd8d6df --- /dev/null +++ b/src/views/family/statement/terminal-capability-statistics/index.vue @@ -0,0 +1,409 @@ + + + + +