From 55e9efce7ea0fdc59e7652e258d4cbd902d18898 Mon Sep 17 00:00:00 2001 From: yangsy Date: Mon, 25 Aug 2025 23:44:39 +0800 Subject: [PATCH] chore: extract types --- src/components/device-alarm-detail-modal.vue | 2 +- src/composables/query/alarm/domains/index.ts | 1 + .../query/alarm/domains/station-alarms.ts | 14 ++++++++++++++ src/composables/query/alarm/index.ts | 2 ++ .../query/alarm/use-line-alarms-query.ts | 19 +------------------ .../query/alarm/use-station-alarms-query.ts | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 src/composables/query/alarm/domains/index.ts create mode 100644 src/composables/query/alarm/domains/station-alarms.ts diff --git a/src/components/device-alarm-detail-modal.vue b/src/components/device-alarm-detail-modal.vue index 298a13c..1b90fdc 100644 --- a/src/components/device-alarm-detail-modal.vue +++ b/src/components/device-alarm-detail-modal.vue @@ -2,7 +2,7 @@ import type { Station } from '@/apis/domains'; import type { NdmDeviceAlarmLogResultVO } from '@/apis/models'; import { ndmDeviceAlarmLogDefaultExportByTemplate } from '@/apis/requests'; -import type { StationAlarms } from '@/composables/query/alarm/use-line-alarms-query'; +import type { StationAlarms } from '@/composables/query'; import { JAVA_INTEGER_MAX_VALUE } from '@/constants'; import { DeviceType, DeviceTypeName, type DeviceTypeVal } from '@/enums/device-type'; import { useQueryControlStore } from '@/stores/query-control'; diff --git a/src/composables/query/alarm/domains/index.ts b/src/composables/query/alarm/domains/index.ts new file mode 100644 index 0000000..9b9c8f5 --- /dev/null +++ b/src/composables/query/alarm/domains/index.ts @@ -0,0 +1 @@ +export * from './station-alarms'; diff --git a/src/composables/query/alarm/domains/station-alarms.ts b/src/composables/query/alarm/domains/station-alarms.ts new file mode 100644 index 0000000..80502d4 --- /dev/null +++ b/src/composables/query/alarm/domains/station-alarms.ts @@ -0,0 +1,14 @@ +import type { NdmDeviceAlarmLogResultVO } from '@/apis/models'; +import type { DeviceType } from '@/enums/device-type'; + +export interface StationAlarms { + [DeviceType.Camera]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.Decoder]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.Keyboard]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.MediaServer]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.Nvr]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.SecurityBox]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.Switch]: NdmDeviceAlarmLogResultVO[]; + [DeviceType.VideoServer]: NdmDeviceAlarmLogResultVO[]; + unclassified: NdmDeviceAlarmLogResultVO[]; +} diff --git a/src/composables/query/alarm/index.ts b/src/composables/query/alarm/index.ts index c2579da..8658491 100644 --- a/src/composables/query/alarm/index.ts +++ b/src/composables/query/alarm/index.ts @@ -1,3 +1,5 @@ +export * from './domains'; + export * from './use-line-alarms-query'; export * from './use-station-alarms-query'; export * from './use-today-alarms-query'; diff --git a/src/composables/query/alarm/use-line-alarms-query.ts b/src/composables/query/alarm/use-line-alarms-query.ts index e71dea8..4de48b4 100644 --- a/src/composables/query/alarm/use-line-alarms-query.ts +++ b/src/composables/query/alarm/use-line-alarms-query.ts @@ -1,5 +1,4 @@ import type { Station } from '@/apis/domains'; -import type { NdmDeviceAlarmLogResultVO } from '@/apis/models'; import { postNdmDeviceAlarmLogPage } from '@/apis/requests'; import { DeviceType } from '@/enums/device-type'; import { useQueryControlStore } from '@/stores/query-control'; @@ -8,23 +7,7 @@ import { useQuery } from '@tanstack/vue-query'; import dayjs from 'dayjs'; import { storeToRefs } from 'pinia'; import { computed } from 'vue'; - -export interface CategorizedAlarms { - occurred: NdmDeviceAlarmLogResultVO[]; - recovered: NdmDeviceAlarmLogResultVO[]; -} - -export interface StationAlarms { - [DeviceType.Camera]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.Decoder]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.Keyboard]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.MediaServer]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.Nvr]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.SecurityBox]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.Switch]: NdmDeviceAlarmLogResultVO[]; - [DeviceType.VideoServer]: NdmDeviceAlarmLogResultVO[]; - unclassified: NdmDeviceAlarmLogResultVO[]; -} +import type { StationAlarms } from './domains'; export interface LineAlarms { [stationCode: Station['code']]: StationAlarms; diff --git a/src/composables/query/alarm/use-station-alarms-query.ts b/src/composables/query/alarm/use-station-alarms-query.ts index 8c28e7f..11936e2 100644 --- a/src/composables/query/alarm/use-station-alarms-query.ts +++ b/src/composables/query/alarm/use-station-alarms-query.ts @@ -7,7 +7,7 @@ import { useQuery } from '@tanstack/vue-query'; import dayjs from 'dayjs'; import { storeToRefs } from 'pinia'; import { computed } from 'vue'; -import type { StationAlarms } from './use-line-alarms-query'; +import type { StationAlarms } from './domains'; const createEmptyStationAlarms = (): StationAlarms => ({ [DeviceType.Camera]: [],