From b8ef57e4174540598119f2ec473bd58940f6d625 Mon Sep 17 00:00:00 2001
From: yangsy <ysy@ittc.sh.cn>
Date: Mon, 18 May 2026 13:25:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AE=BE=E5=A4=87=E8=AF=8A=E6=96=AD=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构报警主机、解码器、录像机、安防箱的设备诊断页通用信息展示逻辑，适配组件新的props格式。完善摄像头诊断相关的接口类型定义，为摄像头诊断页新增硬件使用率展示卡片，补充完整的设备基础信息和网络信息内容
---
 .../domain/biz/diag/ndm-camera-diag-info.ts   | 42 +++++++++-
 .../alarm-host-current-diag.vue               | 19 +++--
 .../ndm-camera/camera-current-diag.vue        | 76 +++++++++++++++----
 .../ndm-decoder/decoder-current-diag.vue      | 26 ++++---
 .../device-card/ndm-nvr/nvr-current-diag.vue  | 26 ++++---
 .../security-box-current-diag.vue             | 26 ++++---
 6 files changed, 161 insertions(+), 54 deletions(-)

diff --git a/src/apis/domain/biz/diag/ndm-camera-diag-info.ts b/src/apis/domain/biz/diag/ndm-camera-diag-info.ts
index 522b285..9a5919a 100644
--- a/src/apis/domain/biz/diag/ndm-camera-diag-info.ts
+++ b/src/apis/domain/biz/diag/ndm-camera-diag-info.ts
@@ -1,5 +1,45 @@
 export interface NdmCameraDiagInfo {
   [key: string]: any;
+  ethInfo?: {
+    adminStatus?: string; // '1'
+    desc?: string; // 'IPcamera'
+    ifType?: string; // '5'
+    inDiscards?: string; // '0'
+    inErrors?: string; // '0'
+    inNUcastPkts?: string; // '0'
+    inOctets?: string; // '0'
+    inUcastPkts?: string; // '0'
+    inUnknownProtos?: string; // '0'
+    index?: string; // '1'
+    lastChange?: string; // '0:00:00.00'
+    mTU?: string; // '1500'
+    macAddress?: string; // '04:ee:cd:52:3a:a5'
+    operStatus?: string; // '1'
+    outDiscards?: string; // '0'
+    outErrors?: string; // '0'
+    outNUcastPkts?: string; // '0'
+    outOctets?: string; // '0'
+    outQLen?: string; // '0'
+    outUcastPkts?: string; // '0'
+    specific?: string; // '0.0'
+    speed?: string; // '10000000'
+  };
+  ipInfo?: {
+    broadcastAddress?: string; // '0'
+    iPAddress?: string; // '0'
+    index?: string; // '1'
+    mASK?: string; // '255.255.255.0'
+    reasmMaxSize?: string; // '0'
+  };
   logTime?: string;
-  info?: string;
+  stCommonInfo?: {
+    设备ID?: string;
+    软件版本?: string;
+    设备厂商?: string;
+    设备别名?: string;
+    设备型号?: string;
+    硬件版本?: string;
+    内存使用率?: string;
+    CPU使用率?: string;
+  };
 }
diff --git a/src/components/device/device-card/ndm-alarm-host/alarm-host-current-diag.vue b/src/components/device/device-card/ndm-alarm-host/alarm-host-current-diag.vue
index fcdb39a..a8aeb6e 100644
--- a/src/components/device/device-card/ndm-alarm-host/alarm-host-current-diag.vue
+++ b/src/components/device/device-card/ndm-alarm-host/alarm-host-current-diag.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { NFlex } from 'naive-ui';
-import { DeviceCommonCard, DeviceHeaderCard } from '@/components';
+import { DeviceCommonCard, DeviceHeaderCard, type DeviceCommonCardProps } from '@/components';
 import type { NdmAlarmHostResultVO, Station } from '@/apis';
 import { computed, toRefs } from 'vue';
 
@@ -11,13 +11,18 @@ const props = defineProps<{
 
 const { ndmDevice, station } = toRefs(props);
 
-const commonInfo = computed(() => {
+const commonInfo = computed<DeviceCommonCardProps['commonInfo']>(() => {
   const { createdTime, updatedTime, manufacturer } = ndmDevice.value;
-  return {
-    创建时间: createdTime ?? '-',
-    更新时间: updatedTime ?? '-',
-    制造商: manufacturer ?? '-',
-  };
+  return [
+    {
+      title: '设备接入信息',
+      items: [
+        { label: '创建时间', value: createdTime || '-' },
+        { label: '更新时间', value: updatedTime || '-' },
+        { label: '制造商', value: manufacturer || '-' },
+      ],
+    },
+  ];
 });
 </script>
 
diff --git a/src/components/device/device-card/ndm-camera/camera-current-diag.vue b/src/components/device/device-card/ndm-camera/camera-current-diag.vue
index 31985a7..a0959e7 100644
--- a/src/components/device/device-card/ndm-camera/camera-current-diag.vue
+++ b/src/components/device/device-card/ndm-camera/camera-current-diag.vue
@@ -16,11 +16,12 @@ const isCameraTypeCode = (code: string): code is CameraType => {
 </script>
 
 <script setup lang="ts">
-import type { NdmCameraResultVO, Station } from '@/apis';
-import { DeviceCommonCard, DeviceHeaderCard } from '@/components';
+import type { NdmCameraDiagInfo, NdmCameraResultVO, Station } from '@/apis';
+import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, type DeviceCommonCardProps } from '@/components';
 import { useSettingStore } from '@/stores';
 import { useQuery, useQueryClient } from '@tanstack/vue-query';
 import axios from 'axios';
+import destr from 'destr';
 import { NDescriptions, NDescriptionsItem, NFlex } from 'naive-ui';
 import { storeToRefs } from 'pinia';
 import { computed, toRefs, watch } from 'vue';
@@ -113,7 +114,17 @@ watch(activeRequests, (active) => {
   }
 });
 
-const commonInfo = computed(() => {
+const lastDiagInfo = computed(() => {
+  const result = destr<any>(ndmDevice.value.lastDiagInfo);
+  if (!result) return null;
+  if (typeof result !== 'object') return null;
+  return result as NdmCameraDiagInfo;
+});
+
+const commonInfo = computed<DeviceCommonCardProps['commonInfo']>(() => {
+  const { stCommonInfo } = lastDiagInfo.value ?? {};
+  const { 设备ID, 软件版本, 设备厂商, 设备别名, 设备型号, 硬件版本 } = stCommonInfo ?? {};
+  const { ethInfo, ipInfo } = lastDiagInfo.value ?? {};
   const {
     createdTime,
     updatedTime,
@@ -126,22 +137,54 @@ const commonInfo = computed(() => {
     onvifMinorIndex,
     icmpEnabled,
     community,
+    ipAddress,
     //
   } = ndmDevice.value;
-  return {
-    创建时间: createdTime ?? '-',
-    更新时间: updatedTime ?? '-',
-    制造商: manufacturer ?? '-',
-    GB28181启用: `${!!gb28181Enabled ? '是' : '否'}`,
-    ONVIF端口: `${onvifPort ?? '-'}`,
-    ONVIF用户名: onvifUsername ?? '-',
-    ONVIF密码: onvifPassword ?? '-',
-    ONVIF主流索引: `${onvifMajorIndex ?? '-'}`,
-    ONVIF辅流索引: `${onvifMinorIndex ?? '-'}`,
-    ICMP启用: `${!!icmpEnabled ? '是' : '否'}`,
-    团体字符串: community ?? '-',
-  };
+
+  return [
+    {
+      title: '设备型号信息',
+      items: [
+        { label: '设备ID', value: 设备ID || '-' },
+        { label: '软件版本', value: 软件版本 || '-' },
+        { label: '设备厂商', value: 设备厂商 || manufacturer || '-' },
+        { label: '设备别名', value: 设备别名 || '-' },
+        { label: '设备型号', value: 设备型号 || '-' },
+        { label: '硬件版本', value: 硬件版本 || '-' },
+      ],
+    },
+    {
+      title: '设备网卡信息',
+      items: [
+        { label: 'IP地址', value: ipAddress || '-' },
+        { label: '子网掩码', value: ipInfo?.mASK || '-' },
+        { label: 'MAC地址', value: ethInfo?.macAddress || '-' },
+        { label: '连接速率', value: ethInfo?.speed || '-' },
+        { label: 'MTU', value: ethInfo?.mTU || '-' },
+        { label: '管理状态', value: ethInfo?.adminStatus || '-' },
+        { label: '运行状态', value: ethInfo?.operStatus || '-' },
+      ],
+    },
+    {
+      title: '设备接入信息',
+      items: [
+        { label: '创建时间', value: createdTime || '-' },
+        { label: '更新时间', value: updatedTime || '-' },
+        { label: 'GB28181启用', value: `${!!gb28181Enabled ? '是' : '否'}` },
+        { label: 'ICMP启用', value: `${!!icmpEnabled ? '是' : '否'}` },
+        { label: 'ONVIF用户名', value: onvifUsername || '-' },
+        { label: 'ONVIF密码', value: onvifPassword || '-' },
+        { label: 'ONVIF主流索引', value: `${onvifMajorIndex ?? '-'}` },
+        { label: 'ONVIF辅流索引', value: `${onvifMinorIndex ?? '-'}` },
+        { label: 'ONVIF端口', value: `${onvifPort ?? '-'}` },
+        { label: '团体字符串', value: community || '-' },
+      ],
+    },
+  ];
 });
+
+const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.CPU使用率);
+const memUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.内存使用率);
 </script>
 
 <template>
@@ -155,6 +198,7 @@ const commonInfo = computed(() => {
       </template>
     </DeviceHeaderCard>
     <DeviceCommonCard :common-info="commonInfo" />
+    <DeviceHardwareCard :cpu-usage="cpuUsage" :mem-usage="memUsage" />
   </NFlex>
 </template>
 
diff --git a/src/components/device/device-card/ndm-decoder/decoder-current-diag.vue b/src/components/device/device-card/ndm-decoder/decoder-current-diag.vue
index 0ae489f..9d64853 100644
--- a/src/components/device/device-card/ndm-decoder/decoder-current-diag.vue
+++ b/src/components/device/device-card/ndm-decoder/decoder-current-diag.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NdmDecoderDiagInfo, NdmDecoderResultVO, Station } from '@/apis';
-import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard } from '@/components';
+import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, type DeviceCommonCardProps } from '@/components';
 import destr from 'destr';
 import { NFlex } from 'naive-ui';
 import { computed, toRefs } from 'vue';
@@ -19,17 +19,23 @@ const lastDiagInfo = computed(() => {
   return result as NdmDecoderDiagInfo;
 });
 
-const commonInfo = computed(() => {
+const commonInfo = computed<DeviceCommonCardProps['commonInfo']>(() => {
   const { stCommonInfo } = lastDiagInfo.value ?? {};
   const { 设备ID, 软件版本, 设备厂商, 设备别名, 设备型号, 硬件版本 } = stCommonInfo ?? {};
-  return {
-    设备ID: 设备ID ?? '-',
-    软件版本: 软件版本 ?? '-',
-    设备厂商: 设备厂商 ?? '-',
-    设备别名: 设备别名 ?? '-',
-    设备型号: 设备型号 ?? '-',
-    硬件版本: 硬件版本 ?? '-',
-  };
+
+  return [
+    {
+      title: '设备型号信息',
+      items: [
+        { label: '设备ID', value: 设备ID || '-' },
+        { label: '软件版本', value: 软件版本 || '-' },
+        { label: '设备厂商', value: 设备厂商 || '-' },
+        { label: '设备别名', value: 设备别名 || '-' },
+        { label: '设备型号', value: 设备型号 || '-' },
+        { label: '硬件版本', value: 硬件版本 || '-' },
+      ],
+    },
+  ];
 });
 
 const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.CPU使用率);
diff --git a/src/components/device/device-card/ndm-nvr/nvr-current-diag.vue b/src/components/device/device-card/ndm-nvr/nvr-current-diag.vue
index 59b46fc..d555832 100644
--- a/src/components/device/device-card/ndm-nvr/nvr-current-diag.vue
+++ b/src/components/device/device-card/ndm-nvr/nvr-current-diag.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NdmNvrDiagInfo, NdmNvrResultVO, Station } from '@/apis';
-import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, NvrDiskCard, NvrRecordCheckCard } from '@/components';
+import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, NvrDiskCard, NvrRecordCheckCard, type DeviceCommonCardProps } from '@/components';
 import { isNvrCluster } from '@/helpers';
 import destr from 'destr';
 import { NFlex } from 'naive-ui';
@@ -20,18 +20,24 @@ const lastDiagInfo = computed(() => {
   return result as NdmNvrDiagInfo;
 });
 
-const commonInfo = computed(() => {
+const commonInfo = computed<DeviceCommonCardProps['commonInfo']>(() => {
   const { stCommonInfo } = lastDiagInfo.value ?? {};
   if (!stCommonInfo) return undefined;
   const { 设备ID, 软件版本, 生产厂商, 设备别名, 设备型号, 硬件版本 } = stCommonInfo;
-  return {
-    设备ID: 设备ID ?? '-',
-    软件版本: 软件版本 ?? '-',
-    生产厂商: 生产厂商 ?? '-',
-    设备别名: 设备别名 ?? '-',
-    设备型号: 设备型号 ?? '-',
-    硬件版本: 硬件版本 ?? '-',
-  };
+
+  return [
+    {
+      title: '设备型号信息',
+      items: [
+        { label: '设备ID', value: 设备ID || '-' },
+        { label: '软件版本', value: 软件版本 || '-' },
+        { label: '生产厂商', value: 生产厂商 || '-' },
+        { label: '设备别名', value: 设备别名 || '-' },
+        { label: '设备型号', value: 设备型号 || '-' },
+        { label: '硬件版本', value: 硬件版本 || '-' },
+      ],
+    },
+  ];
 });
 
 const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.CPU使用率);
diff --git a/src/components/device/device-card/ndm-security-box/security-box-current-diag.vue b/src/components/device/device-card/ndm-security-box/security-box-current-diag.vue
index 3766754..77eeebe 100644
--- a/src/components/device/device-card/ndm-security-box/security-box-current-diag.vue
+++ b/src/components/device/device-card/ndm-security-box/security-box-current-diag.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { NdmSecurityBoxDiagInfo, NdmSecurityBoxResultVO, Station } from '@/apis';
-import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, SecurityBoxCircuitCard, SecurityBoxEnvCard } from '@/components';
+import { DeviceCommonCard, DeviceHardwareCard, DeviceHeaderCard, SecurityBoxCircuitCard, SecurityBoxEnvCard, type DeviceCommonCardProps } from '@/components';
 import destr from 'destr';
 import { NFlex } from 'naive-ui';
 import { computed, toRefs } from 'vue';
@@ -19,17 +19,23 @@ const lastDiagInfo = computed(() => {
   return result as NdmSecurityBoxDiagInfo;
 });
 
-const commonInfo = computed(() => {
+const commonInfo = computed<DeviceCommonCardProps['commonInfo']>(() => {
   const { stCommonInfo } = lastDiagInfo.value ?? {};
   const { 设备ID, 软件版本, 设备厂商, 设备别名, 设备型号, 硬件版本 } = stCommonInfo ?? {};
-  return {
-    设备ID: 设备ID ?? '',
-    软件版本: 软件版本 ?? '',
-    设备厂商: 设备厂商 ?? '',
-    设备别名: 设备别名 ?? '',
-    设备型号: 设备型号 ?? '',
-    硬件版本: 硬件版本 ?? '',
-  };
+
+  return [
+    {
+      title: '设备型号信息',
+      items: [
+        { label: '设备ID', value: 设备ID || '-' },
+        { label: '软件版本', value: 软件版本 || '-' },
+        { label: '设备厂商', value: 设备厂商 || '-' },
+        { label: '设备别名', value: 设备别名 || '-' },
+        { label: '设备型号', value: 设备型号 || '-' },
+        { label: '硬件版本', value: 硬件版本 || '-' },
+      ],
+    },
+  ];
 });
 
 const cpuUsage = computed(() => lastDiagInfo.value?.stCommonInfo?.CPU使用率);