diff --git a/src/apis/domains/device/diag-info/ndm-camera-diag-info.ts b/src/apis/domains/device/diag-info/ndm-camera-diag-info.ts index 5a79f62..522b285 100644 --- a/src/apis/domains/device/diag-info/ndm-camera-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-camera-diag-info.ts @@ -1,5 +1,5 @@ export interface NdmCameraDiagInfo { [key: string]: any; - logTime: string; - info: string; + logTime?: string; + info?: string; } diff --git a/src/apis/domains/device/diag-info/ndm-decoder-diag-info.ts b/src/apis/domains/device/diag-info/ndm-decoder-diag-info.ts index e0750d4..0dcea7d 100644 --- a/src/apis/domains/device/diag-info/ndm-decoder-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-decoder-diag-info.ts @@ -1,14 +1,14 @@ export interface NdmDecoderDiagInfo { [key: string]: any; - logTime: string; - stCommonInfo: { - 设备ID: string; - 软件版本: string; - 生产厂商: string; - 设备别名: string; - 设备型号: string; - 硬件版本: string; - 内存使用率: string; - CPU使用率: string; + logTime?: string; + stCommonInfo?: { + 设备ID?: string; + 软件版本?: string; + 生产厂商?: string; + 设备别名?: string; + 设备型号?: string; + 硬件版本?: string; + 内存使用率?: string; + CPU使用率?: string; }; } diff --git a/src/apis/domains/device/diag-info/ndm-nvr-diag-info.ts b/src/apis/domains/device/diag-info/ndm-nvr-diag-info.ts index 0687d1b..ce3cd4a 100644 --- a/src/apis/domains/device/diag-info/ndm-nvr-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-nvr-diag-info.ts @@ -1,31 +1,31 @@ export interface NdmNvrDiagInfo { [key: string]: any; - logTime: string; - info: { - diskHealth: number[]; - groupInfoList: { - freeSize: number; - state: number; - stateValue: string; - totalSize: number; + logTime?: string; + info?: { + diskHealth?: number[]; + groupInfoList?: { + freeSize?: number; + state?: number; + stateValue?: string; + totalSize?: number; }[]; }; - stCommonInfo: { - 设备ID: string; - 软件版本: string; - 生产厂商: string; - 设备别名: string; - 设备型号: string; - 硬件版本: string; - 内存使用率: string; - CPU使用率: string; + stCommonInfo?: { + 设备ID?: string; + 软件版本?: string; + 生产厂商?: string; + 设备别名?: string; + 设备型号?: string; + 硬件版本?: string; + 内存使用率?: string; + CPU使用率?: string; }; - cdFanInfo: { - 索引号: string; - '风扇转速(rpm)': string; + cdFanInfo?: { + 索引号?: string; + '风扇转速(rpm)'?: string; }[]; - cdPowerSupplyInfo: { - 索引号: string; - 电源状态: string; + cdPowerSupplyInfo?: { + 索引号?: string; + 电源状态?: string; }[]; } diff --git a/src/apis/domains/device/diag-info/ndm-security-box-diag-info.ts b/src/apis/domains/device/diag-info/ndm-security-box-diag-info.ts index e094d81..20448f9 100644 --- a/src/apis/domains/device/diag-info/ndm-security-box-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-security-box-diag-info.ts @@ -18,7 +18,7 @@ export interface NdmSecurityBoxDiagInfo { } export interface NdmSecurityBoxCircuit { - current?: number; - status?: number; - voltage?: number; + current: number; + status: number; + voltage: number; } diff --git a/src/apis/domains/device/diag-info/ndm-server-diag-info.ts b/src/apis/domains/device/diag-info/ndm-server-diag-info.ts index 57fe700..38d7a26 100644 --- a/src/apis/domains/device/diag-info/ndm-server-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-server-diag-info.ts @@ -1,9 +1,9 @@ export interface NdmServerDiagInfo { [key: string]: any; - commInfo: { - CPU使用率: string; - 内存使用率: string; - 磁盘使用率: string; - 系统运行时间: string; + commInfo?: { + CPU使用率?: string; + 内存使用率?: string; + 磁盘使用率?: string; + 系统运行时间?: string; }; } diff --git a/src/apis/domains/device/diag-info/ndm-switch-diag-info.ts b/src/apis/domains/device/diag-info/ndm-switch-diag-info.ts index befc53e..aea0e4f 100644 --- a/src/apis/domains/device/diag-info/ndm-switch-diag-info.ts +++ b/src/apis/domains/device/diag-info/ndm-switch-diag-info.ts @@ -2,10 +2,10 @@ export interface NdmSwitchDiagInfo { [key: string]: any; cpuRatio?: string; // 因环境不同可能不存在 memoryRatio?: string; // 因环境不同可能不存在 - logTime: string; - info: { - overFlowPorts: string[]; - portInfoList: NdmSwitchPortInfo[]; + logTime?: string; + info?: { + overFlowPorts?: string[]; + portInfoList?: NdmSwitchPortInfo[]; }; } diff --git a/src/components/device-page/device-card/camera-card.vue b/src/components/device-page/device-card/camera-card.vue index 2b46937..ba77050 100644 --- a/src/components/device-page/device-card/camera-card.vue +++ b/src/components/device-page/device-card/camera-card.vue @@ -8,6 +8,7 @@ import { computed, ref, toRefs } from 'vue'; import DeviceHeaderCard from './current-diag-card/device-header-card.vue'; import CameraHistoryDiagCard from './history-diag-card/camera-history-diag-card.vue'; import DeviceCommonCard from './current-diag-card/device-common-card.vue'; +import type { NdmCameraDiagInfo } from '@/apis/domains'; const props = defineProps<{ stationCode: string; @@ -22,7 +23,7 @@ const lastDiagInfo = computed(() => { const result = destr(ndmCamera.value.lastDiagInfo); if (!result) return null; if (typeof result !== 'object') return null; - return result; + return result as NdmCameraDiagInfo; }); const commonInfo = computed(() => { diff --git a/src/components/device-page/device-card/decoder-card.vue b/src/components/device-page/device-card/decoder-card.vue index 10fe512..742e771 100644 --- a/src/components/device-page/device-card/decoder-card.vue +++ b/src/components/device-page/device-card/decoder-card.vue @@ -21,10 +21,10 @@ const debugModeStore = useDebugModeStore(); const { stationCode, ndmDecoder } = toRefs(props); const lastDiagInfo = computed(() => { - const result = destr(ndmDecoder.value.lastDiagInfo); + const result = destr(ndmDecoder.value.lastDiagInfo); if (!result) return null; if (typeof result !== 'object') return null; - return result; + return result as NdmDecoderDiagInfo; }); const commonInfo = computed | undefined>(() => { @@ -37,8 +37,8 @@ const commonInfo = computed | undefined>(() => { return info; }); -const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo.CPU使用率); -const memUsage = computed(() => lastDiagInfo.value?.stCommonInfo.内存使用率); +const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.CPU使用率); +const memUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.内存使用率); const selectedTab = ref('设备状态'); diff --git a/src/components/device-page/device-card/nvr-card.vue b/src/components/device-page/device-card/nvr-card.vue index 1a76266..8673757 100644 --- a/src/components/device-page/device-card/nvr-card.vue +++ b/src/components/device-page/device-card/nvr-card.vue @@ -24,14 +24,14 @@ const debugModeStore = useDebugModeStore(); const { stationCode, ndmNvr } = toRefs(props); const lastDiagInfo = computed(() => { - const result = destr(ndmNvr.value.lastDiagInfo); + const result = destr(ndmNvr.value.lastDiagInfo); if (!result) return null; if (typeof result !== 'object') return null; - return result; + return result as NdmNvrDiagInfo; }); -const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo.CPU使用率); -const memUsage = computed(() => lastDiagInfo.value?.stCommonInfo.内存使用率); +const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.['CPU使用率']); +const memUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.['内存使用率']); const commonInfo = computed | undefined>(() => { const info = lastDiagInfo.value?.stCommonInfo; @@ -43,8 +43,8 @@ const commonInfo = computed | undefined>(() => { return info; }); -const diskHealth = computed(() => lastDiagInfo.value?.info.diskHealth); -const groupInfoList = computed(() => lastDiagInfo.value?.info.groupInfoList); +const diskHealth = computed(() => lastDiagInfo.value?.info?.diskHealth); +const groupInfoList = computed(() => lastDiagInfo.value?.info?.groupInfoList); const isCluster = computed(() => { return isNvrCluster(ndmNvr.value); diff --git a/src/components/device-page/device-card/security-box-card.vue b/src/components/device-page/device-card/security-box-card.vue index e1dc3e2..5e3fe27 100644 --- a/src/components/device-page/device-card/security-box-card.vue +++ b/src/components/device-page/device-card/security-box-card.vue @@ -30,7 +30,7 @@ const lastDiagInfo = computed(() => { }); const commonInfo = computed | undefined>(() => { - const info = lastDiagInfo.value?.stCommonInfo ?? {}; + const info = lastDiagInfo.value?.stCommonInfo; if (info) { // eslint-disable-next-line @typescript-eslint/no-unused-vars const { CPU使用率, 内存使用率, ...rest } = info; diff --git a/src/components/device-page/device-card/server-card.vue b/src/components/device-page/device-card/server-card.vue index 7a93108..a66ffdd 100644 --- a/src/components/device-page/device-card/server-card.vue +++ b/src/components/device-page/device-card/server-card.vue @@ -20,16 +20,16 @@ const debugModeStore = useDebugModeStore(); const { stationCode, ndmServer } = toRefs(props); const lastDiagInfo = computed(() => { - const result = destr(ndmServer.value.lastDiagInfo); + const result = destr(ndmServer.value.lastDiagInfo); if (!result) return null; if (typeof result !== 'object') return null; - return result; + return result as NdmServerDiagInfo; }); -const cpuUsage = computed(() => lastDiagInfo.value?.commInfo.CPU使用率); -const memUsage = computed(() => lastDiagInfo.value?.commInfo.内存使用率); -const diskUsage = computed(() => lastDiagInfo.value?.commInfo.磁盘使用率); -const runningTime = computed(() => lastDiagInfo.value?.commInfo.系统运行时间); +const cpuUsage = computed(() => lastDiagInfo.value?.commInfo?.['CPU使用率']); +const memUsage = computed(() => lastDiagInfo.value?.commInfo?.['内存使用率']); +const diskUsage = computed(() => lastDiagInfo.value?.commInfo?.['磁盘使用率']); +const runningTime = computed(() => lastDiagInfo.value?.commInfo?.['系统运行时间']); const selectedTab = ref('设备状态'); diff --git a/src/components/device-page/device-card/switch-card.vue b/src/components/device-page/device-card/switch-card.vue index 43bd868..54e8e21 100644 --- a/src/components/device-page/device-card/switch-card.vue +++ b/src/components/device-page/device-card/switch-card.vue @@ -21,16 +21,16 @@ const debugModeStore = useDebugModeStore(); const { stationCode, ndmSwitch } = toRefs(props); const lastDiagInfo = computed(() => { - const result = destr(ndmSwitch.value.lastDiagInfo); + const result = destr(ndmSwitch.value.lastDiagInfo); if (!result) return null; if (typeof result !== 'object') return null; - return result; + return result as NdmSwitchDiagInfo; }); const cpuUsage = computed(() => lastDiagInfo.value?.cpuRatio); const memUsage = computed(() => lastDiagInfo.value?.memoryRatio); -const portInfoList = computed(() => lastDiagInfo.value?.info.portInfoList ?? []); +const portInfoList = computed(() => lastDiagInfo.value?.info?.portInfoList ?? []); const selectedTab = ref('设备状态');