diff --git a/src/apis/domain/biz/station/alarm.ts b/src/apis/domain/biz/station/alarm.ts index e86227f..58ad4d1 100644 --- a/src/apis/domain/biz/station/alarm.ts +++ b/src/apis/domain/biz/station/alarm.ts @@ -1,6 +1,7 @@ import type { DeviceType } from '@/enums'; export interface StationAlarmCounts { + [DeviceType.AlarmHost]: number; [DeviceType.Camera]: number; [DeviceType.Decoder]: number; [DeviceType.Keyboard]: number; diff --git a/src/apis/domain/biz/station/device.ts b/src/apis/domain/biz/station/device.ts index a1210a8..8c8dfa8 100644 --- a/src/apis/domain/biz/station/device.ts +++ b/src/apis/domain/biz/station/device.ts @@ -1,7 +1,18 @@ -import type { NdmCameraResultVO, NdmDecoderResultVO, NdmKeyboardResultVO, NdmMediaServerResultVO, NdmNvrResultVO, NdmSecurityBoxResultVO, NdmSwitchResultVO, NdmVideoServerResultVO } from '@/apis'; +import type { + NdmAlarmHostResultVO, + NdmCameraResultVO, + NdmDecoderResultVO, + NdmKeyboardResultVO, + NdmMediaServerResultVO, + NdmNvrResultVO, + NdmSecurityBoxResultVO, + NdmSwitchResultVO, + NdmVideoServerResultVO, +} from '@/apis'; import type { DeviceType } from '@/enums'; export interface StationDevices { + [DeviceType.AlarmHost]: NdmAlarmHostResultVO[]; [DeviceType.Camera]: NdmCameraResultVO[]; [DeviceType.Decoder]: NdmDecoderResultVO[]; [DeviceType.Keyboard]: NdmKeyboardResultVO[]; diff --git a/src/apis/model/biz/entity/alarm/index.ts b/src/apis/model/biz/entity/alarm/index.ts new file mode 100644 index 0000000..8e1b71a --- /dev/null +++ b/src/apis/model/biz/entity/alarm/index.ts @@ -0,0 +1 @@ +export * from './ndm-alarm-host'; diff --git a/src/apis/model/biz/entity/alarm/ndm-alarm-host.ts b/src/apis/model/biz/entity/alarm/ndm-alarm-host.ts new file mode 100644 index 0000000..1849715 --- /dev/null +++ b/src/apis/model/biz/entity/alarm/ndm-alarm-host.ts @@ -0,0 +1,38 @@ +import type { BaseModel, ReduceForPageQuery, ReduceForSaveVO, ReduceForUpdateVO } from '@/apis'; + +export interface NdmAlarmHost extends BaseModel { + deviceId: string; + name: string; + manufacturer: string; + state: boolean; + model: string; + ipAddress: string; + manageUrl: string; + manageUsername: string; + managePassword: string; + gbCode: string; + gbPort: number; + gbDomain: string; + gb28181Enabled: boolean; + diagFlag: string; + diagParam: string; + diagFormat: string; + lastDiagInfo: string; + lastDiagTime: string; + icmpEnabled: boolean; + description: string; + deviceStatus: string; + deviceType: string; + community: string; + frontendConfig: string; + linkDescription: string; + snmpEnabled: boolean; +} + +export type NdmAlarmHostResultVO = Partial; + +export type NdmAlarmHostSaveVO = Partial>; + +export type NdmAlarmHostUpdateVO = Partial>; + +export type NdmAlarmHostPageQuery = Partial>; diff --git a/src/apis/model/biz/entity/index.ts b/src/apis/model/biz/entity/index.ts index 7d8e163..764883a 100644 --- a/src/apis/model/biz/entity/index.ts +++ b/src/apis/model/biz/entity/index.ts @@ -1,8 +1,9 @@ +import type { NdmAlarmHost } from './alarm'; import type { NdmSecurityBox, NdmSwitch } from './other'; import type { NdmNvr } from './storage'; import type { NdmCamera, NdmDecoder, NdmKeyboard, NdmMediaServer, NdmVideoServer } from './video'; -export type NdmDeviceVO = NdmCamera | NdmDecoder | NdmKeyboard | NdmMediaServer | NdmNvr | NdmSecurityBox | NdmSwitch | NdmVideoServer; +export type NdmDeviceVO = NdmAlarmHost | NdmCamera | NdmDecoder | NdmKeyboard | NdmMediaServer | NdmNvr | NdmSecurityBox | NdmSwitch | NdmVideoServer; export type NdmDeviceResultVO = Partial; @@ -10,6 +11,7 @@ export type NdmServerVO = NdmMediaServer | NdmVideoServer; export type NdmServerResultVO = Partial; +export * from './alarm'; export * from './log'; export * from './other'; export * from './storage'; diff --git a/src/components/device-page/device-card/alarm-host-card.vue b/src/components/device-page/device-card/alarm-host-card.vue new file mode 100644 index 0000000..4dc1488 --- /dev/null +++ b/src/components/device-page/device-card/alarm-host-card.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/components/device-page/device-card/history-diag-card/alarm-host-history-diag-card.vue b/src/components/device-page/device-card/history-diag-card/alarm-host-history-diag-card.vue new file mode 100644 index 0000000..c97a549 --- /dev/null +++ b/src/components/device-page/device-card/history-diag-card/alarm-host-history-diag-card.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/components/device-page/device-card/history-diag-card/index.ts b/src/components/device-page/device-card/history-diag-card/index.ts index f03dfc4..ece23c9 100644 --- a/src/components/device-page/device-card/history-diag-card/index.ts +++ b/src/components/device-page/device-card/history-diag-card/index.ts @@ -1,3 +1,4 @@ +export { default as AlarmHostHistoryDiagCard } from './alarm-host-history-diag-card.vue'; export { default as CameraHistoryDiagCard } from './camera-history-diag-card.vue'; export { default as DecoderHistoryDiagCard } from './decoder-history-diag-card.vue'; export { default as DeviceAlarmHistoryDiagCard } from './device-alarm-history-diag-card.vue'; diff --git a/src/components/device-page/device-card/index.ts b/src/components/device-page/device-card/index.ts index 20f55cd..d808afd 100644 --- a/src/components/device-page/device-card/index.ts +++ b/src/components/device-page/device-card/index.ts @@ -1,3 +1,4 @@ +export { default as AlarmHostCard } from './alarm-host-card.vue'; export { default as CameraCard } from './camera-card.vue'; export { default as DecoderCard } from './decoder-card.vue'; export { default as KeyboardCard } from './keyboard-card.vue'; diff --git a/src/components/device-page/device-renderer.vue b/src/components/device-page/device-renderer.vue index 3edf09a..81d8198 100644 --- a/src/components/device-page/device-renderer.vue +++ b/src/components/device-page/device-renderer.vue @@ -1,6 +1,6 @@