diff --git a/config/vite.config.dev.ts b/config/vite.config.dev.ts
index f9c3afd..22064b0 100644
--- a/config/vite.config.dev.ts
+++ b/config/vite.config.dev.ts
@@ -52,8 +52,6 @@ export default ({ mode }: ConfigEnv) => {
     '/DC-Control': proxyTarget(3031),
     '/dc-control': proxyTarget(3031),
     '/dc-network': proxyTarget(12429),
-    '/DC-Hardware': proxyTarget(12450),
-    '/dc-hardware': proxyTarget(12450),
     '/dc-host': proxyTarget(9030),
     '/dc-middleware': proxyTarget(12428),
     '/dc-database': proxyTarget(12580),
diff --git a/src/api/ops/alertPolicy.ts b/src/api/ops/alertPolicy.ts
index ea71a97..ba459b1 100644
--- a/src/api/ops/alertPolicy.ts
+++ b/src/api/ops/alertPolicy.ts
@@ -1,151 +1,255 @@
 import { request } from '@/api/request'
 
-/** 获取 告警策略列表 */
-export const fetchPolicyList = (data: {
-  page?: number
-  page_size?: number
-  keyword?: string
+export type PolicyCategory =
+  | 'os'
+  | 'pc_os'
+  | 'server_hardware'
+  | 'service_process'
+  | 'network_device'
+  | 'security_device'
+  | 'storage'
+  | 'database'
+  | 'middleware'
+  | 'power_env'
+  | 'safety_env'
+
+export type ServicePolicyCategory = 'database' | 'middleware' | 'host' | 'pc' | 'network' | 'security' | 'storage' | 'room_device'
+export type RuleType = 'static' | 'dynamic'
+export type CompareOperator = '>' | '>=' | '<' | '<=' | '==' | '!='
+export type SuppressionType = 'dedup' | 'aggregate' | 'dependency' | 'throttle' | 'schedule'
+
+export interface AlertSeverity {
+  id: number
+  code: string
+  name: string
+  color?: string
   enabled?: boolean
-  priority?: number
-  created_at_start?: string
-  created_at_end?: string
-  order_by?: string
-  order?: string
-}) => request.get('/Alert/v1/policy/list', { params: data })
+}
 
-/** 获取 告警策略详情 */
-export const fetchPolicyDetail = (id: number) => request.get(`/Alert/v1/policy/get/${id}`)
+export interface NotificationChannel {
+  id: number
+  code: string
+  name: string
+  type: string
+  enabled: boolean
+}
 
-/** 创建 告警策略 */
-export const createPolicy = (data: {
+export interface MetricDefinition {
+  id: number
+  metric_code: string
+  metric_name: string
+  resource_category: string
+  resource_subtype: string
+  data_source: string
+  storage_metric_name: string
+  metric_type: string
+  unit: string
+  value_type: 'number' | 'boolean'
+  compare_operators: string
+  threshold_suggestion: string
+  collect_method: string
+  alert_supported: boolean
+}
+
+export interface AlertRuleInput {
+  code: string
   name: string
   description?: string
-  enabled?: boolean
-  priority?: number
+  rule_type: RuleType
+  enabled: boolean
+  metric_name: string
+  data_source: string
+  threshold: number
+  compare_op: CompareOperator
+  duration: number
+  eval_interval: number
+  baseline_config?: string
+  severity_code: string
   labels?: string
-  template_id?: number
-  auto_create_ticket?: boolean
-  feedback_template_id?: number
-  dispatch_rule?: string
-}) => request.post('/Alert/v1/policy/create', data)
+  annotations?: string
+}
 
-/** 更新 告警策略 */
-export const updatePolicy = (data: {
+export interface AlertRule extends Omit<AlertRuleInput, 'severity_code'> {
   id: number
-  name?: string
-  description?: string
-  enabled?: boolean
-  priority?: number
-  labels?: string
-  template_id?: number
-  auto_create_ticket?: boolean
-  feedback_template_id?: number
-  dispatch_rule?: string
-}) => request.post('/Alert/v1/policy/update', data)
-
-/** 删除 告警策略 */
-export const deletePolicy = (id: number) => request.delete(`/Alert/v1/policy/delete/${id}`)
-
-/** 获取 告警规则列表 */
-export const fetchRuleList = (data: {
-  policy_id?: number
-  page?: number
-  page_size?: number
-  keyword?: string
-  sort?: string
-  order?: string
-}) => request.get('/Alert/v1/rule/list', { params: data })
-
-/** 获取 告警规则详情 */
-export const fetchRuleDetail = (id: number) => request.get(`/Alert/v1/rule/get/${id}`)
-
-/** 创建 告警规则 */
-export const createRule = (data: {
   policy_id: number
+  metric_category: PolicyCategory
+  severity_id: number
+  severity?: AlertSeverity
+}
+
+export interface PolicySuppressionRuleInput {
+  code: string
   name: string
   description?: string
-  rule_type: string
-  severity_id: number
-  enabled?: boolean
-  metric_name?: string
-  data_source?: string
-  threshold?: number
-  compare_op?: string
-  duration?: number
-  eval_interval?: number
-  baseline_config?: string
-  labels?: string
-  annotations?: string
-}) => request.post('/Alert/v1/rule/create', data)
+  type: SuppressionType
+  enabled: boolean
+  priority: number
+  dedup_window?: number
+  dedup_keys?: string
+  aggregate_window?: number
+  group_by?: string
+  aggregate_count?: number
+  source_matchers?: string
+  target_matchers?: string
+  throttle_count?: number
+  throttle_window?: number
+  schedule?: string
+  matchers?: string
+}
 
-/** 更新 告警规则 */
-export const updateRule = (data: {
+export interface PolicySuppressionRule extends PolicySuppressionRuleInput {
   id: number
-  name?: string
-  description?: string
-  rule_type?: string
-  severity_id?: number
-  enabled?: boolean
-  metric_name?: string
-  data_source?: string
-  threshold?: number
-  compare_op?: string
-  duration?: number
-  eval_interval?: number
-  baseline_config?: string
-  labels?: string
-  annotations?: string
-}) => request.post('/Alert/v1/rule/update', data)
+  policy_id: number
+}
 
-/** 删除 告警规则 */
-export const deleteRule = (id: number) => request.delete(`/Alert/v1/rule/delete/${id}`)
-
-/** 获取 告警模板列表 */
-export const fetchTemplateList = (data: { page?: number; page_size?: number; keyword?: string }) =>
-  request.get('/Alert/v1/template/list', { params: data })
-
-/** 获取 告警级别列表 */
-export const fetchSeverityList = (data: { page?: number; page_size?: number; enabled?: string }) =>
-  request.get('/Alert/v1/severity/list', { params: data })
-
-/** 获取告警级别下拉选项（不分页），支持 keyword 模糊搜索与 enabled=true 过滤 */
-export const fetchSeverityOptions = (data?: { keyword?: string; enabled?: 'true' | 'false' }) =>
-  request.get('/Alert/v1/severity/options', {
-    params: {
-      keyword: data?.keyword || undefined,
-      enabled: data?.enabled ?? 'true',
-    },
-  })
-
-/** 获取工单模板下拉选项 */
-export const fetchFeedbackTemplateOptions = (data?: { status?: 'active' | 'inactive' }) =>
-  request.get('/Feedback/v1/templates/options', { params: data || {} })
-
-/** 告警策略选项项 */
-export interface PolicyOptionItem {
+export interface AlertPolicy {
   id: number
   created_at: string
   updated_at: string
+  code: string
   name: string
   description: string
+  category: PolicyCategory
+  tags: string
   enabled: boolean
-  priority: number
-  labels: string
-  template_id: number
+  is_system_preset: boolean
   auto_create_ticket: boolean
   feedback_template_id: number
-  dispatch_rule: string
+  binding_count: number
+  rules: AlertRule[]
+  channels: NotificationChannel[]
+  suppression_rules: PolicySuppressionRule[]
 }
 
-/** 告警策略选项查询参数 */
+export interface PolicySaveInput {
+  code: string
+  name: string
+  description?: string
+  category: PolicyCategory
+  tags?: string
+  enabled: boolean
+  auto_create_ticket: boolean
+  feedback_template_id: number
+  channel_ids: number[]
+  rules: AlertRuleInput[]
+  suppression_rules: PolicySuppressionRuleInput[]
+}
+
+export interface PolicyDocument {
+  format: 'ops-alert-policy'
+  version: 1
+  policy: Record<string, unknown>
+}
+
+export const POLICY_CATEGORIES: Array<{ value: PolicyCategory; label: string }> = [
+  { value: 'os', label: '服务器操作系统' },
+  { value: 'pc_os', label: '办公 PC 操作系统' },
+  { value: 'server_hardware', label: '服务器硬件' },
+  { value: 'service_process', label: '服务器服务可用性' },
+  { value: 'network_device', label: '网络设备' },
+  { value: 'security_device', label: '安全设备' },
+  { value: 'storage', label: '存储设备' },
+  { value: 'database', label: '数据库' },
+  { value: 'middleware', label: '中间件' },
+  { value: 'power_env', label: '电力、UPS、空调与温湿度' },
+  { value: 'safety_env', label: '消防、门禁、漏水与有害气体' },
+]
+
+export const POLICY_CATEGORY_DATA_SOURCE: Record<PolicyCategory, string> = {
+  os: 'dc-host',
+  pc_os: 'dc-host',
+  server_hardware: 'dc-host',
+  service_process: 'dc-host',
+  network_device: 'dc-network',
+  security_device: 'dc-security',
+  storage: 'dc-storage',
+  database: 'dc-database',
+  middleware: 'dc-middleware',
+  power_env: 'dc-room-device',
+  safety_env: 'dc-room-device',
+}
+
+export const DATA_SOURCES = [
+  { value: 'dc-host', label: '主机与服务器指标' },
+  { value: 'dc-network', label: '网络设备指标' },
+  { value: 'dc-database', label: '数据库指标' },
+  { value: 'dc-middleware', label: '中间件指标' },
+  { value: 'dc-security', label: '安全设备指标' },
+  { value: 'dc-storage', label: '存储设备指标' },
+  { value: 'dc-room-device', label: '机房设备指标' },
+]
+
+export const COMPARE_OPERATORS = [
+  { value: '>', label: '大于' },
+  { value: '>=', label: '大于等于' },
+  { value: '<', label: '小于' },
+  { value: '<=', label: '小于等于' },
+  { value: '==', label: '等于' },
+  { value: '!=', label: '不等于' },
+]
+
+export const RULE_TYPES = [
+  { value: 'static', label: '静态阈值' },
+  { value: 'dynamic', label: '动态基线' },
+]
+
+export const SUPPRESSION_TYPE_OPTIONS = [
+  { value: 'dedup', label: '去重' },
+  { value: 'aggregate', label: '聚合' },
+  { value: 'dependency', label: '依赖抑制' },
+  { value: 'throttle', label: '限流' },
+  { value: 'schedule', label: '定时屏蔽' },
+]
+
+export const getPolicyDataSource = (category: PolicyCategory | '') => (category ? POLICY_CATEGORY_DATA_SOURCE[category] : '')
+
+export const fetchPolicyList = (params: {
+  page?: number
+  page_size?: number
+  keyword?: string
+  enabled?: boolean
+  category?: PolicyCategory
+  is_system_preset?: boolean
+}) => request.get('/Alert/v1/policy/list', { params })
+
+export const fetchPolicyDetail = (id: number) => request.get(`/Alert/v1/policy/get/${id}`)
+export const createPolicy = (data: PolicySaveInput) => request.post('/Alert/v1/policy/create', data)
+export const updatePolicy = (data: Partial<PolicySaveInput> & { id: number }) => request.post('/Alert/v1/policy/update', data)
+export const deletePolicy = (id: number) => request.delete(`/Alert/v1/policy/delete/${id}`)
+export const copyPolicy = (data: { source_id: number; code: string; name: string }) => request.post('/Alert/v1/policy/copy', data)
+export const exportPolicy = (id: number) => request.get(`/Alert/v1/policy/export/${id}`)
+export const importPolicy = (data: PolicyDocument) => request.post('/Alert/v1/policy/import', data)
+
+export const fetchChannelList = (params?: { enabled?: boolean; keyword?: string; page?: number; page_size?: number }) =>
+  request.get('/Alert/v1/channel/list', { params })
+
+export const fetchSeverityOptions = (params?: { keyword?: string; enabled?: 'true' | 'false' }) =>
+  request.get('/Alert/v1/severity/options', {
+    params: { keyword: params?.keyword || undefined, enabled: params?.enabled ?? 'true' },
+  })
+
+export const fetchFeedbackTemplateOptions = (params?: { status?: 'active' | 'inactive' }) =>
+  request.get('/Feedback/v1/templates/options', { params: params || {} })
+
+export const fetchMetricDefinitionOptions = (params: { policy_category: PolicyCategory; keyword?: string; alert_supported?: boolean }) =>
+  request.get('/DC-Control/v1/metric-definitions/options', {
+    params: {
+      policy_category: params.policy_category,
+      keyword: params.keyword || undefined,
+      alert_supported: params.alert_supported ?? true,
+    },
+  })
+
+export type PolicyOptionItem = AlertPolicy
+
 export interface PolicyOptionsParams {
   keyword?: string
   enabled?: boolean
+  resource_category?: ServicePolicyCategory
 }
 
-export type ServicePolicyCategory = 'database' | 'middleware' | 'host' | 'security' | 'storage' | 'room_device'
-
 export interface ServicePolicyBindingDetails {
+	resource_uid: string
   category: ServicePolicyCategory
   service_identity: string
   source_version: number
@@ -153,6 +257,7 @@ export interface ServicePolicyBindingDetails {
 }
 
 export interface AlertBindingSyncStatus {
+	resource_uid: string
   category: ServicePolicyCategory
   service_identity: string
   source_version?: number
@@ -164,17 +269,15 @@ export interface AlertBindingSyncStatus {
   next_attempt_at?: string
 }
 
-/** 获取告警策略下拉选项（不分页），支持 keyword 模糊搜索与 enabled 过滤 */
-export const fetchPolicyOptions = (params?: PolicyOptionsParams) => request.get<PolicyOptionItem[]>('/Alert/v1/policy/options', { params })
+export const fetchPolicyOptions = (params?: PolicyOptionsParams) =>
+  request.get<PolicyOptionItem[]>('/Alert/v1/policy/options', { params })
 
-/** 获取资源当前绑定的告警策略 */
-export const fetchServicePolicyBindings = (category: ServicePolicyCategory, serviceIdentity: string) =>
+export const fetchServicePolicyBindings = (resourceUID: string) =>
   request.get<{ code: number; details?: ServicePolicyBindingDetails; message?: string }>('/Alert/v1/service-policy-bindings', {
-    params: { category, service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
 
-/** 获取告警策略绑定同步状态 */
-export const fetchAlertBindingSyncStatus = (category: ServicePolicyCategory, serviceIdentity: string) =>
+export const fetchAlertBindingSyncStatus = (resourceUID: string) =>
   request.get<{ code: number; details?: AlertBindingSyncStatus; message?: string }>('/DC-Control/v1/alert-binding-sync/status', {
-    params: { category, service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
diff --git a/src/api/ops/alertRouting.ts b/src/api/ops/alertRouting.ts
index f20548c..ead75f3 100644
--- a/src/api/ops/alertRouting.ts
+++ b/src/api/ops/alertRouting.ts
@@ -36,7 +36,9 @@ export interface ResponsibilityRule extends RoutingScope {
   name: string
   description?: string
   enabled: boolean
-  owner_user_id: number
+  owner_type: 'internal' | 'external'
+  owner_user_id?: number
+  external_contact_id?: number
   subscriber_group_ids: number[] | string
   cc_user_ids: number[] | string
 }
diff --git a/src/api/ops/alertTemplate.ts b/src/api/ops/alertTemplate.ts
deleted file mode 100644
index 992d904..0000000
--- a/src/api/ops/alertTemplate.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { request } from '@/api/request'
-
-// 告警模板类型定义
-export interface AlertTemplate {
-  id?: number
-  name: string
-  category: string
-  description?: string
-  enabled?: boolean
-  tags?: string
-  rules: AlertRule[]
-  channels: ChannelRef[]
-  suppression_rule_ids?: number[]
-  created_at?: string
-  updated_at?: string
-}
-
-// 告警规则
-export interface AlertRule {
-  name: string
-  data_source: string
-  metric_name: string
-  rule_type: 'static' | 'dynamic'
-  compare_op: '>' | '>=' | '<' | '<=' | '==' | '!='
-  threshold: string | number
-  duration: number
-  eval_interval: number
-  severity_code: string
-  baseline_config?: string
-  labels?: Record<string, string>
-  annotations?: Record<string, string>
-}
-
-// 通知渠道引用
-export interface ChannelRef {
-  channel_id: number
-}
-
-// 通知渠道
-export interface NotificationChannel {
-  id: number
-  name: string
-  type: string
-  config?: Record<string, any>
-  enabled?: boolean
-  created_at?: string
-  updated_at?: string
-}
-
-// 抑制规则
-export interface SuppressionRule {
-  id: number
-  name: string
-  description?: string
-  enabled?: boolean
-  matchers?: Record<string, any>
-  created_at?: string
-  updated_at?: string
-}
-
-// 告警级别
-export interface AlertSeverity {
-  id: number
-  code: string
-  name: string
-  color?: string
-  level?: number
-  description?: string
-  icon?: string
-  priority?: number
-  enabled?: boolean
-  is_default?: boolean
-  config?: any
-}
-
-// 指标元数据
-export interface MetricMeta {
-  metric_name: string
-  metric_unit: string
-  type: string
-  last_timestamp: string
-}
-
-// 指标聚合响应
-export interface MetricsAggregateResponse {
-  data_source: string
-  server_identity: string
-  count: number
-  metrics: MetricMeta[]
-}
-
-// 模板分类选项
-export const TEMPLATE_CATEGORIES = [
-  { value: 'os', label: '操作系统监控模板' },
-  { value: 'server_hardware', label: '服务器硬件监控模板' },
-  { value: 'network_device', label: '网络设备监控模板' },
-  { value: 'security_device', label: '安全设备监控模板' },
-  { value: 'storage', label: '存储设备监控模板' },
-  { value: 'database', label: '数据库监控模板' },
-  { value: 'middleware', label: '中间件监控模板' },
-  { value: 'virtualization', label: '虚拟化监控模板' },
-  { value: 'power_env', label: '电力/UPS/空调/温湿度模板' },
-  { value: 'safety_env', label: '消防/门禁/漏水/有害气体模板' },
-]
-
-// 数据源选项
-export const DATA_SOURCES = [
-  { value: 'dc-host', label: '主机/操作系统指标' },
-  { value: 'dc-database', label: '数据库指标' },
-  { value: 'dc-middleware', label: '中间件指标' },
-  { value: 'dc-security', label: '安全设备指标' },
-  { value: 'dc-storage', label: '存储设备指标' },
-  { value: 'dc-room-device', label: '机房设备指标' },
-]
-
-// 比较运算符选项
-export const COMPARE_OPERATORS = [
-  { value: '>', label: '大于' },
-  { value: '>=', label: '大于等于' },
-  { value: '<', label: '小于' },
-  { value: '<=', label: '小于等于' },
-  { value: '==', label: '等于' },
-  { value: '!=', label: '不等于' },
-]
-
-// 规则类型选项
-export const RULE_TYPES = [
-  { value: 'static', label: '静态阈值' },
-  { value: 'dynamic', label: '动态阈值' },
-]
-
-// ==================== 告警模板接口 ====================
-
-/** 获取告警模板列表 */
-export const fetchTemplateList = (params?: { page?: number; page_size?: number; name?: string; category?: string; enabled?: boolean }) => {
-  return request.get('/Alert/v1/template/list', { params })
-}
-
-/** 获取告警模板详情 */
-export const fetchTemplateDetail = (id: number) => {
-  return request.get(`/Alert/v1/template/get/${id}`)
-}
-
-/** 创建告警模板 */
-export const createTemplate = (data: AlertTemplate) => {
-  return request.post('/Alert/v1/template/create', data)
-}
-
-/** 更新告警模板 */
-export const updateTemplate = (data: AlertTemplate) => {
-  return request.post('/Alert/v1/template/update', data)
-}
-
-/** 删除告警模板 */
-export const deleteTemplate = (id: number) => {
-  return request.delete(`/Alert/v1/template/delete/${id}`)
-}
-
-// ==================== 通知渠道接口 ====================
-
-/** 获取通知渠道列表 */
-export const fetchChannelList = (params?: { enabled?: boolean; keyword?: string }) => {
-  return request.get('/Alert/v1/channel/list', { params })
-}
-
-/** 获取通知渠道详情 */
-export const fetchChannelDetail = (id: number) => {
-  return request.get(`/Alert/v1/channel/get/${id}`)
-}
-
-// ==================== 抑制规则接口 ====================
-
-/** 获取抑制规则列表 */
-export const fetchSuppressionList = (params?: { enabled?: boolean; keyword?: string }) => {
-  return request.get('/Alert/v1/suppression/list', { params })
-}
-
-/** 获取抑制规则详情 */
-export const fetchSuppressionDetail = (id: number) => {
-  return request.get(`/Alert/v1/suppression/get/${id}`)
-}
-
-// ==================== 告警级别接口 ====================
-
-/** 获取告警级别列表 */
-export const fetchSeverityList = () => {
-  return request.get('/Alert/v1/severity/list')
-}
-
-/** 获取告警级别下拉选项（不分页），支持 keyword 模糊搜索与 enabled=true 过滤 */
-export const fetchSeverityOptions = (params?: { keyword?: string; enabled?: 'true' | 'false' }) => {
-  return request.get('/Alert/v1/severity/options', {
-    params: {
-      keyword: params?.keyword || undefined,
-      enabled: params?.enabled ?? 'true',
-    },
-  })
-}
-
-/** 按 code 获取告警级别 */
-export const fetchSeverityByCode = (code: string) => {
-  return request.get(`/Alert/v1/severity/get-by-code/${code}`)
-}
-
-// ==================== 指标元数据接口 ====================
-
-/** 获取指标元数据 */
-export const fetchMetricsMeta = (params: { data_source: string; server_identity?: string; keyword?: string; limit?: number }) => {
-  return request.get('/DC-Control/v1/services/metrics/meta', { params })
-}
diff --git a/src/api/ops/asset.ts b/src/api/ops/asset.ts
index eb49732..909b8c7 100644
--- a/src/api/ops/asset.ts
+++ b/src/api/ops/asset.ts
@@ -95,6 +95,34 @@ export interface AssetForm {
   attachments?: string
 }
 
+export type DeviceLifecycleState = 'active' | 'deleting' | 'deleted'
+export type DeviceProjectionStatus = 'pending' | 'synced' | 'failed'
+
+export interface DeviceLifecycleDetails {
+  resource_uid: string
+  lifecycle_state: DeviceLifecycleState
+  projection_status: DeviceProjectionStatus
+  projection_error: string
+  event_version: number
+  deleted_at?: string | null
+}
+
+export interface DeleteDeviceDetails {
+  resource_uid: string
+  event_id: number
+  lifecycle_state: DeviceLifecycleState
+}
+
+export interface DeleteDeviceWaitResult {
+  status: 'deleted' | 'processing'
+  lifecycle: DeviceLifecycleDetails
+}
+
+const lifecyclePollIntervalMs = 500
+const lifecyclePollAttempts = 120
+
+const waitLifecyclePollInterval = () => new Promise((resolve) => window.setTimeout(resolve, lifecyclePollIntervalMs))
+
 /** 获取资产列表（分页） */
 export const fetchAssetList = (data?: AssetListParams) => {
   return request.get('/Assets/v1/devices', { params: data || {} })
@@ -110,6 +138,11 @@ export const fetchAssetDetail = (resourceUid: string) => {
   return request.get(`/Assets/v1/devices/${encodeURIComponent(resourceUid)}`)
 }
 
+/** 获取设备生命周期，包含已完成软删除的设备 */
+export const fetchDeviceLifecycle = (resourceUid: string) => {
+  return request.get(`/Assets/v1/devices/${encodeURIComponent(resourceUid)}/lifecycle`)
+}
+
 /** 创建资产 */
 export const createAsset = (data: AssetForm) => {
   return request.post('/Assets/v1/devices', data)
@@ -130,6 +163,57 @@ export const deleteAsset = (resourceUid: string) => {
   return request.delete(`/Assets/v1/devices/${encodeURIComponent(resourceUid)}`)
 }
 
+/** 等待指定版本完成资源投影 */
+export async function waitForDeviceProjection(resourceUid: string, eventVersion: number): Promise<DeviceLifecycleDetails> {
+  let latestError = ''
+  for (let attempt = 0; attempt < lifecyclePollAttempts; attempt += 1) {
+    const response: any = await fetchDeviceLifecycle(resourceUid)
+    if (response?.code !== 0 || !response?.details) {
+      throw new Error(response?.message || '查询设备投影状态失败')
+    }
+    const lifecycle = response.details as DeviceLifecycleDetails
+    if (lifecycle.lifecycle_state !== 'active') throw new Error('设备已进入删除流程，不能继续保存配置')
+    if (lifecycle.projection_status === 'synced' && Number(lifecycle.event_version) >= eventVersion) return lifecycle
+    if (lifecycle.projection_status === 'failed' && lifecycle.projection_error) latestError = lifecycle.projection_error
+    await waitLifecyclePollInterval()
+  }
+  const detail = latestError ? `：${latestError}` : ''
+  throw new Error(`设备主信息同步未完成${detail}；设备主数据已保留，可稍后再次保存配置`)
+}
+
+/** 发起设备删除，并等待后端完成跨服务清理 */
+export async function deleteDeviceAndWait(resourceUid: string): Promise<DeleteDeviceWaitResult> {
+  const deleteResponse: any = await deleteAsset(resourceUid)
+  if (deleteResponse?.code !== 0 || !deleteResponse?.details) {
+    throw new Error(deleteResponse?.message || '发起设备删除失败')
+  }
+  const deletion = deleteResponse.details as DeleteDeviceDetails
+  if (deletion.lifecycle_state === 'deleted') {
+    return {
+      status: 'deleted',
+      lifecycle: {
+        resource_uid: resourceUid,
+        lifecycle_state: 'deleted',
+        projection_status: 'synced',
+        projection_error: '',
+        event_version: 0,
+      },
+    }
+  }
+  let latest: DeviceLifecycleDetails | undefined
+  for (let attempt = 0; attempt < lifecyclePollAttempts; attempt += 1) {
+    const response: any = await fetchDeviceLifecycle(resourceUid)
+    if (response?.code !== 0 || !response?.details) {
+      throw new Error(response?.message || '查询设备删除状态失败')
+    }
+    latest = response.details as DeviceLifecycleDetails
+    if (latest.lifecycle_state === 'deleted') return { status: 'deleted', lifecycle: latest }
+    await waitLifecyclePollInterval()
+  }
+  if (!latest) throw new Error('未取得设备删除状态')
+  return { status: 'processing', lifecycle: latest }
+}
+
 /** 导出资产 */
 export const exportAssets = (keyword?: string) => {
   const params: any = {}
diff --git a/src/api/ops/businessSystem.ts b/src/api/ops/businessSystem.ts
index cc66207..243592b 100644
--- a/src/api/ops/businessSystem.ts
+++ b/src/api/ops/businessSystem.ts
@@ -1,4 +1,5 @@
 import { request } from '@/api/request'
+import type { ServerServiceMonitor } from '@/api/ops/server'
 
 /** 业务系统基础信息 */
 export interface BusinessSystemItem {
@@ -6,6 +7,8 @@ export interface BusinessSystemItem {
   code: string
   name: string
   system_type: string
+  protection_level: string
+  network_type: string
   owner_user_id?: number
   department_id?: number
   description?: string
@@ -15,6 +18,8 @@ export interface BusinessSystemItem {
   health_level?: string
   resource_count?: number
   active_incident_count?: number
+  active_alert_count?: number
+  highest_alert_severity?: BusinessAlertSeverity
   created_at?: string
   updated_at?: string
 }
@@ -33,6 +38,54 @@ export interface BusinessSystemListParams {
   size?: number
   keyword?: string
   status?: string
+  system_type?: string
+  protection_level?: string
+  network_type?: string
+}
+
+export interface BusinessSystemInput {
+  code: string
+  name: string
+  system_type: string
+  protection_level: string
+  network_type: string
+  owner_user_id?: number
+  department_id?: number
+  description: string
+  status: 'active' | 'disabled'
+}
+
+export type BusinessSystemUpdateInput = Omit<BusinessSystemInput, 'code'>
+
+export interface BusinessAlertSeverity {
+  code: string
+  name: string
+  color: string
+  priority: number
+}
+
+export interface BusinessResourceAlertSummary {
+  resource_uid: string
+  active_count: number
+  highest_severity?: BusinessAlertSeverity
+}
+
+export interface BusinessAlertSummary {
+  active_count: number
+  highest_severity?: BusinessAlertSeverity
+  business_active_count: number
+  resources: BusinessResourceAlertSummary[]
+  active_incidents: Array<{ severity: string }>
+}
+
+export interface BusinessAlertCredentialStatus {
+  configured: boolean
+  configured_at?: string
+  can_manage: boolean
+}
+
+export interface BusinessAlertCredential {
+  access_token: string
 }
 
 /** 健康分扣分明细 */
@@ -58,6 +111,7 @@ export interface BusinessHealth {
     active_incidents: number
     sla_status: string
   }
+  alert_summary: BusinessAlertSummary
 }
 
 /** 业务系统资源成员 */
@@ -69,6 +123,24 @@ export interface BusinessResourceMember {
   criticality: string
   weight: number
   description?: string
+  reference_version: number
+}
+
+export interface BusinessResourceServiceMonitorImpact {
+  link_id: number
+  service_monitor_id: number
+  stable_code: string
+  service_name: string
+  process_name: string
+  port: number
+}
+
+export interface BusinessResourceDeleteConflict {
+  conflict_code: 'BUSINESS_RESOURCE_SERVICE_MONITOR_REFERENCED' | 'BUSINESS_RESOURCE_REFERENCE_CHANGED'
+  member_id: number
+  resource_uid: string
+  reference_version: number
+  service_monitors: BusinessResourceServiceMonitorImpact[]
 }
 
 /** 业务拓扑资源 */
@@ -84,6 +156,8 @@ export interface BusinessTopologyResource {
   owner_user_id?: number
   department_id?: number
   asset_id?: number
+  manufacturer_code?: string
+  model?: string
   tags?: string
   source_service?: string
   source_table?: string
@@ -95,11 +169,17 @@ export interface BusinessTopologyResource {
 /** 业务拓扑节点 */
 export interface BusinessTopologyNode {
   id?: number
+  topology_id?: number
   node_id: string
   resource_uid: string
   label: string
   type: string
   status: string
+  ref_type?: 'resource' | 'annotation' | 'region' | 'subtopology'
+  parent_id?: string
+  position_x?: number
+  position_y?: number
+  description?: string
 }
 
 /** 业务拓扑边 */
@@ -123,10 +203,17 @@ export interface BusinessDependency {
 /** 业务拓扑 */
 export interface BusinessTopology {
   business_system_id: number
+  topology_id: number
+  topology?: {
+    id: number
+    name: string
+    business_system_id?: number
+  }
   resources: BusinessTopologyResource[] | null
   dependencies: BusinessDependency[] | null
   nodes: BusinessTopologyNode[] | null
   links: BusinessTopologyEdge[] | null
+  alert_summary: BusinessAlertSummary
 }
 
 /** 业务时间线项 */
@@ -171,6 +258,48 @@ export interface ListResult<T> {
   count: number
 }
 
+/** 业务系统与服务器服务监控项的关联 */
+export interface BusinessServiceMonitorLink {
+  id: number
+  business_system_id: number
+  service_monitor_id: number
+  service_monitor?: ServerServiceMonitor
+  created_at?: string
+  updated_at?: string
+}
+
+/** 管理员对调用链中间件候选的处理结果。 */
+export interface BusinessMiddlewareCandidateDecision {
+  id: number
+  business_system_id: number
+  candidate_key: string
+  product: string
+  display_name: string
+  address?: string
+  source_service?: string
+  state: 'confirmed' | 'ignored'
+  middleware_resource_uid?: string
+  created_at?: string
+  updated_at?: string
+}
+
+/** 当前业务系统已经纳入的中间件资源。 */
+export interface BusinessMiddlewareOption {
+  resource_uid: string
+  name: string
+  product: string
+}
+
+export interface BusinessMiddlewareCandidateDecisionInput {
+  candidate_key: string
+  product: string
+  display_name: string
+  address?: string
+  source_service?: string
+  state: 'confirmed' | 'ignored'
+  middleware_resource_uid?: string
+}
+
 /** HTTP/API 检测步骤请求头 */
 export interface BusinessHTTPHeader {
   name: string
@@ -180,13 +309,13 @@ export interface BusinessHTTPHeader {
 /** HTTP/API 检测响应变量提取 */
 export interface BusinessHTTPExtract {
   variable: string
-  source: 'json' | 'header' | 'cookie'
+  source: 'json' | 'xml' | 'header' | 'cookie'
   expression: string
 }
 
 /** HTTP/API 检测断言 */
 export interface BusinessHTTPAssertion {
-  kind: 'status' | 'max_response_time_ms' | 'header_equals' | 'body_contains' | 'json_exists' | 'json_equals'
+  kind: 'status' | 'max_response_time_ms' | 'header_equals' | 'body_contains' | 'json_exists' | 'json_equals' | 'xml_exists' | 'xml_equals'
   expression?: string
   expected?: string
 }
@@ -274,6 +403,41 @@ export const fetchBusinessSystems = (params?: BusinessSystemListParams) =>
 export const fetchBusinessSystemDetail = (id: number) =>
   request.get<{ code?: number; details?: BusinessSystemItem; message?: string }>(`/DC-Control/v1/business-systems/${id}`)
 
+/** 获取不受分页限制的业务分类树数据源 */
+export const fetchBusinessSystemTreeSource = (status?: string) =>
+  request.get<{ code?: number; details?: ListResult<BusinessSystemItem>; message?: string }>('/DC-Control/v1/business-systems/tree-source', {
+    params: { status },
+  })
+
+/** 新增业务系统 */
+export const createBusinessSystem = (data: BusinessSystemInput) =>
+  request.post<{ code?: number; details?: BusinessSystemItem; message?: string }>('/DC-Control/v1/business-systems', data)
+
+/** 编辑业务系统 */
+export const updateBusinessSystem = (id: number, data: BusinessSystemUpdateInput) =>
+  request.put<{ code?: number; details?: BusinessSystemItem; message?: string }>(`/DC-Control/v1/business-systems/${id}`, data)
+
+/** 删除业务系统及其自身关联，不删除资源或服务监控项 */
+export const deleteBusinessSystem = (id: number) => request.delete(`/DC-Control/v1/business-systems/${id}`)
+
+/** 获取当前业务系统外部告警访问凭证状态 */
+export const fetchBusinessAlertCredentialStatus = (id: number) =>
+  request.get<{ code?: number; details?: BusinessAlertCredentialStatus; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/alert-credential`
+  )
+
+/** 生成或替换外部告警访问凭证 */
+export const generateBusinessAlertCredential = (id: number) =>
+  request.post<{ code?: number; details?: BusinessAlertCredential; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/alert-credential/generate`
+  )
+
+/** 查看当前有效的外部告警访问凭证明文 */
+export const revealBusinessAlertCredential = (id: number) =>
+  request.get<{ code?: number; details?: BusinessAlertCredential; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/alert-credential/reveal`
+  )
+
 /** 获取业务健康摘要 */
 export const fetchBusinessHealth = (id: number) =>
   request.get<{ code?: number; details?: BusinessHealth; message?: string }>(`/DC-Control/v1/business-systems/${id}/health`)
@@ -294,8 +458,52 @@ export interface BusinessResourceMemberPayload {
 export const createBusinessMember = (id: number, data: BusinessResourceMemberPayload) =>
   request.post<{ code?: number; details?: BusinessResourceMember; message?: string }>(`/DC-Control/v1/business-systems/${id}/resources`, data)
 
-export const deleteBusinessMember = (id: number, memberId: number) =>
-  request.delete<{ code?: number; details?: { message: string }; message?: string }>(`/DC-Control/v1/business-systems/${id}/resources/${memberId}`)
+export const deleteBusinessMember = (
+  id: number,
+  memberId: number,
+  options?: { unlinkServiceMonitors: boolean; referenceVersion: number }
+) =>
+  request.delete<{ code?: number; details?: { message: string }; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/resources/${memberId}`,
+    options?.unlinkServiceMonitors
+      ? { params: { unlink_service_monitors: true, reference_version: options.referenceVersion } }
+      : undefined
+  )
+
+/** 获取业务系统关联的服务器服务监控项 */
+export const fetchBusinessServiceMonitors = (id: number) =>
+  request.get<{ code?: number; details?: ListResult<BusinessServiceMonitorLink>; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/service-monitors`
+  )
+
+/** 关联一个已经在服务器上配置好的服务监控项 */
+export const createBusinessServiceMonitor = (id: number, serviceMonitorId: number) =>
+  request.post<{ code?: number; details?: BusinessServiceMonitorLink; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/service-monitors`,
+    { service_monitor_id: serviceMonitorId }
+  )
+
+/** 仅解除业务关联，不删除服务器上的服务监控项 */
+export const deleteBusinessServiceMonitor = (id: number, linkId: number) =>
+  request.delete<{ code?: number; details?: { message: string }; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/service-monitors/${linkId}`
+  )
+
+export const fetchBusinessMiddlewareCandidateDecisions = (id: number) =>
+  request.get<{ code?: number; details?: ListResult<BusinessMiddlewareCandidateDecision>; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/middleware-candidates/decisions`
+  )
+
+export const fetchBusinessMiddlewareOptions = (id: number) =>
+  request.get<{ code?: number; details?: ListResult<BusinessMiddlewareOption>; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/middleware-resources`
+  )
+
+export const decideBusinessMiddlewareCandidate = (id: number, data: BusinessMiddlewareCandidateDecisionInput) =>
+  request.post<{ code?: number; details?: BusinessMiddlewareCandidateDecision; message?: string }>(
+    `/DC-Control/v1/business-systems/${id}/middleware-candidates/decision`,
+    data
+  )
 
 /** 获取业务拓扑 */
 export const fetchBusinessTopology = (id: number) =>
diff --git a/src/api/ops/collection.ts b/src/api/ops/collection.ts
index babef81..3e6b725 100644
--- a/src/api/ops/collection.ts
+++ b/src/api/ops/collection.ts
@@ -49,7 +49,6 @@ export interface CollectionTemplate {
   index_discoveries: string
   inventory_mappings: string
   read_only_queries: string
-  alert_rule_codes: string
   content_digest: string
   description?: string
   adapter_verified: boolean
diff --git a/src/api/ops/database.ts b/src/api/ops/database.ts
index af4cac6..7c6f5bb 100644
--- a/src/api/ops/database.ts
+++ b/src/api/ops/database.ts
@@ -1,13 +1,17 @@
 import { request } from '@/api/request'
 
 /** 数据库类型枚举 */
-export type DatabaseType = 'MySQL' | 'PostgreSQL' | 'Redis' | 'MongoDB' | 'DM' | 'KingBase' | 'Oracle' | 'OracleRAC'
+export type DatabaseType = 'MySQL' | 'PostgreSQL' | 'TimescaleDB' | 'Redis' | 'MongoDB' | 'DM' | 'KingBase' | 'Oracle' | 'OracleRAC'
+
+/** 数据库传输加密模式 */
+export type DatabaseTLSMode = 'disable' | 'require' | 'verify-ca' | 'verify-full'
 
 /** 数据库服务状态 */
 export type DatabaseStatus = 'online' | 'offline' | 'error'
 
 /** 数据库服务接口返回数据结构 */
 export interface DatabaseService {
+	resource_uid: string
   id: number
   created_at: string
   updated_at: string
@@ -19,7 +23,7 @@ export interface DatabaseService {
   host: string
   port: number
   database: string
-  tls_mode: 'require' | 'verify-ca' | 'verify-full'
+  tls_mode: DatabaseTLSMode
   description: string
   enabled: boolean
   interval: number
@@ -54,11 +58,12 @@ export interface CreateDatabaseParams {
   host: string
   port: number
   database?: string
-  tls_mode?: 'require' | 'verify-ca' | 'verify-full'
+  tls_mode?: DatabaseTLSMode
   description?: string
   enabled?: boolean
   interval?: number
   tags?: string
+  policy_ids?: number[]
 }
 
 /** 更新数据库服务请求参数 */
@@ -69,11 +74,12 @@ export interface UpdateDatabaseParams {
   host?: string
   port?: number
   database?: string
-  tls_mode?: 'require' | 'verify-ca' | 'verify-full'
+  tls_mode?: DatabaseTLSMode
   description?: string
   enabled?: boolean
   interval?: number
   tags?: string
+  policy_ids?: number[]
 }
 
 /** 列表查询参数 */
@@ -113,8 +119,8 @@ export interface MetricMetaItem {
 /** 指标元数据响应 */
 export interface MetricMetaResponse {
   data_source: string
-  collector_identity: string
-  server_identity: string
+  resource_uid: string
+  service_identity: string
   count: number
   metrics: MetricMetaItem[]
 }
@@ -122,11 +128,51 @@ export interface MetricMetaResponse {
 /** 指标元数据查询参数 */
 export interface MetricMetaQueryParams {
   data_source: string
-  server_identity?: string
+  resource_uid?: string
   keyword?: string
   limit?: number
 }
 
+/** 数据库最新指标 */
+export interface DatabaseMetricItem {
+  timestamp: string
+  service_identity: string
+  type: string
+  metric_name: string
+  series_key: string
+  labels: string
+  metric_value: number
+  metric_unit: string
+}
+
+/** 数据库最新一批指标响应 */
+export interface DatabaseMetricsLatestResponse {
+  resource_uid: string
+  service_identity: string
+  latest_timestamp: string | null
+  count: number
+  metrics: DatabaseMetricItem[]
+}
+
+/** SQL TOP 行 */
+export interface DatabaseSQLTopItem {
+  rank: number
+  sql_id: string
+  sql_text: string
+  executions: number
+  metric_value: number
+  metric_unit: string
+  timestamp: string
+}
+
+/** SQL TOP 响应 */
+export interface DatabaseSQLTopResponse {
+  resource_uid: string
+  service_identity: string
+  latest_timestamp: string | null
+  items: DatabaseSQLTopItem[]
+}
+
 /**
  * 获取数据库服务列表
  * @param params 查询参数
@@ -143,7 +189,7 @@ export const fetchDatabaseDetail = (id: number) => request.get<DatabaseService>(
  * 创建数据库服务
  * @param data 创建参数
  */
-export const createDatabase = (data: CreateDatabaseParams) => request.post<{ message: string; id: number; service_identity: string }>('/DC-Control/v1/database', data)
+export const createDatabase = (data: CreateDatabaseParams) => request.post<{ message: string; id: number; resource_uid: string; service_identity: string }>('/DC-Control/v1/database', data)
 
 /**
  * 更新数据库服务
@@ -172,3 +218,19 @@ export const collectDatabaseMetrics = (data: CollectMetricsParams) =>
  */
 export const fetchMetricMeta = (params: MetricMetaQueryParams) =>
   request.get<MetricMetaResponse>('/DC-Control/v1/services/metrics/meta', { params })
+
+/** 查询数据库最新一批指标 */
+export const fetchDatabaseMetricsLatest = (resourceUid: string) =>
+  request.get<DatabaseMetricsLatestResponse>('/DC-Control/v1/database/metrics/latest', { params: { resource_uid: resourceUid } })
+
+/** 查询 SQL 累计执行耗时排名 */
+export const fetchDatabaseSQLTopElapsed = (resourceUid: string) =>
+  request.get<DatabaseSQLTopResponse>('/DC-Control/v1/database/metrics/sql-top/elapsed', { params: { resource_uid: resourceUid } })
+
+/** 查询 SQL 执行次数排名 */
+export const fetchDatabaseSQLTopCalls = (resourceUid: string) =>
+  request.get<DatabaseSQLTopResponse>('/DC-Control/v1/database/metrics/sql-top/calls', { params: { resource_uid: resourceUid } })
+
+/** 查询 SQL 块读取量排名 */
+export const fetchDatabaseSQLTopIO = (resourceUid: string) =>
+  request.get<DatabaseSQLTopResponse>('/DC-Control/v1/database/metrics/sql-top/io', { params: { resource_uid: resourceUid } })
diff --git a/src/api/ops/dcControl.ts b/src/api/ops/dcControl.ts
index 831d050..097051d 100644
--- a/src/api/ops/dcControl.ts
+++ b/src/api/ops/dcControl.ts
@@ -15,7 +15,8 @@ export interface LicenceQuotas {
 }
 
 export interface LicenceInfo {
-  id: string
+	enabled: boolean
+	id: string
   platform_name: string
   workspace: string
   issued_on: string
@@ -58,6 +59,9 @@ export interface OptionItem {
   id?: number
   label: string
   value: string
+  resource_category?: string
+  manufacturer_code?: string
+  model?: string
 }
 
 export interface ControlResource {
@@ -74,6 +78,8 @@ export interface ControlResource {
   device_level?: string
   business_system_id?: number
   owner_user_id?: number
+  responsibility_type?: 'none' | 'internal' | 'external'
+  external_contact_id?: number
   department_id?: number
   asset_id?: number
   datacenter_id?: number
@@ -119,6 +125,24 @@ export interface ControlResourceOverview {
   }
 }
 
+export interface ControlResourceTrendPoint {
+  time: string
+  value: number
+  count: number
+}
+
+export interface ControlResourceTrend {
+  resource_uid: string
+  metric_name: string
+  metric_type: string
+  unit: string
+  window_hours: number
+  interval_seconds: number
+  start_time: string
+  end_time: string
+  points: ControlResourceTrendPoint[]
+}
+
 export interface ControlResourceType {
   id: number
   resource_category: string
@@ -134,6 +158,10 @@ export interface ControlMetricDefinition {
   metric_code: string
   metric_name: string
   resource_category: string
+  resource_subtype: string
+  data_source: string
+  metric_type: string
+  storage_metric_name: string
   unit?: string
   threshold_suggestion?: string
   collect_method?: string
@@ -220,6 +248,24 @@ export const fetchControlResourceOverview = (resourceUid: string) =>
     `/DC-Control/v1/resources/${encodeURIComponent(resourceUid)}/overview`
   )
 
+export const fetchControlResourceMetricTrend = (
+  resourceUid: string,
+  params?: { metric_name?: string; metric_type?: string; unit?: string; window_hours?: number }
+) =>
+  request.get<{ code?: number; details?: ControlResourceTrend; message?: string }>(
+    `/DC-Control/v1/resources/${encodeURIComponent(resourceUid)}/metrics/trend`,
+    { params }
+  )
+
+export const saveControlResourceResponsibility = (
+  resourceUid: string,
+  data: { responsibility_type: 'none' | 'internal' | 'external'; owner_user_id?: number; external_contact_id?: number }
+) =>
+  request.put<{ code?: number; details?: ControlResource; message?: string }>(
+    `/DC-Control/v1/resources/${encodeURIComponent(resourceUid)}/responsibility`,
+    data
+  )
+
 export const fetchControlResourceTypes = (params?: { page?: number; size?: number; keyword?: string }) =>
   request.get<{ code?: number; details?: PageResult<ControlResourceType>; message?: string }>('/DC-Control/v1/resource-types', { params })
 
@@ -231,8 +277,16 @@ export const fetchControlMetricDefinitions = (params?: { page?: number; size?: n
     params,
   })
 
-export const fetchControlMetricDefinitionOptions = (params?: { resource_category?: string }) =>
-  request.get<{ code?: number; details?: { list: OptionItem[]; count: number }; message?: string }>(
+export interface MetricDefinitionOptionParams {
+  resource_category?: string
+  resource_subtype?: string
+  data_source?: string
+  alert_supported?: boolean
+  keyword?: string
+}
+
+export const fetchControlMetricDefinitionOptions = (params?: MetricDefinitionOptionParams) =>
+  request.get<{ code?: number; details?: { list: ControlMetricDefinition[]; count: number }; message?: string }>(
     '/DC-Control/v1/metric-definitions/options',
     { params }
   )
diff --git a/src/api/ops/externalContact.ts b/src/api/ops/externalContact.ts
new file mode 100644
index 0000000..ac3b59d
--- /dev/null
+++ b/src/api/ops/externalContact.ts
@@ -0,0 +1,37 @@
+import { request } from '@/api/request'
+
+export interface ExternalContact {
+  id: number
+  code: string
+  name: string
+  phone: string
+  email: string
+  enabled: boolean
+  remarks: string
+  created_at?: string
+  updated_at?: string
+}
+
+export interface ExternalContactInput {
+  id?: number
+  code: string
+  name: string
+  phone?: string
+  email?: string
+  enabled?: boolean
+  remarks?: string
+}
+
+export const fetchExternalContacts = (params?: { page?: number; page_size?: number; keyword?: string; enabled?: boolean }) =>
+  request.get('/Alert/v1/external-contacts/list', { params })
+
+export const fetchExternalContactOptions = (keyword?: string) =>
+  request.get<ExternalContact[]>('/Alert/v1/external-contacts/options', { params: { keyword } })
+
+export const createExternalContact = (data: ExternalContactInput) =>
+  request.post<ExternalContact>('/Alert/v1/external-contacts/create', data)
+
+export const updateExternalContact = (data: ExternalContactInput) =>
+  request.post<ExternalContact>('/Alert/v1/external-contacts/update', data)
+
+export const deleteExternalContact = (id: number) => request.delete(`/Alert/v1/external-contacts/delete/${id}`)
diff --git a/src/api/ops/governance.ts b/src/api/ops/governance.ts
index f8a2147..cdca78d 100644
--- a/src/api/ops/governance.ts
+++ b/src/api/ops/governance.ts
@@ -38,9 +38,15 @@ export interface RuleSuggestion {
 
 export interface CapacityRisk {
   resource_uid: string
+  resource_category: string
+  display_name: string
+  object_type: string
+  object_name: string
   metric_code: string
   unit: string
   current_value: number
+  average_value: number
+  peak_value: number
   status: '资源不足' | '配置合理' | '资源闲置' | '容量风险' | '数据不足'
   idle_threshold: number
   risk_threshold: number
@@ -55,6 +61,11 @@ export interface CapacityRisk {
   data_start?: string
   data_end?: string
   data_span_hours: number
+  analysis_window_hours: number
+  data_age_seconds: number
+  data_freshness: 'missing' | 'fresh' | 'stale'
+  insufficient_reason?: string
+  estimated_available_days?: number
   forecast_hours: number
 }
 
@@ -79,8 +90,7 @@ export interface SloDashboard {
 export const fetchAlertQualityScores = (params?: { hours?: number }) =>
   request.get<AlertQualityScore[]>('/Alert/v1/governance/quality', { params })
 
-export const fetchAlertNoise = (params?: { hours?: number }) =>
-  request.get<NoiseBucket[]>('/Alert/v1/governance/noise', { params })
+export const fetchAlertNoise = (params?: { hours?: number }) => request.get<NoiseBucket[]>('/Alert/v1/governance/noise', { params })
 
 export const fetchRuleSuggestions = (params?: { hours?: number }) =>
   request.get<RuleSuggestion[]>('/Alert/v1/governance/suggestions', { params })
@@ -88,4 +98,12 @@ export const fetchRuleSuggestions = (params?: { hours?: number }) =>
 export const fetchCapacityRisk = (params?: { resource_uid?: string; metric_type?: string; metric_code?: string }) =>
   request.get<CapacityRisk>('/DC-Control/v1/risk/capacity', { params })
 
+export const fetchCapacityRisks = (params: {
+  resource_uid: string
+  metric_type?: string
+  metric_code?: string
+  object_type?: string
+  object_name?: string
+}) => request.get<CapacityRisk[]>('/DC-Control/v1/risk/capacities', { params })
+
 export const fetchSloDashboard = () => request.get<SloDashboard>('/Feedback/v1/tickets/slo/dashboard')
diff --git a/src/api/ops/goview.ts b/src/api/ops/goview.ts
index 5956f00..026afb5 100644
--- a/src/api/ops/goview.ts
+++ b/src/api/ops/goview.ts
@@ -1,11 +1,16 @@
 import { request } from '@/api/request'
 
+export enum GoViewProjectState {
+  Draft = -1,
+  Published = 1,
+}
+
 // GoView 项目类型定义
 export interface GoViewProject {
-  id: string
+  id: number
   identity: string
   projectName: string
-  state: -1 | 1 // -1 未发布, 1 已发布
+  state: GoViewProjectState
   createTime: string
   updateTime?: string
   createUserId: number
@@ -16,13 +21,30 @@ export interface GoViewProject {
 }
 
 export interface GoViewProjectData {
-  id: string
+  id: number
+  identity: string
   projectId: string
   content: string // JSON 格式字符串
   createTime: string
+  updateTime: string
   createUserId: string
 }
 
+export interface GoViewProjectDetail {
+  identity: string
+  content: string
+  projectName: string
+  state: GoViewProjectState
+  createTime: string
+  createUserId: number
+  indexImage: string
+  backgroundImage: string
+  isDelete: 0 | 1
+  remarks: string
+  publishVersion: string
+  mgtScreenId: number
+}
+
 export interface OssInfo {
   BucketName: string
   bucketURL: string
@@ -47,13 +69,13 @@ export const fetchOssInfo = () => {
 }
 
 /** 获取项目列表 */
-export const fetchProjectList = (params?: { page?: number; size?: number; state?: -1 | 1 }) => {
+export const fetchProjectList = (params?: { page?: number; size?: number; state?: GoViewProjectState }) => {
   return request.get<GoViewResponse<ProjectListResponse>>('/Visual/v1/project/list', { params })
 }
 
 /** 获取项目数据（公开接口，无需认证） */
 export const fetchProjectData = (projectId: string) => {
-  return request.get<GoViewResponse<GoViewProjectData>>('/Visual/v1/project/getData', {
+  return request.get<GoViewResponse<GoViewProjectDetail>>('/Visual/v1/project/getData', {
     params: { projectId },
   })
 }
@@ -61,7 +83,7 @@ export const fetchProjectData = (projectId: string) => {
 /** 创建项目 */
 export const createProject = (data: {
   projectName: string
-  state: -1 | 1
+  state?: GoViewProjectState
   createTime?: string
   createUserId?: number
   isDelete?: 0 | 1
@@ -91,8 +113,11 @@ export const deleteProject = (ids: string) => {
 }
 
 /** 发布/取消发布项目 */
-export const publishProject = (data: { identity: string; state: -1 | 1 }) => {
-  return request.put<GoViewResponse<{ identity: string; state: number }>>('/Visual/v1/project/publish', data)
+export const publishProject = (data: { identity: string; state: GoViewProjectState }) => {
+  return request.put<GoViewResponse<{ identity: string; state: GoViewProjectState }>>(
+    '/Visual/v1/project/publish',
+    data,
+  )
 }
 
 /** 保存项目数据 */
diff --git a/src/api/ops/host-hardware.ts b/src/api/ops/host-hardware.ts
deleted file mode 100644
index b64e8c9..0000000
--- a/src/api/ops/host-hardware.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * 服务器硬件监控页专用：对接 DC-Hardware 服务（/DC-Hardware/v1）。
- * 与「机房设备监控」等业务区分，勿混用命名。
- */
-import { request } from '@/api/request'
-
-const HW_PREFIX = '/DC-Hardware/v1'
-
-/** 与 bsm-sdk 成功响应一致：业务数据在 details */
-export interface HostHardwareApiEnvelope<T = unknown> {
-  code?: number | string
-  message?: string
-  details?: T
-}
-
-export interface HostHardwareDeviceDetailPayload {
-  device: HostHardwareDevice
-  status: HostHardwareStatus | null
-}
-
-export interface HostHardwareDevice {
-  id: string
-  name?: string
-  ip: string
-  /** 设备类别，如 server/switch/storage；未返回时前端可按 server 展示 */
-  type?: string
-  protocol: string
-  manufacturer?: string
-  model?: string
-  serial_number?: string
-  username?: string
-  password?: string
-  port?: number
-  snmp_port?: number
-  community?: string
-  snmp_version?: string
-  snmp_oids?: string
-  redfish_base_url?: string
-  redfish_tls_skip_verify?: boolean
-  ipmi_timeout_seconds?: number
-  snmp_timeout_seconds?: number
-  redfish_timeout_seconds?: number
-  ipmi_collect_enabled?: boolean
-  snmp_collect_enabled?: boolean
-  redfish_collect_enabled?: boolean
-  collect_interval?: number
-  asset_id?: string
-  server_identity?: string
-  enabled?: boolean
-  status?: string
-  tags?: string
-  description?: string
-  extra_config?: string
-}
-
-/** 创建/更新 DC-Hardware 设备（与 CreateDeviceRequest 一致；密码在更新时为空则不修改） */
-export interface HostHardwareDeviceUpsert {
-  name: string
-  ip: string
-  /** 省略或空则服务端默认 server */
-  type?: string
-  protocol: string
-  username?: string
-  password?: string
-  port?: number
-  snmp_port?: number
-  community?: string
-  snmp_version?: string
-  snmp_oids?: string
-  redfish_base_url?: string
-  redfish_tls_skip_verify?: boolean
-  location?: string
-  description?: string
-  tags?: string
-  asset_id?: string
-  server_identity?: string
-  extra_config?: string
-  ipmi_timeout_seconds?: number
-  snmp_timeout_seconds?: number
-  redfish_timeout_seconds?: number
-  ipmi_collect_enabled?: boolean
-  snmp_collect_enabled?: boolean
-  redfish_collect_enabled?: boolean
-  collect_interval?: number
-  /** 是否启用监控调度 */
-  enabled?: boolean
-}
-
-export interface HostHardwareDeviceListPayload {
-  total: number
-  page: string | number
-  page_size: string | number
-  data: HostHardwareDevice[]
-}
-
-export interface HostHardwareStatus {
-  id?: string
-  device_id?: string
-  status?: string
-  power_status?: string
-  cpu_status?: string
-  memory_status?: string
-  disk_status?: string
-  fan_status?: string
-  temperature_status?: string
-  network_status?: string
-  psu_status?: string
-  raid_status?: string
-  last_check_time?: string
-  error_message?: string
-  raw_data?: string
-}
-
-export interface HostHardwareMetricsRow {
-  id?: string
-  device_id?: string
-  metric_name: string
-  metric_type: string
-  metric_value: number
-  unit?: string
-  status?: string
-  threshold?: number
-  location?: string
-  collection_time?: string
-}
-
-export interface HostHardwareLatestCollectionPayload {
-  device_id: string
-  collected_at?: string | null
-  status: HostHardwareStatus | null
-  metrics: HostHardwareMetricsRow[]
-  timescaledb?: boolean
-  message?: string
-  server_identity?: string
-}
-
-interface RawCollectionMetric {
-  name?: string
-  type?: string
-  value?: number
-  unit?: string
-  status?: string
-  threshold?: number
-  location?: string
-}
-
-interface RawCollectionRoot {
-  metrics?: RawCollectionMetric[]
-}
-
-export interface NormalizedHostHardwareMetric {
-  name: string
-  type: string
-  value: number
-  unit: string
-  status: string
-  threshold?: number
-  location?: string
-}
-
-export interface HostHardwareMetricHistoryPayload {
-  device_id: string
-  metric_name: string
-  start_time?: string
-  end_time?: string
-  data: HostHardwareMetricsRow[]
-  timescaledb?: boolean
-  message?: string
-}
-
-export interface HostHardwareStatisticsRow {
-  device_id: string
-  stat_date: string
-  online_time?: number
-  offline_time?: number
-  warning_count?: number
-  critical_count?: number
-  avg_temperature?: number
-  max_temperature?: number
-  min_temperature?: number
-  avg_fan_speed?: number
-  avg_power_usage?: number
-  max_power_usage?: number
-  total_check_count?: number
-  success_check_count?: number
-  failed_check_count?: number
-  availability?: number
-}
-
-export function isHostHardwareApiSuccess(res: HostHardwareApiEnvelope | null | undefined): boolean {
-  const c = res?.code
-  if (c === 0 || c === '0') return true
-  // 少数网关/代理以 200 表示业务成功
-  if (c === 200 || c === '200') return true
-  return false
-}
-
-export function unwrapHostHardwareDetails<T>(res: (HostHardwareApiEnvelope<T> & { data?: T }) | null | undefined): T | null {
-  if (!res || !isHostHardwareApiSuccess(res)) return null
-  // 部分网关/SDK 将载荷放在 data 而非 details，与 logs 等模块一致做兼容
-  return res.details ?? res.data ?? null
-}
-
-/** 按 server_identity 拉取最新一整轮采集（JWT） */
-export function fetchHostHardwareLatestCollection(serverIdentity: string) {
-  return request.get<HostHardwareApiEnvelope<HostHardwareLatestCollectionPayload>>(
-    `${HW_PREFIX}/devices/by-server-identity/collection/latest`,
-    { params: { server_identity: serverIdentity } }
-  )
-}
-
-/** 设备详情（含最新一条 status） */
-export function fetchHostHardwareDevice(deviceId: string) {
-  return request.get<HostHardwareApiEnvelope<HostHardwareDeviceDetailPayload>>(`${HW_PREFIX}/devices/${encodeURIComponent(deviceId)}`)
-}
-
-/** 分页列表（可按 type / status / asset_id 筛选） */
-export function fetchHostHardwareDeviceList(params?: {
-  type?: string
-  status?: string
-  asset_id?: string
-  page?: number
-  page_size?: number
-}) {
-  return request.get<HostHardwareApiEnvelope<HostHardwareDeviceListPayload>>(`${HW_PREFIX}/devices`, {
-    params,
-  })
-}
-
-/** 创建设备 */
-export function createHostHardwareDevice(data: HostHardwareDeviceUpsert) {
-  return request.post<HostHardwareApiEnvelope<HostHardwareDevice>>(`${HW_PREFIX}/devices`, data)
-}
-
-/** 更新设备（全量必填字段；密码留空则不修改） */
-export function updateHostHardwareDevice(deviceId: string, data: HostHardwareDeviceUpsert) {
-  return request.put<HostHardwareApiEnvelope<HostHardwareDevice>>(`${HW_PREFIX}/devices/${encodeURIComponent(deviceId)}`, data)
-}
-
-/** 异步立即采集 */
-export function triggerHostHardwareCollect(deviceId: string) {
-  return request.post<HostHardwareApiEnvelope<string>>(`${HW_PREFIX}/devices/${encodeURIComponent(deviceId)}/collect`)
-}
-
-/** 启用监控 */
-export function enableHostHardwareDevice(deviceId: string) {
-  return request.post<HostHardwareApiEnvelope<string>>(`${HW_PREFIX}/devices/${encodeURIComponent(deviceId)}/enable`)
-}
-
-/** 禁用监控 */
-export function disableHostHardwareDevice(deviceId: string) {
-  return request.post<HostHardwareApiEnvelope<string>>(`${HW_PREFIX}/devices/${encodeURIComponent(deviceId)}/disable`)
-}
-
-/** 单指标历史曲线（JWT） */
-export function fetchHostHardwareMetricHistory(deviceId: string, metricName: string, startTime?: string, endTime?: string) {
-  return request.get<HostHardwareApiEnvelope<HostHardwareMetricHistoryPayload>>(
-    `${HW_PREFIX}/metrics/devices/${encodeURIComponent(deviceId)}/history`,
-    {
-      params: {
-        metric_name: metricName,
-        ...(startTime ? { start_time: startTime } : {}),
-        ...(endTime ? { end_time: endTime } : {}),
-      },
-    }
-  )
-}
-
-/** 日汇总统计 */
-export function fetchHostHardwareStatistics(deviceId: string, startDate?: string, endDate?: string) {
-  return request.get<HostHardwareApiEnvelope<HostHardwareStatisticsRow[]>>(`${HW_PREFIX}/metrics/statistics`, {
-    params: {
-      device_id: deviceId,
-      ...(startDate ? { start_date: startDate } : {}),
-      ...(endDate ? { end_date: endDate } : {}),
-    },
-  })
-}
-
-/**
- * 合并 API metrics 与 raw_data 兜底（无时序库时 metrics 可能为空）
- */
-export function normalizeHostHardwareMetrics(
-  status: HostHardwareStatus | null | undefined,
-  metricsFromApi: HostHardwareMetricsRow[] | null | undefined
-): NormalizedHostHardwareMetric[] {
-  const fromApi = metricsFromApi ?? []
-  if (fromApi.length > 0) {
-    return fromApi.map((m) => ({
-      name: m.metric_name,
-      type: m.metric_type,
-      value: m.metric_value,
-      unit: m.unit ?? '',
-      status: m.status ?? 'ok',
-      threshold: m.threshold,
-      location: m.location,
-    }))
-  }
-  const raw = status?.raw_data
-  if (!raw || typeof raw !== 'string') return []
-  try {
-    const parsed = JSON.parse(raw) as RawCollectionRoot
-    const arr = parsed.metrics
-    if (!Array.isArray(arr)) return []
-    return arr
-      .map((m) => ({
-        name: String(m.name ?? ''),
-        type: String(m.type ?? ''),
-        value: typeof m.value === 'number' ? m.value : Number(m.value) || 0,
-        unit: String(m.unit ?? ''),
-        status: String(m.status ?? 'ok'),
-        threshold: m.threshold,
-        location: m.location ? String(m.location) : undefined,
-      }))
-      .filter((m) => m.name || m.type)
-  } catch {
-    return []
-  }
-}
diff --git a/src/api/ops/incident.ts b/src/api/ops/incident.ts
index dc54f39..33fed69 100644
--- a/src/api/ops/incident.ts
+++ b/src/api/ops/incident.ts
@@ -26,6 +26,7 @@ export interface Incident {
   suspended_at?: string
   resolved_at?: string
   closed_at?: string
+  is_external_business: boolean
 }
 
 export const fetchIncidents = (params: {
diff --git a/src/api/ops/logs.ts b/src/api/ops/logs.ts
index 73e9ac2..e1caa10 100644
--- a/src/api/ops/logs.ts
+++ b/src/api/ops/logs.ts
@@ -99,6 +99,20 @@ export interface ServiceDependency {
   average_ms: number
 }
 
+/** 调用链属性识别出的中间件候选；候选本身不会自动创建设备。 */
+export interface MiddlewareCandidate {
+  candidate_key: string
+  product: string
+  display_name: string
+  address?: string
+  source_service: string
+  business_system_id: number
+  first_seen_at: string
+  last_seen_at: string
+  span_count: number
+  error_count: number
+}
+
 export interface LogEntriesResult {
   total: number
   page: number
@@ -184,11 +198,18 @@ export interface TrapShield {
   name: string
   enabled: boolean
   source_ip_cidr: string
-  oid_prefix: string
+  oid_prefixes: string[]
   interface_hint: string
   time_windows_json: string
 }
 
+export interface TrapSuppressionOption {
+  oid_prefix: string
+  name: string
+  vendor: string
+  source: 'dictionary' | 'received'
+}
+
 export interface AuditLog {
   id: number
   created_at: string
@@ -270,6 +291,12 @@ export function fetchServiceDependencies(params?: TraceListParams) {
   return request.get(`${BASE}/service-dependencies`, { params })
 }
 
+export function fetchMiddlewareCandidates(businessSystemId: number, startTime?: string) {
+  return request.get(`${BASE}/middleware-candidates`, {
+    params: { business_system_id: businessSystemId, start_time: startTime },
+  })
+}
+
 export function fetchAlertOutbox(params?: AlertOutboxParams) {
   return request.get(`${BASE}/alert-outbox`, { params })
 }
@@ -334,6 +361,10 @@ export function fetchTrapSuppressions() {
   return request.get(`${BASE}/trap-suppressions`)
 }
 
+export function fetchTrapSuppressionOptions() {
+  return request.get(`${BASE}/trap-suppression-options`)
+}
+
 export function createTrapSuppression(data: Partial<TrapShield>) {
   return request.post(`${BASE}/trap-suppressions`, data)
 }
diff --git a/src/api/ops/middleware.ts b/src/api/ops/middleware.ts
index 6c98126..cf6fdf2 100644
--- a/src/api/ops/middleware.ts
+++ b/src/api/ops/middleware.ts
@@ -2,11 +2,13 @@ import { request } from '@/api/request'
 
 /** 中间件服务项 */
 export interface MiddlewareItem {
+	resource_uid: string
   id: number
   created_at: string
   updated_at: string
   deleted_at: string | null
   service_identity: string
+  server_resource_uid: string
   server_identity: string
   name: string
   category: string
@@ -48,7 +50,7 @@ export interface MiddlewareListParams {
 
 /** 创建中间件请求参数 */
 export interface MiddlewareCreateData {
-  server_identity?: string
+  server_resource_uid?: string
   name: string
   category: string
   type: string
@@ -62,7 +64,7 @@ export interface MiddlewareCreateData {
 
 /** 更新中间件请求参数 */
 export interface MiddlewareUpdateData {
-  server_identity?: string
+  server_resource_uid?: string
   name?: string
   category?: string
   type?: string
@@ -100,8 +102,8 @@ export interface MetricMetaItem {
 /** 指标元数据响应 */
 export interface MetricsMetaResponse {
   data_source: string
-  collector_identity: string
-  server_identity: string
+  resource_uid: string
+  service_identity: string
   count: number
   metrics: MetricMetaItem[]
 }
@@ -109,7 +111,7 @@ export interface MetricsMetaResponse {
 /** 指标元数据请求参数 */
 export interface MetricsMetaParams {
   data_source: string
-  server_identity?: string
+  resource_uid?: string
   keyword?: string
   limit?: number
 }
@@ -126,7 +128,7 @@ export const fetchMiddlewareDetail = (id: number) => {
 
 /** 创建中间件服务 */
 export const createMiddleware = (data: MiddlewareCreateData) => {
-  return request.post<{ message: string; id: number; service_identity: string }>('/DC-Control/v1/middleware', data)
+  return request.post<{ message: string; id: number; resource_uid: string; service_identity: string }>('/DC-Control/v1/middleware', data)
 }
 
 /** 更新中间件服务 */
@@ -145,9 +147,9 @@ export const fetchMiddlewareMetricsMeta = (params: MetricsMetaParams) => {
 }
 
 /** 获取最新时序指标 */
-export const fetchMiddlewareMetricsLatest = (serviceIdentity: string) => {
+export const fetchMiddlewareMetricsLatest = (resourceUID: string) => {
   return request.get<{ code: number; message: string; details: MiddlewareMetricsLatestData }>('/DC-Control/v1/middleware/metrics/latest', {
-    params: { service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
 }
 
diff --git a/src/api/ops/netarchTopo.ts b/src/api/ops/netarchTopo.ts
index 100020c..fd3cb33 100644
--- a/src/api/ops/netarchTopo.ts
+++ b/src/api/ops/netarchTopo.ts
@@ -20,6 +20,8 @@ export interface Topology {
   link_count?: number
   enable?: boolean
   auto_discovery?: boolean
+  business_system_id?: number
+  published_to_network_screen?: boolean
   created_at?: string
   updated_at?: string
 }
@@ -48,6 +50,37 @@ export interface Link {
   source_interface_identity?: string
   target_resource_uid?: string
   target_interface_identity?: string
+  in_bps?: number
+  out_bps?: number
+  bandwidth_bps?: number
+  utilization_percent?: number
+  traffic_band?: 'low' | 'medium' | 'high' | 'insufficient' | 'down'
+  display_color?: string
+  data_status?: 'available' | 'insufficient'
+  data_time?: string
+}
+
+export interface TopologyPresentation {
+  topology_id: number
+  node_size: number
+  show_node_name: boolean
+  show_node_ip: boolean
+  show_node_manufacturer: boolean
+  link_shape: 'straight' | 'curve' | 'step'
+  link_width: number
+  show_port_label: boolean
+  show_traffic_label: boolean
+  link_animated: boolean
+  traffic_low_threshold: number
+  traffic_high_threshold: number
+  traffic_low_color: string
+  traffic_medium_color: string
+  traffic_high_color: string
+  background_type: 'transparent' | 'solid' | 'gradient'
+  background_color: string
+  gradient_start_color: string
+  gradient_end_color: string
+  gradient_direction: 'top_to_bottom' | 'left_to_right' | 'diagonal_down_right' | 'diagonal_down_left'
 }
 
 /** 拓扑分组 */
@@ -87,6 +120,8 @@ export interface TopologyNode {
   ref_type?: string
   ref_id?: number
   sub_topology_id?: number | null
+  manufacturer_code?: string
+  model?: string
   created_at?: string
   updated_at?: string
 }
@@ -161,6 +196,15 @@ export const fetchTopologyView = (id: number) => request.get(`/DC-Control/v1/top
 /** 获取拓扑图数据（用于前端可视化） */
 export const fetchTopologyGraph = (id: number) => request.get(`/DC-Control/v1/topologies/${id}/graph`)
 
+/** 获取并保存拓扑统一展示配置 */
+export const fetchTopologyPresentation = (id: number) => request.get(`/DC-Control/v1/topologies/${id}/presentation`)
+export const saveTopologyPresentation = (id: number, data: TopologyPresentation) =>
+  request.put(`/DC-Control/v1/topologies/${id}/presentation`, data)
+
+/** 发布到固定网络大屏 */
+export const publishTopologyToNetworkScreen = (id: number) => request.post(`/DC-Control/v1/topologies/${id}/publish-network-screen`)
+export const fetchNetworkScreenPublication = () => request.get('/DC-Control/v1/topologies/network-screen-publication')
+
 export const fetchImpactAnalysis = (params: { resource_uid: string; topology_id?: number; incident_id?: number; depth?: number }) =>
   request.get<ImpactAnalysis>('/DC-Control/v1/impact/analyze', { params })
 
diff --git a/src/api/ops/network-device.ts b/src/api/ops/network-device.ts
index 32e8b2b..371c740 100644
--- a/src/api/ops/network-device.ts
+++ b/src/api/ops/network-device.ts
@@ -65,6 +65,40 @@ export interface WirelessAccessPoint {
   last_seen_at: string
 }
 
+export interface NetworkDeviceMetric {
+  timestamp?: string
+  service_identity?: string
+  type?: string
+  metric_name: string
+  metric_value: number
+  metric_unit: string
+  series_key?: string
+  labels?: string
+}
+
+export interface NetworkMetricsLatestData {
+  resource_uid: string
+  service_identity: string
+  latest_timestamp: string | null
+  count: number
+  metrics: NetworkDeviceMetric[]
+}
+
+export interface NetworkMetricsTimeseriesQuery {
+  start_time?: string
+  end_time?: string
+  metric_name?: string
+}
+
+export interface NetworkMetricsTimeseriesData {
+  resource_uid: string
+  service_identity: string
+  start_time: string
+  end_time: string
+  count: number
+  metrics: NetworkDeviceMetric[]
+}
+
 export interface NetworkDeviceListResponse {
   total: number
   page: number
@@ -82,7 +116,6 @@ export interface NetworkDeviceQueryParams {
 export interface CreateNetworkDeviceParams {
   resource_uid: string
   asset_id: number
-  service_identity?: string
   name: string
   category: string
   type?: string
@@ -93,6 +126,7 @@ export interface CreateNetworkDeviceParams {
   description?: string
   enabled?: boolean
   tags?: string
+	policy_ids?: number[]
 }
 
 export type UpdateNetworkDeviceParams = Partial<CreateNetworkDeviceParams>
@@ -113,3 +147,14 @@ export const fetchNetworkDeviceInterfaces = (id: number) =>
 
 export const fetchNetworkDeviceAccessPoints = (id: number) =>
   request.get<WirelessAccessPoint[]>(`/DC-Control/v1/network-device-services/${id}/access-points`)
+
+export const fetchNetworkMetricsLatest = (resourceUID: string) =>
+  request.get<NetworkMetricsLatestData>('/DC-Control/v1/network-device-services/metrics/latest', {
+    params: { resource_uid: resourceUID },
+  })
+
+export const fetchNetworkMetricsTimeseries = (resourceUID: string, params?: NetworkMetricsTimeseriesQuery) =>
+  request.get<NetworkMetricsTimeseriesData>(
+    `/DC-Control/v1/network-device-services/metrics/timeseries/${encodeURIComponent(resourceUID)}`,
+    { params }
+  )
diff --git a/src/api/ops/noticeChannel.ts b/src/api/ops/noticeChannel.ts
index 5d94e74..64498dd 100644
--- a/src/api/ops/noticeChannel.ts
+++ b/src/api/ops/noticeChannel.ts
@@ -12,6 +12,7 @@ export const fetchNoticeChannelDetail = (id: number) => {
 
 /** 创建通知渠道 */
 export const createNoticeChannel = (data: {
+  code: string
   name: string
   type: string
   config: string
@@ -34,12 +35,6 @@ export const createNoticeChannel = (data: {
   email_cc?: string[]
   email_bcc?: string[]
   email_security_mode?: 'none' | 'starttls' | 'tls'
-  sms_provider?: string
-  sms_access_key_id?: string
-  sms_access_key_secret?: string
-  sms_sign_name?: string
-  sms_template_code?: string
-  sms_phones?: string[]
   in_app_targets?: string[]
   in_app_aggregation_window?: number
 }) => {
@@ -49,6 +44,7 @@ export const createNoticeChannel = (data: {
 /** 更新通知渠道 */
 export const updateNoticeChannel = (data: {
   id: number
+  code?: string
   name?: string
   type?: string
   config?: string
@@ -71,12 +67,6 @@ export const updateNoticeChannel = (data: {
   email_cc?: string[]
   email_bcc?: string[]
   email_security_mode?: 'none' | 'starttls' | 'tls'
-  sms_provider?: string
-  sms_access_key_id?: string
-  sms_access_key_secret?: string
-  sms_sign_name?: string
-  sms_template_code?: string
-  sms_phones?: string[]
   in_app_targets?: string[]
   in_app_aggregation_window?: number
 }) => {
diff --git a/src/api/ops/pc.ts b/src/api/ops/pc.ts
index 276e391..c45a8c8 100644
--- a/src/api/ops/pc.ts
+++ b/src/api/ops/pc.ts
@@ -42,7 +42,6 @@ export interface PCListResult {
 export interface PCCreateParams {
   resource_uid: string
   asset_id: number
-  pc_identity?: string
   name: string
   host: string
   ip_address?: string
@@ -53,6 +52,7 @@ export interface PCCreateParams {
   server_type?: string
   tags?: string
   location?: string
+  policy_ids?: number[]
 }
 
 /** PC 更新参数 */
@@ -68,6 +68,7 @@ export interface PCUpdateParams {
   server_type?: string
   tags?: string
   location?: string
+  policy_ids?: number[]
 }
 
 /** 获取PC列表（分页） */
diff --git a/src/api/ops/platformRuntime.ts b/src/api/ops/platformRuntime.ts
index fd14df9..efc5d0d 100644
--- a/src/api/ops/platformRuntime.ts
+++ b/src/api/ops/platformRuntime.ts
@@ -74,7 +74,6 @@ const services: ServiceSpec[] = [
   { key: 'assets', name: '资产管理', path: '/Assets/v1/runtime/status' },
   { key: 'dc-control', name: '监控控制中心', path: '/DC-Control/v1/runtime/status' },
   { key: 'dc-network', name: '网络采集', path: '/dc-network/v1/runtime/status' },
-  { key: 'dc-hardware', name: '硬件采集', path: '/DC-Hardware/v1/runtime/status' },
   { key: 'alert', name: '告警中心', path: '/Alert/v1/runtime/status' },
   { key: 'logs', name: '日志中心', path: '/Logs/v1/runtime/status' },
   { key: 'feedback', name: '工单反馈', path: '/Feedback/v1/runtime/status' },
diff --git a/src/api/ops/rbac2.ts b/src/api/ops/rbac2.ts
index 3c9297d..776f359 100644
--- a/src/api/ops/rbac2.ts
+++ b/src/api/ops/rbac2.ts
@@ -84,3 +84,20 @@ export const deleteRole = (id: number) => request.post('/rbac2/v1/role/del', { i
 export const fetchRolePermissions = (id: number) => request.post('/rbac2/v1/role/pmn', { id }, { needWorkspace: true })
 export const updateRolePermissions = (id: number, list: number[]) =>
   request.post('/rbac2/v1/role/modify_pmn', { id, list }, { needWorkspace: true })
+
+export interface AlertDefaultReceiver {
+  id: number
+  name: string
+  account: string
+  phone: string
+  email: string
+}
+
+export const fetchAlertDefaultReceiver = () =>
+  request.get<AlertDefaultReceiver>('/rbac2/v1/alert-receiver', { needWorkspace: true })
+
+export const fetchAlertDefaultReceiverOptions = (keyword?: string) =>
+  request.get<AlertDefaultReceiver[]>('/rbac2/v1/alert-receiver/options', { params: { keyword }, needWorkspace: true })
+
+export const updateAlertDefaultReceiver = (userId: number) =>
+  request.post<AlertDefaultReceiver>('/rbac2/v1/alert-receiver', { user_id: userId }, { needWorkspace: true })
diff --git a/src/api/ops/report.ts b/src/api/ops/report.ts
index 385cd2d..6cd6b97 100644
--- a/src/api/ops/report.ts
+++ b/src/api/ops/report.ts
@@ -166,8 +166,8 @@ export interface DownloadedReport {
 export interface TrafficReportParams {
   /** topology：拓扑/NetFlow；snmp_devices：多设备 SNMP 接口流量汇总 */
   traffic_mode?: 'topology' | 'snmp_devices'
-  /** traffic_mode=snmp_devices 时必填，service_identity 列表 */
-  service_identities?: string[]
+  /** traffic_mode=snmp_devices 时必填，统一资源标识列表 */
+  resource_uids?: string[]
   topology_id?: number
   link_id?: number
   node_id?: string
@@ -203,8 +203,7 @@ export interface FaultReportParams {
 }
 
 export interface ServerReportParams {
-  server_ids?: number[]
-  server_identities?: string[]
+  resource_uids: string[]
   start_time: string
   end_time: string
   columns?: ('availability' | 'last_check_time' | 'cpu' | 'memory_phys' | 'memory_virt' | 'disk_io' | 'disk_usage' | 'daily_alerts')[]
@@ -214,8 +213,7 @@ export interface ServerReportParams {
 
 /** POST /reports/generate report_type=network_device */
 export interface NetworkDeviceReportParams {
-  network_device_service_ids?: number[]
-  service_identities?: string[]
+  resource_uids: string[]
   start_time: string
   end_time: string
   columns?: string[]
@@ -225,7 +223,7 @@ export interface NetworkDeviceReportParams {
 export interface StatisticsReportParams {
   data_source: 'dc-host' | 'dc-network' | 'dc-database' | 'dc-middleware'
   metric_id: string
-  target_identities: string[]
+  resource_uids: string[]
   start_time: string
   end_time: string
   output_mode: 'scalar' | 'timeseries'
@@ -248,7 +246,7 @@ export interface HistoryReportParams {
 export interface TopNReportParams {
   data_source: 'dc-host' | 'dc-network' | 'dc-database' | 'dc-middleware' | 'alert'
   metric_id: string
-  target_identities: string[]
+  resource_uids: string[]
   start_time: string
   end_time: string
   n?: number
diff --git a/src/api/ops/room-device.ts b/src/api/ops/room-device.ts
index 3a0438a..dda573d 100644
--- a/src/api/ops/room-device.ts
+++ b/src/api/ops/room-device.ts
@@ -51,7 +51,6 @@ export interface RoomDeviceListParams {
 export interface RoomDeviceCreateData {
   resource_uid: string
   asset_id: number
-  service_identity?: string
   name: string
   description?: string
   room_id: number
@@ -80,6 +79,7 @@ export interface MetricItem {
 
 /** GET /room-devices/metrics/latest 的 details 载荷 */
 export interface RoomDeviceMetricsLatestDetails {
+  resource_uid: string
   service_identity: string
   latest_timestamp?: string | null
   count: number
@@ -119,9 +119,9 @@ export const updateRoomDevice = (id: number, data: RoomDeviceUpdateData) => {
 }
 
 /** 查询最新指标 */
-export const fetchLatestMetrics = (serviceIdentity: string) => {
+export const fetchLatestMetrics = (resourceUID: string) => {
   return request.get<RoomDeviceMetricsLatestResponse>('/DC-Control/v1/room-devices/metrics/latest', {
-    params: { service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
 }
 
diff --git a/src/api/ops/security.ts b/src/api/ops/security.ts
index 41e3da4..bb5a011 100644
--- a/src/api/ops/security.ts
+++ b/src/api/ops/security.ts
@@ -54,7 +54,6 @@ export interface SecurityServiceListParams {
 export interface SecurityServiceFormData {
   resource_uid?: string
   asset_id?: number
-  service_identity?: string
   name?: string
   category?: string
   type?: string
@@ -82,6 +81,7 @@ export interface SecurityMetric {
 
 /** 安全设备最新指标数据 */
 export interface SecurityMetricsLatestData {
+  resource_uid: string
   service_identity: string
   latest_timestamp: string | null
   count: number
@@ -109,9 +109,9 @@ export const updateSecurityService = (id: number, data: Partial<SecurityServiceF
 }
 
 /** 获取最新时序指标 */
-export const fetchSecurityMetricsLatest = (serviceIdentity: string) => {
+export const fetchSecurityMetricsLatest = (resourceUID: string) => {
   return request.get<{ code: number; message: string; details: SecurityMetricsLatestData }>('/DC-Control/v1/security/metrics/latest', {
-    params: { service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
 }
 
@@ -122,6 +122,7 @@ export interface SecurityMetricsTimeseriesQuery {
 }
 
 export interface SecurityMetricsTimeseriesData {
+  resource_uid: string
   service_identity: string
   start_time: string
   end_time: string
@@ -130,8 +131,8 @@ export interface SecurityMetricsTimeseriesData {
 }
 
 /** 查询安全设备指标原始时序点 */
-export const fetchSecurityMetricsTimeseries = (serviceIdentity: string, params?: SecurityMetricsTimeseriesQuery) => {
-  const path = encodeURIComponent(serviceIdentity)
+export const fetchSecurityMetricsTimeseries = (resourceUID: string, params?: SecurityMetricsTimeseriesQuery) => {
+  const path = encodeURIComponent(resourceUID)
   return request.get<{ code: number; message: string; details: SecurityMetricsTimeseriesData }>(
     `/DC-Control/v1/security/metrics/timeseries/${path}`,
     { params }
@@ -146,7 +147,7 @@ export const fetchSecurityAccessPoints = (id: number) =>
 
 /** 告警聚合查询参数 */
 export interface SecurityMetricsAggregateParams {
-  service_identity: string
+  resource_uid: string
   metric_name: string
   start_time: string
   end_time: string
diff --git a/src/api/ops/server.ts b/src/api/ops/server.ts
index 7b3d486..72242f7 100644
--- a/src/api/ops/server.ts
+++ b/src/api/ops/server.ts
@@ -19,10 +19,8 @@ export interface ServerItem {
   tags: string
   location: string
   asset_id?: number
-	monitored_processes: string[]
-	monitored_ports: number[]
   status: string
-  last_check_time: string
+  last_check_time: string | null
 }
 
 /** 服务器列表响应 */
@@ -43,7 +41,6 @@ export interface ServerListParams {
 /** 创建/更新服务器请求参数 */
 export interface ServerFormData {
   resource_uid?: string
-  server_identity?: string
   name?: string
   host?: string
   ip_address?: string
@@ -55,8 +52,91 @@ export interface ServerFormData {
   tags?: string
   location?: string
   asset_id?: number
-	monitored_processes?: string[]
-	monitored_ports?: number[]
+  policy_ids?: number[]
+}
+
+/** 服务器上的业务服务监控项 */
+export interface ServerServiceMonitor {
+  id: number
+  server_id: number
+  resource_uid: string
+  stable_code: string
+  service_name: string
+  process_name: string
+  port: number
+  enabled: boolean
+  config_version: number
+  binding_version: number
+  last_state: 'available' | 'unavailable' | 'unknown' | 'removed'
+  last_message?: string
+  last_process_running?: boolean | null
+  last_port_listening?: boolean | null
+  last_available?: boolean | null
+  last_checked_at?: string | null
+  created_at?: string
+  updated_at?: string
+}
+
+export interface ServerServiceMonitorInput {
+  service_name: string
+  process_name: string
+  port: number
+  enabled: boolean
+}
+
+export interface ServerServiceMonitorOption {
+  id: number
+  stable_code: string
+  service_name: string
+  process_name: string
+  port: number
+  server_id: number
+  resource_uid: string
+  server_name: string
+}
+
+export interface ServiceMonitorReference {
+  business_system_id: number
+  business_system_code: string
+  business_system_name: string
+}
+
+export interface ServiceMonitorDeleteConflict {
+  conflict_code: 'SERVICE_MONITOR_REFERENCED' | 'SERVICE_MONITOR_REFERENCE_CHANGED'
+  binding_version: number
+  service_monitor_id: number
+  stable_code: string
+  business_systems: ServiceMonitorReference[]
+}
+
+/** Linux Agent 只读采集的固定文件日志 */
+export interface ServerFileLogMonitor {
+  id: number
+  server_id: number
+  resource_uid: string
+  stable_code: string
+  name: string
+  file_path: string
+  encoding: 'utf-8' | 'gb18030'
+  multiline_mode: 'single_line' | 'start_pattern'
+  multiline_start_pattern: string
+  enabled: boolean
+  config_version: number
+  cursor_file_identity: string
+  cursor_offset: number
+  last_read_at?: string | null
+  last_error?: string
+  created_at?: string
+  updated_at?: string
+}
+
+export interface ServerFileLogMonitorInput {
+  name: string
+  file_path: string
+  encoding: 'utf-8' | 'gb18030'
+  multiline_mode: 'single_line' | 'start_pattern'
+  multiline_start_pattern: string
+  enabled: boolean
 }
 
 /** 获取服务器列表（分页） */
@@ -79,6 +159,63 @@ export const updateServer = (id: number, data: Partial<ServerFormData>) => {
   return request.put<{ message: string }>(`/DC-Control/v1/servers/${id}`, data)
 }
 
+export const fetchServerServiceMonitors = (serverId: number) =>
+  request.get<{ code?: number; details?: { list: ServerServiceMonitor[]; count: number }; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/service-monitors`
+  )
+
+export const createServerServiceMonitor = (serverId: number, data: ServerServiceMonitorInput) =>
+  request.post<{ code?: number; details?: ServerServiceMonitor; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/service-monitors`,
+    data
+  )
+
+export const updateServerServiceMonitor = (serverId: number, monitorId: number, data: ServerServiceMonitorInput) =>
+  request.put<{ code?: number; details?: ServerServiceMonitor; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/service-monitors/${monitorId}`,
+    data
+  )
+
+export const deleteServerServiceMonitor = (
+  serverId: number,
+  monitorId: number,
+  options?: { unlinkReferences: boolean; bindingVersion: number }
+) =>
+  request.delete<{ code?: number; details?: { message: string }; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/service-monitors/${monitorId}`,
+    options?.unlinkReferences
+      ? { params: { unlink_references: true, binding_version: options.bindingVersion } }
+      : undefined
+  )
+
+export const fetchServerServiceMonitorOptions = (businessSystemId: number, keyword?: string) =>
+  request.get<{ code?: number; details?: { list: ServerServiceMonitorOption[]; count: number }; message?: string }>(
+    '/DC-Control/v1/service-monitors/options',
+    { params: { business_system_id: businessSystemId, keyword: keyword || undefined } }
+  )
+
+export const fetchServerFileLogMonitors = (serverId: number) =>
+  request.get<{ code?: number; details?: { list: ServerFileLogMonitor[]; count: number }; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/file-log-monitors`
+  )
+
+export const createServerFileLogMonitor = (serverId: number, data: ServerFileLogMonitorInput) =>
+  request.post<{ code?: number; details?: ServerFileLogMonitor; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/file-log-monitors`,
+    data
+  )
+
+export const updateServerFileLogMonitor = (serverId: number, monitorId: number, data: ServerFileLogMonitorInput) =>
+  request.put<{ code?: number; details?: ServerFileLogMonitor; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/file-log-monitors/${monitorId}`,
+    data
+  )
+
+export const deleteServerFileLogMonitor = (serverId: number, monitorId: number) =>
+  request.delete<{ code?: number; details?: { message: string }; message?: string }>(
+    `/DC-Control/v1/servers/${serverId}/file-log-monitors/${monitorId}`
+  )
+
 /** 主机最新指标摘要（统计卡片，与 dc-control /servers/metrics/summary 一致） */
 export interface HostMetricsUseStat {
   total_bytes: number
@@ -135,15 +272,44 @@ export interface HostLatestMetricsPayload {
 }
 
 export interface HardwareSnapshotPayload {
+	resource_uid: string
+	configured: boolean
 	has_data: boolean
 	protocol?: string
 	collected_at?: string
+	overall_status: 'ok' | 'warning' | 'critical' | 'unknown'
+	bindings: HardwareCollectionBinding[]
 	metrics: Array<{ code: string; value: number; unit: string; labels: Record<string, string> }>
 	inventory: Array<{ type: string; identity: string; name: string; status: string; attributes: Record<string, string> }>
 	events: Array<{ code: string; severity: string; summary: string; attributes: Record<string, string> }>
 	diagnostics: Array<{ code: string; level: string; message: string }>
 }
 
+export interface HardwareCollectionBinding {
+	id: number
+	name: string
+	protocol: 'redfish' | 'ipmi'
+	target: string
+	port: number
+	interval_seconds: number
+	enabled: boolean
+	state: string
+	collector_node_name: string
+	credential_name: string
+	template_name: string
+	template_version: number
+}
+
+export interface HardwareMetricHistoryPayload {
+	server_identity: string
+	metric_code: string
+	metric_name: string
+	sensor: string
+	start_time: string
+	end_time: string
+	points: Array<{ timestamp: string; value: number; unit: string }>
+}
+
 export interface HostNetworkTrafficPoint {
   time: string
   recv_mbps: number
@@ -162,27 +328,39 @@ export interface HostNetworkTrafficPayload {
 }
 
 /** 最新一批主机指标（用于监控大屏卡片） */
-export const fetchServerMetricsSummary = (serverIdentity: string) => {
+export const fetchServerMetricsSummary = (resourceUID: string) => {
   return request.get<{ code: number; details?: HostMetricsSummary; message?: string }>('/DC-Control/v1/servers/metrics/summary', {
-    params: { server_identity: serverIdentity },
+    params: { resource_uid: resourceUID },
   })
 }
 
-export const fetchServerLatestMetrics = (serverIdentity: string) =>
+export const fetchServerLatestMetrics = (resourceUID: string) =>
 	request.get<{ code: number; details?: HostLatestMetricsPayload; message?: string }>('/DC-Control/v1/servers/metrics/latest', {
-		params: { server_identity: serverIdentity },
+		params: { resource_uid: resourceUID },
 	})
 
-export const fetchServerHardwareSnapshot = (serverIdentity: string) =>
+export const fetchServerHardwareSnapshot = (resourceUID: string) =>
 	request.get<{ code: number; details?: HardwareSnapshotPayload; message?: string }>('/DC-Control/v1/servers/metrics/hardware', {
-		params: { server_identity: serverIdentity },
+		params: { resource_uid: resourceUID },
 	})
 
+export const fetchServerHardwareMetricHistory = (
+	resourceUID: string,
+	metricCode: string,
+	sensor: string,
+	startTime: string,
+	endTime: string
+) =>
+	request.get<{ code: number; details?: HardwareMetricHistoryPayload; message?: string }>(
+		'/DC-Control/v1/servers/metrics/hardware/history',
+		{ params: { resource_uid: resourceUID, metric_code: metricCode, sensor, start_time: startTime, end_time: endTime } }
+	)
+
 /** 近 N 小时网络收/发速率（Mbps，相邻采样字节差分） */
-export const fetchServerNetworkTraffic = (serverIdentity: string, hours = 6) => {
+export const fetchServerNetworkTraffic = (resourceUID: string, hours = 6) => {
   return request.get<{ code: number; details?: HostNetworkTrafficPayload; message?: string }>(
     '/DC-Control/v1/servers/metrics/network-traffic',
-    { params: { server_identity: serverIdentity, hours } }
+    { params: { resource_uid: resourceUID, hours } }
   )
 }
 
@@ -225,10 +403,11 @@ export interface LatestResourceSummaryPayload {
 /** 按资产聚合项 */
 export interface AssetMixedSummaryItem {
   asset_id: number
+  name: string
   virtual_count: number
   physical_count: number
-  physical_latest_cpu_usage?: number | null
-  physical_latest_mem_usage?: number | null
+  virtual_latest_cpu_usage: number | null
+  virtual_latest_mem_usage: number | null
 }
 
 export interface AssetMixedSummaryPayload {
@@ -258,7 +437,7 @@ export const fetchLatestResourceSummary = () => {
   )
 }
 
-/** 接口4：按资产汇总 virtual 数量与 physical 最新指标 */
+/** 接口4：按资产汇总虚拟机名称、数量与最新指标 */
 export const fetchAssetMixedSummary = () => {
   return request.get<{ code: number; details?: AssetMixedSummaryPayload; message?: string }>('/DC-Control/v1/servers/assets/mixed/summary')
 }
diff --git a/src/api/ops/storage.ts b/src/api/ops/storage.ts
index 7876f97..891562e 100644
--- a/src/api/ops/storage.ts
+++ b/src/api/ops/storage.ts
@@ -53,7 +53,6 @@ export interface StorageListParams {
 export interface StorageCreateData {
   resource_uid?: string
   asset_id?: number
-  service_identity?: string
   name: string
   category?: string
   type: string
@@ -69,9 +68,6 @@ export interface StorageCreateData {
 
 /** 更新存储设备请求参数 */
 export interface StorageUpdateData {
-  resource_uid?: string
-  asset_id?: number
-  service_identity?: string
   name?: string
   category?: string
   type?: string
@@ -103,10 +99,13 @@ export interface StorageMetricItem {
   metric_name: string
   metric_value: number
   metric_unit: string
+  series_key?: string
+  labels?: string
 }
 
 /** 最新指标响应 */
 export interface StorageMetricsLatestResponse {
+  resource_uid: string
   service_identity: string
   latest_timestamp: string | null
   count: number
@@ -137,14 +136,15 @@ export const fetchStorageComponents = (id: number) =>
   request.get<StorageComponent[]>(`/DC-Control/v1/storage/${id}/components`)
 
 /** 查询最新一批时序指标 */
-export const fetchStorageMetricsLatest = (serviceIdentity: string) => {
+export const fetchStorageMetricsLatest = (resourceUID: string) => {
   return request.get<StorageMetricsLatestResponse>('/DC-Control/v1/storage/metrics/latest', {
-    params: { service_identity: serviceIdentity },
+    params: { resource_uid: resourceUID },
   })
 }
 
 /** 监控大屏：下拉列表（JWT，模糊 keyword） */
 export interface StorageMonitorOptionItem {
+  resource_uid: string
   service_identity: string
   name: string
   type: string
@@ -181,13 +181,13 @@ export const fetchStorageMonitorList = (params?: { keyword?: string }) => {
   }>('/DC-Control/v1/storage/monitor/list', { params })
 }
 
-export const fetchStorageMonitorSummary = (serviceIdentity?: string) => {
+export const fetchStorageMonitorSummary = (resourceUID?: string) => {
   return request.get<{
     code: number
     details?: StorageMonitorSummaryPayload
     message?: string
   }>('/DC-Control/v1/storage/monitor/summary', {
-    params: serviceIdentity ? { service_identity: serviceIdentity } : {},
+    params: resourceUID ? { resource_uid: resourceUID } : {},
   })
 }
 
@@ -214,7 +214,7 @@ export const fetchStorageMonitorCollectedMetrics = (deviceId: number) => {
 
 /** 存储指标匿名聚合（告警/大屏用） */
 export interface StorageMetricsAggregateParams {
-  service_identity: string
+  resource_uid: string
   metric_name: string
   start_time: string
   end_time: string
@@ -231,7 +231,7 @@ export interface StorageMetricsAggregateDetails {
   end_time: string
 }
 
-/** 与 DC-Hardware GET /metrics/devices/:device_id 对齐：路径 service_identity，Query 可选 */
+/** 按统一设备标识和可选时间范围查询存储指标 */
 export interface StorageMetricsTimeseriesQuery {
   start_time?: string
   end_time?: string
@@ -256,12 +256,13 @@ export const fetchStorageMetricsAggregate = (params: StorageMetricsAggregatePara
   )
 }
 
-/** 存储指标时序原始点（JWT）；路径为 service_identity，需 URL 编码 */
-export const fetchStorageMetricsTimeseries = (serviceIdentity: string, params?: StorageMetricsTimeseriesQuery) => {
-  const path = encodeURIComponent(serviceIdentity)
+/** 存储指标时序原始点（JWT）；路径为 resource_uid，需 URL 编码 */
+export const fetchStorageMetricsTimeseries = (resourceUID: string, params?: StorageMetricsTimeseriesQuery) => {
+  const path = encodeURIComponent(resourceUID)
   return request.get<{
     code: number
     details?: {
+      resource_uid: string
       service_identity: string
       start_time: string
       end_time: string
diff --git a/src/api/ops/suppression.ts b/src/api/ops/suppression.ts
index afc348e..8dfb13d 100644
--- a/src/api/ops/suppression.ts
+++ b/src/api/ops/suppression.ts
@@ -11,7 +11,6 @@ export interface SuppressionRule {
   type: SuppressionType
   enabled?: boolean
   priority?: number
-  policy_id?: number
   // dedup 类型字段
   dedup_window?: number
   dedup_keys?: string
@@ -45,7 +44,6 @@ export interface SuppressionListParams {
   sort?: string
   order?: string
   type?: SuppressionType
-  policy_id?: number
   enabled?: boolean
 }
 
@@ -56,7 +54,6 @@ export interface SuppressionCreateParams {
   description?: string
   enabled?: boolean
   priority?: number
-  policy_id?: number
   dedup_window?: number
   dedup_keys?: string
   aggregate_window?: number
@@ -78,7 +75,6 @@ export interface SuppressionUpdateParams {
   description?: string
   enabled?: boolean
   priority?: number
-  policy_id?: number
   dedup_window?: number
   dedup_keys?: string
   aggregate_window?: number
diff --git a/src/api/ops/systemSettings.ts b/src/api/ops/systemSettings.ts
index e7fbafb..27586ec 100644
--- a/src/api/ops/systemSettings.ts
+++ b/src/api/ops/systemSettings.ts
@@ -34,8 +34,31 @@ export interface CommonPhrase {
 
 export type PublicSystemParameters = Record<string, number>
 
-export const fetchDictionaries = (params?: { category_code?: string; enabled?: boolean }) =>
-  request.get(`${BASE}/dictionaries`, { params })
+export interface BrandingImage {
+  file_id: string
+  url: string
+  content_type: string
+}
+
+export interface SystemBranding {
+  system_name: string
+  logo?: BrandingImage
+  login_backgrounds: BrandingImage[]
+  background_file_ids: string[]
+  cleanup_warnings?: string[]
+}
+
+interface BrandingUploadInit {
+  file_id: string
+  upload: {
+    method: string
+    url: string
+    headers: Record<string, string>
+    expires_at: string
+  }
+}
+
+export const fetchDictionaries = (params?: { category_code?: string; enabled?: boolean }) => request.get(`${BASE}/dictionaries`, { params })
 export const createDictionary = (data: DataDictionaryItem) => request.post(`${BASE}/dictionaries`, data)
 export const updateDictionary = (id: number, data: DataDictionaryItem) => request.put(`${BASE}/dictionaries/${id}`, data)
 export const deleteDictionary = (id: number) => request.delete(`${BASE}/dictionaries/${id}`)
@@ -44,6 +67,35 @@ export const fetchSystemParameters = () => request.get(`${BASE}/parameters`)
 export const fetchPublicSystemParameters = () => request.get<unknown>('/Mgt/v1/settings/parameters/public')
 export const updateSystemParameter = (code: string, value: number) => request.put(`${BASE}/parameters/${code}`, { value })
 
+export const fetchSystemBranding = () => request.get<SystemBranding>(`${BASE}/branding`)
+export const fetchPublicSystemBranding = () => request.get<SystemBranding>(`${BASE}/branding/public`)
+export const updateSystemBranding = (data: { system_name: string; logo_file_id?: string; background_file_ids: string[] }) =>
+  request.put<SystemBranding>(`${BASE}/branding`, data)
+
+export async function uploadSystemBrandingImage(file: File): Promise<BrandingImage> {
+  const initResponse: any = await request.post(`${BASE}/branding/uploads/init`, {
+    filename: file.name,
+    size: file.size,
+    content_type: file.type,
+  })
+  const pending = initResponse.details as BrandingUploadInit
+  if (initResponse.code !== 0 || !pending?.file_id || !pending.upload?.url || !pending.upload?.method) {
+    throw new Error(initResponse.message || '初始化品牌图片上传失败')
+  }
+  const uploadResponse = await fetch(pending.upload.url, {
+    method: pending.upload.method,
+    headers: pending.upload.headers,
+    body: file,
+    credentials: 'omit',
+  })
+  if (!uploadResponse.ok) throw new Error(`上传品牌图片失败: HTTP ${uploadResponse.status}`)
+  const completeResponse: any = await request.post(`${BASE}/branding/uploads/complete`, { file_id: pending.file_id })
+  if (completeResponse.code !== 0 || !completeResponse.details?.file_id) {
+    throw new Error(completeResponse.message || '确认品牌图片上传失败')
+  }
+  return completeResponse.details as BrandingImage
+}
+
 export const fetchCommonPhrases = (params?: { page?: number; page_size?: number; keyword?: string; category_code?: string }) =>
   request.get(`${BASE}/phrases`, { params })
 export const createCommonPhrase = (data: CommonPhrase) => request.post(`${BASE}/phrases`, data)
diff --git a/src/api/ops/traffic-runtime.ts b/src/api/ops/traffic-runtime.ts
index fb93683..b6bdc12 100644
--- a/src/api/ops/traffic-runtime.ts
+++ b/src/api/ops/traffic-runtime.ts
@@ -1,15 +1,15 @@
 import { request } from '@/api/request'
 
 export interface TrafficRuntimeStatus {
-  status?: 'running' | 'stopped' | string
-  message?: string
+  status: 'running' | 'stopped' | 'started'
+  message: string
 }
 
 export const fetchTrafficRuntimeStatus = () =>
-  request.get<{ code: number; details?: TrafficRuntimeStatus; message?: string }>('/dc-network/v1/api/traffic/status')
+  request.get<{ code: number; details: TrafficRuntimeStatus; message?: string }>('/DC-Control/v1/traffic/runtime')
 
 export const startTrafficRuntime = () =>
-  request.post<{ code: number; details?: TrafficRuntimeStatus; message?: string }>('/dc-network/v1/api/traffic/start')
+  request.post<{ code: number; details: TrafficRuntimeStatus; message?: string }>('/DC-Control/v1/traffic/runtime/start')
 
 export const stopTrafficRuntime = () =>
-  request.post<{ code: number; details?: TrafficRuntimeStatus; message?: string }>('/dc-network/v1/api/traffic/stop')
+  request.post<{ code: number; details: TrafficRuntimeStatus; message?: string }>('/DC-Control/v1/traffic/runtime/stop')
diff --git a/src/components/footer/index.vue b/src/components/footer/index.vue
index c7c6665..46498d1 100644
--- a/src/components/footer/index.vue
+++ b/src/components/footer/index.vue
@@ -1,6 +1,6 @@
 <template>
   <a-layout-footer class="footer">
-    智能运维管理系统
+    {{ systemName }}
     <span style="margin-left: 3px">© {{ currentYear }}</span>
     <p style="margin-left: 10px">
       Powered by
@@ -11,8 +11,10 @@
 
 <script lang="ts" setup>
 import { ref } from 'vue'
+import { useSystemBranding } from '@/composables/systemBranding'
 
 const currentYear = ref(new Date().getFullYear())
+const { systemName } = useSystemBranding()
 </script>
 
 <style lang="less" scoped>
diff --git a/src/composables/systemBranding.ts b/src/composables/systemBranding.ts
new file mode 100644
index 0000000..c9a1317
--- /dev/null
+++ b/src/composables/systemBranding.ts
@@ -0,0 +1,33 @@
+import { computed, readonly, ref } from 'vue'
+import { fetchPublicSystemBranding, type SystemBranding } from '@/api/ops/systemSettings'
+
+const branding = ref<SystemBranding | null>(null)
+let pending: Promise<SystemBranding> | null = null
+
+export async function loadSystemBranding(force = false): Promise<SystemBranding> {
+  if (!force && branding.value) return branding.value
+  if (!force && pending) return pending
+  pending = fetchPublicSystemBranding()
+    .then((response: any) => {
+      if (response.code !== 0 || !response.details?.system_name) {
+        throw new Error(response.message || '系统品牌配置无效')
+      }
+      branding.value = response.details as SystemBranding
+      document.title = branding.value.system_name
+      return branding.value
+    })
+    .finally(() => {
+      pending = null
+    })
+  return pending
+}
+
+export function useSystemBranding() {
+  return {
+    branding: readonly(branding),
+    systemName: computed(() => branding.value?.system_name || ''),
+    logoURL: computed(() => branding.value?.logo?.url || ''),
+    loginBackgroundURLs: computed(() => (branding.value?.login_backgrounds || []).map((item) => item.url)),
+    loadSystemBranding,
+  }
+}
diff --git a/src/layout/default-layout.vue b/src/layout/default-layout.vue
index cac735c..ffa8082 100644
--- a/src/layout/default-layout.vue
+++ b/src/layout/default-layout.vue
@@ -19,8 +19,8 @@
           <div class="menu-wrapper">
             <div class="left-side">
               <a-space>
-                <img class="app-logo" alt="logo" src="@/assets/logo.svg?url" />
-                <a-typography-title>智能运维管理系统</a-typography-title>
+                <img v-if="logoURL" class="app-logo" alt="logo" :src="logoURL" />
+                <a-typography-title>{{ systemName }}</a-typography-title>
               </a-space>
             </div>
             <Menu />
@@ -66,6 +66,7 @@ import { useRoute, useRouter } from 'vue-router'
 import PageLayout from './page-layout.vue'
 import { getToken } from '@/utils/auth'
 import { heartbeat } from '@/api/module/user'
+import { loadSystemBranding, useSystemBranding } from '@/composables/systemBranding'
 
 const isInit = ref(false)
 const appStore = useAppStore()
@@ -73,6 +74,7 @@ const userStore = useUserStore()
 const router = useRouter()
 const route = useRoute()
 const permission = usePermission()
+const { systemName, logoURL } = useSystemBranding()
 useResponsive(true)
 const navbarHeight = route?.meta?.isNewTab ? '0' : `60px`
 const navbar = computed(() => appStore.navbar)
@@ -140,6 +142,7 @@ provide('toggleDrawerMenu', () => {
 })
 onMounted(() => {
   isInit.value = true
+  void loadSystemBranding()
   void heartbeat()
   heartbeatTimer = window.setInterval(() => void heartbeat(), 60_000)
 })
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
index 475a021..3ca52de 100644
--- a/src/locale/zh-CN.ts
+++ b/src/locale/zh-CN.ts
@@ -26,7 +26,7 @@ export default {
   'menu.server.monitor': '实时监控-服务端',
   'menu.list': '列表页',
   'menu.ops': '运维管理',
-  'menu.ops.alert.suppression': '告警抑制',
+  'menu.ops.alert.suppression': '全局告警抑制',
   'menu.ops.netarch': '网络架构',
   'menu.ops.netarch.topoGroup': '拓扑组管理',
   'menu.ops.netarch.topo': '拓扑图',
diff --git a/src/router/local-menu-flat.ts b/src/router/local-menu-flat.ts
index 1cad0f7..48f6f9c 100644
--- a/src/router/local-menu-flat.ts
+++ b/src/router/local-menu-flat.ts
@@ -31,13 +31,29 @@ export const localMenuFlatItems: MenuItem[] = [
     sort_key: 2,
     created_at: '2025-12-26T13:23:51.62748+08:00',
   },
+  {
+    id: 12070,
+    identity: '019ca000-0001-7000-8000-000000000070',
+    title: '数据大屏管理',
+    title_en: 'Data Screen Management',
+    code: 'opsBigScreenManage',
+    description: '固定数据大屏、公开访问和轮播管理',
+    app_id: 2,
+    parent_id: 13,
+    menu_path: '/ops/big-screen',
+    component: 'ops/pages/big-screen',
+    menu_icon: 'appstore',
+    type: 1,
+    sort_key: 1,
+    created_at: '2026-06-25T10:00:00+08:00',
+  },
   {
     id: 14,
     identity: '019b591d-00dc-7486-aa93-51e798d3253a',
-    title: '大屏管理',
-    title_en: 'My Components',
+    title: '自定义大屏设计',
+    title_en: 'Custom Screen Design',
     code: 'ops:可视化大屏管理:我的组件',
-    description: '可视化大屏管理 - 我的组件',
+    description: '设计自定义数据大屏',
     app_id: 2,
     parent_id: 13,
     menu_path: '/visual/component',
@@ -51,8 +67,8 @@ export const localMenuFlatItems: MenuItem[] = [
   {
     id: 85,
     identity: '019bf309-a961-7bba-a03d-83eb78a82437',
-    title: '已发布大屏列表',
-    title_en: 'View Publish',
+    title: '自定义大屏发布',
+    title_en: 'Custom Screen Publishing',
     code: '已发布大屏列表',
     app_id: 2,
     parent_id: 13,
@@ -260,10 +276,10 @@ export const localMenuFlatItems: MenuItem[] = [
   {
     id: 30,
     identity: '019b591d-01d4-78b0-89ea-a6ba12914379',
-    title: '虚拟化监控',
-    title_en: 'Virtualization Monitoring',
+    title: '虚拟机监控',
+    title_en: 'Virtual Machine Monitoring',
     code: 'ops:综合监控:虚拟化监控',
-    description: '综合监控 - 虚拟化监控',
+    description: '综合监控 - 虚拟机监控',
     app_id: 2,
     parent_id: 23,
     menu_path: '/monitor/virtualization',
@@ -294,7 +310,7 @@ export const localMenuFlatItems: MenuItem[] = [
     title: '服务器硬件监控',
     title_en: 'Server Hardware (OOB)',
     code: 'ops:综合监控:服务器硬件监控',
-    description: '综合监控 - 服务器带外硬件（BMC/IPMI/Redfish 等，DC-Hardware）',
+    description: '综合监控 - 服务器带外硬件（BMC/IPMI/Redfish）',
     app_id: 2,
     parent_id: 23,
     menu_path: '/monitor/host-hardware',
@@ -646,32 +662,17 @@ export const localMenuFlatItems: MenuItem[] = [
     sort_key: 30,
     created_at: '2025-12-26T13:23:52.110362+08:00',
   },
-  {
-    id: 40,
-    identity: '019b591d-026f-785d-b473-ac804133e251',
-    title: '告警模版',
-    title_en: 'Alert Template',
-    code: 'ops:告警管理:告警模版',
-    description: '告警管理 - 告警模版',
-    app_id: 2,
-    parent_id: 39,
-    menu_path: '/alert/template',
-    menu_icon: 'appstore',
-    type: 1,
-    sort_key: 31,
-    created_at: '2025-12-26T13:23:52.047548+08:00',
-  },
   {
     id: 4001,
     identity: '019b591d-026f-785d-b473-ac804133e252',
-    title: '告警模版编辑',
-    title_en: 'Alert Template Edit',
-    code: 'ops:告警管理:告警模版编辑',
-    description: '告警管理 - 告警模版编辑',
+    title: '告警策略编辑',
+    title_en: 'Alert Policy Edit',
+    code: 'ops:告警管理:告警策略编辑',
+    description: '告警管理 - 告警策略编辑',
     app_id: 2,
     parent_id: 39,
-    menu_path: '/alert/template/edit',
-    component: 'ops/pages/alert/template/edit/index',
+    menu_path: '/alert/setting/edit',
+    component: 'ops/pages/alert/setting/edit/index',
     menu_icon: 'appstore',
     type: 1,
     sort_key: 31,
@@ -1084,6 +1085,85 @@ export const localMenuFlatItems: MenuItem[] = [
     sort_key: 56,
     created_at: '2025-12-26T13:23:52.518159+08:00',
   },
+  {
+    id: 5000,
+    identity: '01a11f42-5000-7000-8000-000000000001',
+    title: '用户与权限',
+    title_en: 'Users and Permissions',
+    code: 'userPermissionManage',
+    description: '用户、组织机构、岗位、角色、通知组和告警责任人',
+    app_id: 2,
+    menu_path: '/user-permission/',
+    menu_icon: 'UserGroup',
+    type: 1,
+    sort_key: 57,
+  },
+  {
+    id: 80,
+    identity: '019b5e12-8192-7d79-9dfc-b193e1ef53a0',
+    title: '用户管理',
+    title_en: 'User Management',
+    code: 'accountManage',
+    description: '用户归属一个部门和岗位标签，通过角色获得权限',
+    app_id: 2,
+    parent_id: 5000,
+    menu_path: '/user-permission/users',
+    component: 'ops/pages/user-permission/index',
+    type: 1,
+    sort_key: 58,
+  },
+  {
+    id: 5001,
+    identity: '01a11f42-5001-7000-8000-000000000001',
+    title: '组织机构',
+    title_en: 'Organization',
+    code: 'organizationManage',
+    app_id: 2,
+    parent_id: 5000,
+    menu_path: '/user-permission/organization',
+    component: 'ops/pages/user-permission/index',
+    type: 1,
+    sort_key: 59,
+  },
+  {
+    id: 5002,
+    identity: '01a11f42-5002-7000-8000-000000000001',
+    title: '角色权限',
+    title_en: 'Roles and Permissions',
+    code: 'roleManage',
+    app_id: 2,
+    parent_id: 5000,
+    menu_path: '/user-permission/roles',
+    component: 'ops/pages/user-permission/index',
+    type: 1,
+    sort_key: 60,
+  },
+  {
+    id: 5003,
+    identity: '01a11f42-5003-7000-8000-000000000001',
+    title: '通知组',
+    title_en: 'Notification Groups',
+    code: 'notificationGroupManage',
+    app_id: 2,
+    parent_id: 5000,
+    menu_path: '/user-permission/notification-groups',
+    component: 'ops/pages/user-permission/index',
+    type: 1,
+    sort_key: 61,
+  },
+  {
+    id: 5004,
+    identity: '01a11f42-5004-7000-8000-000000000001',
+    title: '告警责任人',
+    title_en: 'Alert Responsibility',
+    code: 'alertResponsibilityManage',
+    app_id: 2,
+    parent_id: 5000,
+    menu_path: '/user-permission/responsibility',
+    component: 'ops/pages/user-permission/index',
+    type: 1,
+    sort_key: 62,
+  },
   {
     id: 78,
     identity: '019b5dc5-d82f-7290-b805-f549db554120',
@@ -1127,20 +1207,6 @@ export const localMenuFlatItems: MenuItem[] = [
     sort_key: 59,
     created_at: '2025-12-27T12:31:02.556301+08:00',
   },
-  {
-    id: 80,
-    identity: '019b5e12-8192-7d79-9dfc-b193e1ef53a0',
-    title: '用户管理',
-    title_en: 'Account Management',
-    code: 'SystemSettingsAccountManagement',
-    description: '用户管理',
-    app_id: 2,
-    parent_id: 78,
-    menu_path: '/system-settings/account-management',
-    type: 1,
-    sort_key: 60,
-    created_at: '2025-12-27T12:30:29.779261+08:00',
-  },
   {
     id: 79,
     identity: '019b5e12-0315-7d3a-b85c-1a0a557d6853',
diff --git a/src/router/local-menu-items.ts b/src/router/local-menu-items.ts
index 7a313d0..c8229eb 100644
--- a/src/router/local-menu-items.ts
+++ b/src/router/local-menu-items.ts
@@ -50,10 +50,10 @@ export const localMenuItems: MenuItem[] = [
       {
         id: 12070,
         identity: '019ca000-0001-7000-8000-000000000070',
-        title: 'OPS 大屏管理',
-        title_en: 'OPS Big Screens',
-        code: 'ops:可视化大屏管理:ops大屏管理',
-        description: '大屏分组、权限、轮播、发布和快照管理',
+        title: '数据大屏管理',
+        title_en: 'Data Screen Management',
+        code: 'opsBigScreenManage',
+        description: '固定数据大屏、公开访问和轮播管理',
         app_id: 2,
         parent_id: 13,
         menu_path: '/ops/big-screen',
@@ -67,10 +67,10 @@ export const localMenuItems: MenuItem[] = [
       {
         id: 14,
         identity: '019b591d-00dc-7486-aa93-51e798d3253a',
-        title: '大屏管理',
-        title_en: 'My Components',
+        title: '自定义大屏设计',
+        title_en: 'Custom Screen Design',
         code: 'ops:可视化大屏管理:我的组件',
-        description: '可视化大屏管理 - 我的组件',
+        description: '设计自定义数据大屏',
         app_id: 2,
         parent_id: 13,
         menu_path: '/visual/component',
@@ -85,8 +85,8 @@ export const localMenuItems: MenuItem[] = [
       {
         id: 85,
         identity: '019bf309-a961-7bba-a03d-83eb78a82437',
-        title: '已发布大屏列表',
-        title_en: 'View Publish',
+        title: '自定义大屏发布',
+        title_en: 'Custom Screen Publishing',
         code: '已发布大屏列表',
         app_id: 2,
         parent_id: 13,
@@ -345,10 +345,10 @@ export const localMenuItems: MenuItem[] = [
       {
         id: 30,
         identity: '019b591d-01d4-78b0-89ea-a6ba12914379',
-        title: '虚拟化监控',
-        title_en: 'Virtualization Monitoring',
+        title: '虚拟机监控',
+        title_en: 'Virtual Machine Monitoring',
         code: 'ops:综合监控:虚拟化监控',
-        description: '综合监控 - 虚拟化监控',
+        description: '综合监控 - 虚拟机监控',
         app_id: 2,
         parent_id: 23,
         menu_path: '/monitor/virtualization',
@@ -381,7 +381,7 @@ export const localMenuItems: MenuItem[] = [
         title: '服务器硬件监控',
         title_en: 'Server Hardware (OOB)',
         code: 'ops:综合监控:服务器硬件监控',
-        description: '综合监控 - 服务器带外硬件（BMC/IPMI/Redfish 等，DC-Hardware）',
+        description: '综合监控 - 服务器带外硬件（BMC/IPMI/Redfish）',
         app_id: 2,
         parent_id: 23,
         menu_path: '/monitor/host-hardware',
@@ -778,33 +778,17 @@ export const localMenuItems: MenuItem[] = [
         created_at: '2025-12-26T13:23:52.110362+08:00',
         children: [],
       },
-      {
-        id: 40,
-        identity: '019b591d-026f-785d-b473-ac804133e251',
-        title: '告警模版',
-        title_en: 'Alert Template',
-        code: 'ops:告警管理:告警模版',
-        description: '告警管理 - 告警模版',
-        app_id: 2,
-        parent_id: 39,
-        menu_path: '/alert/template',
-        menu_icon: 'appstore',
-        type: 1,
-        sort_key: 7,
-        created_at: '2025-12-26T13:23:52.047548+08:00',
-        children: [],
-      },
       {
         id: 4001,
         identity: '019b591d-026f-785d-b473-ac804133e252',
-        title: '告警模版编辑',
-        title_en: 'Alert Template Edit',
-        code: 'ops:告警管理:告警模版编辑',
-        description: '告警管理 - 告警模版编辑',
+        title: '告警策略编辑',
+        title_en: 'Alert Policy Edit',
+        code: 'ops:告警管理:告警策略编辑',
+        description: '告警管理 - 告警策略编辑',
         app_id: 2,
         parent_id: 39,
-        menu_path: '/alert/template/edit',
-        component: 'ops/pages/alert/template/edit/index',
+        menu_path: '/alert/setting/edit',
+        component: 'ops/pages/alert/setting/edit/index',
         menu_icon: 'appstore',
         type: 1,
         sort_key: 7,
@@ -1252,6 +1236,93 @@ export const localMenuItems: MenuItem[] = [
       },
     ],
   },
+  {
+    id: 5000,
+    identity: '01a11f42-5000-7000-8000-000000000001',
+    title: '用户与权限',
+    title_en: 'Users and Permissions',
+    code: 'userPermissionManage',
+    description: '用户、组织机构、岗位、角色、通知组和告警责任人',
+    app_id: 2,
+    menu_path: '/user-permission/',
+    menu_icon: 'UserGroup',
+    type: 1,
+    sort_key: 12,
+    created_at: '2026-09-10T00:00:00+08:00',
+    children: [
+      {
+        id: 80,
+        identity: '019b5e12-8192-7d79-9dfc-b193e1ef53a0',
+        title: '用户管理',
+        title_en: 'User Management',
+        code: 'accountManage',
+        description: '用户归属一个部门和岗位标签，通过角色获得权限',
+        app_id: 2,
+        parent_id: 5000,
+        menu_path: '/user-permission/users',
+        component: 'ops/pages/user-permission/index',
+        type: 1,
+        sort_key: 1,
+        children: [],
+      },
+      {
+        id: 5001,
+        identity: '01a11f42-5001-7000-8000-000000000001',
+        title: '组织机构',
+        title_en: 'Organization',
+        code: 'organizationManage',
+        app_id: 2,
+        parent_id: 5000,
+        menu_path: '/user-permission/organization',
+        component: 'ops/pages/user-permission/index',
+        type: 1,
+        sort_key: 2,
+        children: [],
+      },
+      {
+        id: 5002,
+        identity: '01a11f42-5002-7000-8000-000000000001',
+        title: '角色权限',
+        title_en: 'Roles and Permissions',
+        code: 'roleManage',
+        app_id: 2,
+        parent_id: 5000,
+        menu_path: '/user-permission/roles',
+        component: 'ops/pages/user-permission/index',
+        type: 1,
+        sort_key: 3,
+        children: [],
+      },
+      {
+        id: 5003,
+        identity: '01a11f42-5003-7000-8000-000000000001',
+        title: '通知组',
+        title_en: 'Notification Groups',
+        code: 'notificationGroupManage',
+        app_id: 2,
+        parent_id: 5000,
+        menu_path: '/user-permission/notification-groups',
+        component: 'ops/pages/user-permission/index',
+        type: 1,
+        sort_key: 4,
+        children: [],
+      },
+      {
+        id: 5004,
+        identity: '01a11f42-5004-7000-8000-000000000001',
+        title: '告警责任人',
+        title_en: 'Alert Responsibility',
+        code: 'alertResponsibilityManage',
+        app_id: 2,
+        parent_id: 5000,
+        menu_path: '/user-permission/responsibility',
+        component: 'ops/pages/user-permission/index',
+        type: 1,
+        sort_key: 5,
+        children: [],
+      },
+    ],
+  },
   {
     id: 78,
     identity: '019b5dc5-d82f-7290-b805-f549db554120',
@@ -1297,21 +1368,6 @@ export const localMenuItems: MenuItem[] = [
         created_at: '2025-12-27T12:31:02.556301+08:00',
         children: [],
       },
-      {
-        id: 80,
-        identity: '019b5e12-8192-7d79-9dfc-b193e1ef53a0',
-        title: '用户管理',
-        title_en: 'Account Management',
-        code: 'SystemSettingsAccountManagement',
-        description: '用户管理',
-        app_id: 2,
-        parent_id: 78,
-        menu_path: '/system-settings/account-management',
-        type: 1,
-        sort_key: 13,
-        created_at: '2025-12-27T12:30:29.779261+08:00',
-        children: [],
-      },
       {
         id: 79,
         identity: '019b5e12-0315-7d3a-b85c-1a0a557d6853',
diff --git a/src/utils/alertSnapshot.ts b/src/utils/alertSnapshot.ts
new file mode 100644
index 0000000..efc50e1
--- /dev/null
+++ b/src/utils/alertSnapshot.ts
@@ -0,0 +1,40 @@
+export interface AlertPolicySnapshot {
+  code?: string
+  name?: string
+  category?: string
+}
+
+export interface AlertRuleSnapshot {
+  code?: string
+  name?: string
+  rule_type?: string
+  metric_name?: string
+  data_source?: string
+  compare_op?: string
+  threshold?: number
+  duration?: number
+  eval_interval?: number
+}
+
+const parseSnapshot = <T>(value: unknown): T | null => {
+  if (!value) return null
+  if (typeof value === 'object') return value as T
+  if (typeof value !== 'string') return null
+
+  try {
+    const parsed = JSON.parse(value)
+    return parsed && typeof parsed === 'object' ? (parsed as T) : null
+  } catch {
+    return null
+  }
+}
+
+export const parseAlertPolicySnapshot = (value: unknown) => parseSnapshot<AlertPolicySnapshot>(value)
+
+export const parseAlertRuleSnapshot = (value: unknown) => parseSnapshot<AlertRuleSnapshot>(value)
+
+export const formatAlertReference = (name: string | undefined, code: string | undefined, id: unknown) => {
+  if (!name && !code && !id) return '-'
+  const identity = code || (id ? `ID ${id}` : '')
+  return name && identity ? `${name}（${identity}）` : name || identity || '-'
+}
diff --git a/src/utils/collectionTemplate.ts b/src/utils/collectionTemplate.ts
new file mode 100644
index 0000000..9d311b7
--- /dev/null
+++ b/src/utils/collectionTemplate.ts
@@ -0,0 +1,20 @@
+import type { CollectionTemplate } from '@/api/ops/collection'
+
+export function collectionTemplateMatchesModel(template: CollectionTemplate, model?: string) {
+  let patterns: unknown
+  try {
+    patterns = JSON.parse(template.model_matchers || '[]')
+  } catch {
+    return false
+  }
+  if (!Array.isArray(patterns)) return false
+  if (!patterns.length) return true
+
+  const normalizedModel = (model || '').trim().toUpperCase()
+  if (!normalizedModel) return false
+  return patterns.some((item) => {
+    if (typeof item !== 'string') return false
+    const source = item.trim().toUpperCase().replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*').replace(/\?/g, '.')
+    return new RegExp(`^${source}$`).test(normalizedModel)
+  })
+}
diff --git a/src/views/help/index.vue b/src/views/help/index.vue
index 6a387bc..a9a468b 100644
--- a/src/views/help/index.vue
+++ b/src/views/help/index.vue
@@ -4,8 +4,8 @@
     <header class="navbar">
       <div class="navbar-content">
         <div class="logo" @click="goToHome">
-          <img src="@/assets/logo.svg?url" alt="Logo" />
-          <span class="logo-text">智能运维管理系统</span>
+          <img v-if="logoURL" :src="logoURL" alt="Logo" />
+          <span class="logo-text">{{ systemName }}</span>
         </div>
         <nav class="nav-links">
           <a href="#" @click.prevent="goToHome">首页</a>
@@ -21,7 +21,7 @@
       <div class="banner-overlay"></div>
       <div class="banner-content">
         <h1>帮助中心</h1>
-        <p>智能运维管理系统使用指南，助您快速掌握系统功能</p>
+        <p>{{ systemName }}使用指南，助您快速掌握系统功能</p>
         <!-- <div class="search-box">
           <a-input
             v-model="searchQuery"
@@ -166,7 +166,7 @@
     <!-- 页脚 -->
     <footer class="footer">
       <div class="footer-content">
-        <p>&copy; 2026 智能运维管理系统。All rights reserved.</p>
+        <p>&copy; 2026 {{ systemName }}。All rights reserved.</p>
       </div>
     </footer>
 
@@ -199,7 +199,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import {
@@ -218,11 +218,15 @@ import {
   IconPhone,
   IconMail,
 } from '@tabler/icons-vue'
+import { loadSystemBranding, useSystemBranding } from '@/composables/systemBranding'
 
 const router = useRouter()
+const { systemName, logoURL } = useSystemBranding()
 const searchQuery = ref('')
 const activeCategory = ref('all')
 
+onMounted(() => void loadSystemBranding())
+
 // 弹窗状态
 const guideModalVisible = ref(false)
 const currentGuide = ref<any>(null)
@@ -244,7 +248,7 @@ const faqs = ref([
   {
     question: '如何配置监控告警策略？',
     answer:
-      '进入"告警管理" -> "告警策略管理"页面，点击"新建策略"按钮，选择监控对象类型、设置告警条件、通知方式和接收人员，保存后即可生效。系统支持多种告警通知渠道，包括邮件、短信、企业微信等。',
+      '进入"告警管理" -> "告警策略管理"页面，点击"新建策略"按钮，选择监控对象类型，并在同一页面配置告警规则、通知渠道、策略抑制和自动建单。策略启用后，还需要在对应设备页面完成绑定。当前支持站内、邮件和短信通知，不接入微信或钉钉。',
     category: 'alert',
   },
   {
@@ -316,7 +320,7 @@ const faqs = ref([
   {
     question: '如何查看可视化大屏？',
     answer:
-      '进入"可视化大屏管理"模块，可以查看和管理运维大屏。在"大屏管理"中创建和编辑大屏，在"已发布大屏列表"中查看已发布的大屏。大屏可以展示监控概览、告警统计、资源使用等关键指标。',
+      '进入“可视化大屏管理”模块，可以在“数据大屏管理”查看固定数据大屏并配置轮播，在“自定义大屏设计”和“自定义大屏发布”中维护自定义大屏。',
     category: 'quickstart',
   },
   {
@@ -393,8 +397,8 @@ const guides = ref([
         items: ['查看存储容量和使用率', '监控IOPS和吞吐量', '查看磁盘健康状态', '支持主流存储品牌'],
       },
       {
-        title: '虚拟化监控',
-        text: '进入"综合监控" -> "虚拟化监控"，监控VMware、Hyper-V等虚拟化平台。',
+        title: '虚拟机监控',
+        text: '进入“综合监控” -> “虚拟机监控”，查看已纳管虚拟机的运行状态和资源指标。',
         items: ['查看虚拟机运行状态', '监控资源分配和使用', '查看宿主机性能指标'],
       },
       {
@@ -421,15 +425,10 @@ const guides = ref([
         title: '告警级别管理',
         text: '系统预设多个告警级别（紧急、重要、一般、提示），可在"告警级别管理"中自定义级别名称和颜色标识。',
       },
-      {
-        title: '告警模版配置',
-        text: '在"告警模版"中创建告警规则模版，定义监控指标、阈值条件、告警级别等。',
-        items: ['选择监控对象类型', '设置指标和阈值条件', '配置告警级别', '设置静默时间'],
-      },
       {
         title: '告警策略管理',
-        text: '在"告警策略管理"中将模版应用到具体设备或设备组，并配置通知方式。',
-        items: ['选择告警模版', '指定监控对象', '配置通知渠道', '设置通知接收人'],
+        text: '在"告警策略管理"中按设备类型配置完整策略，并在设备录入或编辑时选择适用策略。',
+        items: ['选择设备类型', '设置指标和阈值规则', '配置通知渠道和抑制规则', '在设备页面绑定策略'],
       },
       {
         title: '告警受理处理',
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ffb77ad..a0da244 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -4,8 +4,8 @@
     <header class="navbar">
       <div class="navbar-content">
         <div class="logo">
-          <img src="@/assets/logo.svg?url" alt="Logo" />
-          <span class="logo-text">智能运维管理系统</span>
+          <img v-if="logoURL" :src="logoURL" alt="Logo" />
+          <span class="logo-text">{{ systemName }}</span>
         </div>
         <nav class="nav-links">
           <a href="#home">首页</a>
@@ -20,7 +20,7 @@
       <img src="@/assets/images/home1.jpg" alt="Banner" class="banner-image" />
       <div class="banner-overlay"></div>
       <div class="banner-content">
-        <h1 class="banner-title">智能运维管理系统</h1>
+        <h1 class="banner-title">{{ systemName }}</h1>
         <p class="banner-subtitle">提供全方位的 IT 运维管理解决方案，让系统运行更稳定、更高效</p>
       </div>
     </section>
@@ -100,7 +100,7 @@
         </div>
         <div class="footer-section">
           <h4>版权信息</h4>
-          <p>Copyright &copy; 2026 智能运维管理系统。All rights reserved.</p>
+          <p>Copyright &copy; 2026 {{ systemName }}。All rights reserved.</p>
         </div>
       </div>
     </footer>
@@ -110,8 +110,11 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { IconDashboard, IconExclamationCircle, IconChartLine, IconSettings, IconShield, IconMessageCircle } from '@tabler/icons-vue'
+import { onMounted } from 'vue'
+import { loadSystemBranding, useSystemBranding } from '@/composables/systemBranding'
 
 const router = useRouter()
+const { systemName, logoURL } = useSystemBranding()
 
 const goToLogin = () => {
   router.push('/login')
@@ -123,6 +126,8 @@ const scrollToSection = (id: string) => {
     element.scrollIntoView({ behavior: 'smooth' })
   }
 }
+
+onMounted(() => void loadSystemBranding())
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index ac8e6a6..34c452d 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-form-wrapper">
-    <div class="login-form-title">{{ $t('login.form.title') }}</div>
-    <div class="login-form-sub-title">{{ $t('login.form.title') }}</div>
+    <div class="login-form-title">登录</div>
+    <div class="login-form-sub-title">{{ systemName }}</div>
     <div class="login-form-error-msg">{{ errorMessage }}</div>
     <a-form ref="loginForm" :model="userInfo" class="login-form" layout="vertical" @submit="handleSubmit">
       <a-form-item field="account" :rules="[{ required: true, message: '请输入账号' }]" :validate-trigger="['change', 'blur']" hide-label>
@@ -42,9 +42,11 @@ import { useStorage } from '@vueuse/core'
 import { reactive, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
+import { useSystemBranding } from '@/composables/systemBranding'
 
 const router = useRouter()
 const { t } = useI18n()
+const { systemName } = useSystemBranding()
 const errorMessage = ref('')
 const { loading, setLoading } = useLoading()
 const userStore = useUserStore()
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 17ebe53..8375972 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="login-bg" :style="{ background: backgrounds[backgroundIndex] }">
+  <div class="login-bg" :style="backgroundStyle">
     <div class="container">
       <div class="logo">
-        <img alt="logo" src="@/assets/logo.svg?url" />
-        <div class="logo-text">智能运维管理系统</div>
+        <img v-if="logoURL" alt="logo" :src="logoURL" />
+        <div class="logo-text">{{ systemName }}</div>
       </div>
       <LoginBanner />
       <div class="content">
@@ -23,21 +23,22 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import { getSystemParameter, SystemParameterCode } from '@/composables/systemParameters'
+import { loadSystemBranding, useSystemBranding } from '@/composables/systemBranding'
 import LoginBanner from './components/banner.vue'
 import LoginForm from './components/login-form.vue'
 
 const router = useRouter()
 const showQr = ref(false)
 const backgroundIndex = ref(0)
-const backgrounds = [
-  'linear-gradient(135deg, #dbeafe 0%, #f8fafc 100%)',
-  'linear-gradient(135deg, #e0e7ff 0%, #ecfeff 100%)',
-  'linear-gradient(135deg, #d1fae5 0%, #f8fafc 100%)',
-]
+const { systemName, logoURL, loginBackgroundURLs } = useSystemBranding()
+const backgroundStyle = computed(() => {
+  const url = loginBackgroundURLs.value[backgroundIndex.value]
+  return url ? { backgroundImage: `url("${url}")`, backgroundSize: 'cover', backgroundPosition: 'center' } : { backgroundColor: '#eef2f7' }
+})
 let rotationTimer: ReturnType<typeof setInterval> | null = null
 
 const goToHome = () => {
@@ -46,12 +47,15 @@ const goToHome = () => {
 
 onMounted(async () => {
   try {
-    const seconds = await getSystemParameter(SystemParameterCode.LoginBackgroundRotationSeconds)
-    rotationTimer = window.setInterval(() => {
-      backgroundIndex.value = (backgroundIndex.value + 1) % backgrounds.length
-    }, seconds * 1000)
+    await loadSystemBranding()
+    if (loginBackgroundURLs.value.length > 1) {
+      const seconds = await getSystemParameter(SystemParameterCode.LoginBackgroundRotationSeconds)
+      rotationTimer = window.setInterval(() => {
+        backgroundIndex.value = (backgroundIndex.value + 1) % loginBackgroundURLs.value.length
+      }, seconds * 1000)
+    }
   } catch (error: any) {
-    Message.error(error?.message || '登录页背景轮换参数读取失败')
+    Message.error(error?.message || '系统品牌配置读取失败')
   }
 })
 
diff --git a/src/views/ops/pages/alert/detail/index.vue b/src/views/ops/pages/alert/detail/index.vue
index 5168b73..35ddfb7 100644
--- a/src/views/ops/pages/alert/detail/index.vue
+++ b/src/views/ops/pages/alert/detail/index.vue
@@ -54,7 +54,12 @@
               <a-descriptions-item label="告警指纹">
                 <span class="code-text">{{ record.fingerprint || '-' }}</span>
               </a-descriptions-item>
-              <a-descriptions-item label="策略ID / 规则ID">{{ record.policy_id || '-' }} / {{ record.rule_id || '-' }}</a-descriptions-item>
+              <a-descriptions-item label="告警策略">
+                {{ formatAlertReference(policySnapshot?.name, policySnapshot?.code, record.policy_id) }}
+              </a-descriptions-item>
+              <a-descriptions-item label="告警规则">
+                {{ formatAlertReference(ruleSnapshot?.name, ruleSnapshot?.code, record.rule_id) }}
+              </a-descriptions-item>
             </a-descriptions>
 
             <!-- 告警内容 -->
@@ -77,6 +82,12 @@
             <a-descriptions title="时间信息" :column="2" bordered class="mt-4">
               <a-descriptions-item label="开始时间">{{ formatDateTime(record.starts_at) }}</a-descriptions-item>
               <a-descriptions-item label="结束时间">{{ record.ends_at ? formatDateTime(record.ends_at) : '-' }}</a-descriptions-item>
+              <a-descriptions-item v-if="record.resolution_reason_code" label="关闭原因编码">
+                {{ record.resolution_reason_code }}
+              </a-descriptions-item>
+              <a-descriptions-item v-if="record.resolution_reason" label="关闭原因">
+                {{ record.resolution_reason }}
+              </a-descriptions-item>
               <a-descriptions-item label="持续时长">{{ formatDuration(record.duration) }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ formatDateTime(record.created_at) }}</a-descriptions-item>
               <a-descriptions-item label="更新时间">{{ formatDateTime(record.updated_at) }}</a-descriptions-item>
@@ -221,6 +232,7 @@ import { Message } from '@arco-design/web-vue'
 import { IconLeft, IconCheck, IconCheckCircle, IconMute, IconDown, IconUp } from '@arco-design/web-vue/es/icon'
 import { fetchAlertRecordDetail, fetchAlertProcessList } from '@/api/ops/alertRecord'
 import { fetchAlertEvents } from '@/api/ops/alertEvent'
+import { formatAlertReference, parseAlertPolicySnapshot, parseAlertRuleSnapshot } from '@/utils/alertSnapshot'
 import AckDialog from '../tackle/components/AckDialog.vue'
 import ResolveDialog from '../tackle/components/ResolveDialog.vue'
 import SilenceDialog from '../tackle/components/SilenceDialog.vue'
@@ -235,6 +247,8 @@ const record = ref<any>(null)
 const processRecords = ref<any[]>([])
 const eventRecords = ref<any[]>([])
 const showRawData = ref(false)
+const policySnapshot = computed(() => parseAlertPolicySnapshot(record.value?.policy_snapshot))
+const ruleSnapshot = computed(() => parseAlertRuleSnapshot(record.value?.rule_snapshot))
 
 // 对话框状态
 const ackDialogVisible = ref(false)
diff --git a/src/views/ops/pages/alert/history/components/HistoryDetailDialog.vue b/src/views/ops/pages/alert/history/components/HistoryDetailDialog.vue
index ddb559f..2403e37 100644
--- a/src/views/ops/pages/alert/history/components/HistoryDetailDialog.vue
+++ b/src/views/ops/pages/alert/history/components/HistoryDetailDialog.vue
@@ -47,6 +47,12 @@
         <a-descriptions-item label="结束时间">
           {{ formatDate(recordDetail.ends_at) || '-' }}
         </a-descriptions-item>
+        <a-descriptions-item v-if="recordDetail.resolution_reason_code" label="关闭原因编码">
+          {{ recordDetail.resolution_reason_code }}
+        </a-descriptions-item>
+        <a-descriptions-item v-if="recordDetail.resolution_reason" label="关闭原因">
+          {{ recordDetail.resolution_reason }}
+        </a-descriptions-item>
         <a-descriptions-item label="持续时长" :span="2">
           {{ formatDuration(recordDetail.duration) }}
         </a-descriptions-item>
@@ -76,11 +82,11 @@
         </a-descriptions-item>
 
         <!-- 关联信息 -->
-        <a-descriptions-item label="策略ID">
-          {{ recordDetail.policy_id || '-' }}
+        <a-descriptions-item label="告警策略">
+          {{ formatAlertReference(policySnapshot?.name, policySnapshot?.code, recordDetail.policy_id) }}
         </a-descriptions-item>
-        <a-descriptions-item label="规则ID">
-          {{ recordDetail.rule_id || '-' }}
+        <a-descriptions-item label="告警规则">
+          {{ formatAlertReference(ruleSnapshot?.name, ruleSnapshot?.code, recordDetail.rule_id) }}
         </a-descriptions-item>
 
         <!-- 创建与更新时间 -->
@@ -96,9 +102,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { fetchHistoryDetail } from '@/api/ops/alertHistory'
+import { formatAlertReference, parseAlertPolicySnapshot, parseAlertRuleSnapshot } from '@/utils/alertSnapshot'
 
 interface Props {
   visible: boolean
@@ -114,6 +121,8 @@ const emit = defineEmits<Emits>()
 
 const loading = ref(false)
 const recordDetail = ref<any>(null)
+const policySnapshot = computed(() => parseAlertPolicySnapshot(recordDetail.value?.policy_snapshot))
+const ruleSnapshot = computed(() => parseAlertRuleSnapshot(recordDetail.value?.rule_snapshot))
 
 // 格式化日期
 const formatDate = (dateStr: string) => {
diff --git a/src/views/ops/pages/alert/incidents/index.vue b/src/views/ops/pages/alert/incidents/index.vue
index 666b628..e4c6a3c 100644
--- a/src/views/ops/pages/alert/incidents/index.vue
+++ b/src/views/ops/pages/alert/incidents/index.vue
@@ -46,55 +46,56 @@
       </a-form>
 
       <PageState :status="pageStatus" :error-text="errorMessage" @retry="fetchData">
-      <a-table
-        v-if="pageStatus !== 'empty' && pageStatus !== 'error' && pageStatus !== 'unauthorized'"
-        row-key="id"
-        :loading="loading"
-        :data="rows"
-        :columns="columns"
-        :pagination="pagination"
-        :scroll="{ x: 'max-content' }"
-        @page-change="handlePageChange"
-        @page-size-change="handlePageSizeChange"
-      >
-        <template #incident_no="{ record }">
-          <a-typography-text copyable>{{ record.incident_no }}</a-typography-text>
-        </template>
-        <template #status="{ record }">
-          <a-tag :color="statusColor(record.status)">{{ statusText(record.status) }}</a-tag>
-        </template>
-        <template #severity="{ record }">
-          <a-tag :color="severityColor(record.severity)">{{ severityText(record.severity) }}</a-tag>
-        </template>
-        <template #resource_uid="{ record }">
-          <a-typography-text v-if="record.resource_uid" copyable>{{ record.resource_uid }}</a-typography-text>
-          <span v-else>-</span>
-        </template>
-        <template #suppressed="{ record }">
-          <a-tag v-if="record.suppressed" color="orange">已抑制</a-tag>
-          <span v-else>-</span>
-        </template>
-        <template #opened_at="{ record }">{{ formatTime(record.opened_at) }}</template>
-        <template #actions="{ record }">
-          <a-space>
-            <a-button type="text" size="small" :disabled="pageUnauthorized" @click="showDetail(record)">详情</a-button>
-            <a-dropdown trigger="click">
-              <a-button type="text" size="small" :disabled="!canOperate">流转</a-button>
-              <template #content>
-                <a-doption v-for="item in nextStatuses(record.status)" :key="item.value" @click="handleTransition(record, item.value)">
-                  {{ item.label }}
-                </a-doption>
-              </template>
-            </a-dropdown>
-          </a-space>
-        </template>
-      </a-table>
+        <a-table
+          v-if="pageStatus !== 'empty' && pageStatus !== 'error' && pageStatus !== 'unauthorized'"
+          row-key="id"
+          :loading="loading"
+          :data="rows"
+          :columns="columns"
+          :pagination="pagination"
+          :scroll="{ x: 'max-content' }"
+          @page-change="handlePageChange"
+          @page-size-change="handlePageSizeChange"
+        >
+          <template #incident_no="{ record }">
+            <a-typography-text copyable>{{ record.incident_no }}</a-typography-text>
+          </template>
+          <template #status="{ record }">
+            <a-tag :color="statusColor(record.status)">{{ statusText(record.status) }}</a-tag>
+          </template>
+          <template #severity="{ record }">
+            <a-tag :color="severityColor(record.severity)">{{ severityText(record.severity) }}</a-tag>
+          </template>
+          <template #resource_uid="{ record }">
+            <a-typography-text v-if="record.resource_uid" copyable>{{ record.resource_uid }}</a-typography-text>
+            <span v-else>-</span>
+          </template>
+          <template #suppressed="{ record }">
+            <a-tag v-if="record.suppressed" color="orange">已抑制</a-tag>
+            <span v-else>-</span>
+          </template>
+          <template #opened_at="{ record }">{{ formatTime(record.opened_at) }}</template>
+          <template #actions="{ record }">
+            <a-space>
+              <a-button type="text" size="small" :disabled="pageUnauthorized" @click="showDetail(record)">详情</a-button>
+              <a-dropdown trigger="click">
+                <a-button type="text" size="small" :disabled="!canOperate || record.is_external_business">流转</a-button>
+                <template #content>
+                  <a-doption v-for="item in nextStatuses(record.status)" :key="item.value" @click="handleTransition(record, item.value)">
+                    {{ item.label }}
+                  </a-doption>
+                </template>
+              </a-dropdown>
+            </a-space>
+          </template>
+        </a-table>
       </PageState>
     </a-card>
 
     <a-drawer v-model:visible="detailVisible" width="860px" title="Incident 详情" unmount-on-close>
       <a-descriptions v-if="current" :column="2" bordered size="medium">
         <a-descriptions-item label="事件编号">{{ current.incident_no }}</a-descriptions-item>
+        <a-descriptions-item label="来源">{{ current.is_external_business ? '外部业务系统告警' : '系统告警' }}</a-descriptions-item>
         <a-descriptions-item label="状态">{{ statusText(current.status) }}</a-descriptions-item>
         <a-descriptions-item label="级别">{{ severityText(current.severity) }}</a-descriptions-item>
         <a-descriptions-item label="告警数">{{ current.alert_count }}</a-descriptions-item>
@@ -169,16 +170,11 @@
 
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import { IconRefresh, IconSearch } from '@arco-design/web-vue/es/icon'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
-import {
-  fetchIncidentAlerts,
-  fetchIncidents,
-  fetchIncidentTimeline,
-  transitionIncident,
-  type Incident,
-} from '@/api/ops/incident'
+import { fetchIncidentAlerts, fetchIncidents, fetchIncidentTimeline, transitionIncident, type Incident } from '@/api/ops/incident'
 import {
   createPostmortemDraft,
   fetchIncidentKnowledge,
@@ -189,6 +185,7 @@ import {
 } from '@/api/kb/knowledge'
 
 const loading = ref(false)
+const route = useRoute()
 const rows = ref<Incident[]>([])
 const current = ref<Incident | null>(null)
 const detailVisible = ref(false)
@@ -203,7 +200,7 @@ const filters = reactive({
   keyword: '',
   status: undefined as string | undefined,
   severity: undefined as string | undefined,
-  resource_uid: '',
+  resource_uid: String(route.query.resource_uid || ''),
 })
 
 const pagination = reactive({
diff --git a/src/views/ops/pages/alert/notice/components/ChannelFormDialog.vue b/src/views/ops/pages/alert/notice/components/ChannelFormDialog.vue
index 0ec4f9d..a9e1729 100644
--- a/src/views/ops/pages/alert/notice/components/ChannelFormDialog.vue
+++ b/src/views/ops/pages/alert/notice/components/ChannelFormDialog.vue
@@ -9,14 +9,29 @@
     :confirm-loading="submitting"
   >
     <a-form :model="form" layout="vertical" ref="formRef">
-      <a-form-item label="渠道名称" field="name" :rules="[{ required: true, message: '请输入渠道名称' }]">
-        <a-input v-model="form.name" placeholder="请输入渠道名称" :max-length="100" />
-      </a-form-item>
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="渠道名称" field="name" :rules="[{ required: true, message: '请输入渠道名称' }]">
+            <a-input v-model="form.name" placeholder="请输入渠道名称" :max-length="100" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item
+            label="渠道编码"
+            field="code"
+            :rules="[
+              { required: true, message: '请输入渠道编码' },
+              { match: /^[A-Za-z][A-Za-z0-9_-]{2,99}$/, message: '编码需以字母开头，长度 3 至 100 位' },
+            ]"
+          >
+            <a-input v-model="form.code" placeholder="如：HOSPITAL_ALERT_EMAIL" :max-length="100" :disabled="isEdit" />
+          </a-form-item>
+        </a-col>
+      </a-row>
 
       <a-form-item label="渠道类型" field="type" :rules="[{ required: true, message: '请选择渠道类型' }]">
         <a-select v-model="form.type" placeholder="请选择渠道类型">
           <a-option value="email">邮件</a-option>
-          <a-option value="sms">短信</a-option>
           <a-option value="in_app">站内消息</a-option>
         </a-select>
       </a-form-item>
@@ -67,39 +82,6 @@
         </a-form-item>
       </template>
 
-      <template v-if="form.type === 'sms'">
-        <a-row :gutter="16">
-          <a-col :span="12">
-            <a-form-item label="短信服务商" field="sms_provider">
-              <a-input v-model="form.sms_provider" placeholder="请输入服务商标识" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="AccessKey ID" field="sms_access_key_id">
-              <a-input v-model="form.sms_access_key_id" placeholder="请输入 AccessKey ID" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-form-item label="AccessKey Secret" field="sms_access_key_secret">
-          <a-input-password v-model="form.sms_access_key_secret" placeholder="请输入 AccessKey Secret" />
-        </a-form-item>
-        <a-row :gutter="16">
-          <a-col :span="12">
-            <a-form-item label="短信签名" field="sms_sign_name">
-              <a-input v-model="form.sms_sign_name" placeholder="请输入短信签名" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="模板编码" field="sms_template_code">
-              <a-input v-model="form.sms_template_code" placeholder="请输入模板编码" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-form-item label="手机号" field="sms_phones">
-          <a-input-tag v-model="form.sms_phones" placeholder="输入手机号后回车，至少 1 个" allow-clear />
-        </a-form-item>
-      </template>
-
       <template v-if="form.type === 'in_app'">
         <a-form-item label="站内消息目标" field="in_app_targets">
           <a-select
@@ -231,6 +213,7 @@ import type { UserItem } from '@/api/ops/rbac2'
 
 interface NoticeChannel {
   id?: number
+  code?: string
   name?: string
   type?: string
   config?: string
@@ -253,12 +236,6 @@ interface NoticeChannel {
   email_cc?: string[] | string
   email_bcc?: string[] | string
   email_security_mode?: 'none' | 'starttls' | 'tls'
-  sms_provider?: string
-  sms_access_key_id?: string
-  sms_access_key_secret?: string
-  sms_sign_name?: string
-  sms_template_code?: string
-  sms_phones?: string[] | string
   in_app_targets?: string[] | string
   in_app_aggregation_window?: number
 }
@@ -287,6 +264,7 @@ const quietHoursEnd = ref('08:00')
 
 // 表单数据
 const form = ref({
+  code: '',
   name: '',
   type: 'email',
   config: '{}',
@@ -309,12 +287,6 @@ const form = ref({
   email_cc: [] as string[],
   email_bcc: [] as string[],
   email_security_mode: 'starttls' as 'none' | 'starttls' | 'tls',
-  sms_provider: '',
-  sms_access_key_id: '',
-  sms_access_key_secret: '',
-  sms_sign_name: '',
-  sms_template_code: '',
-  sms_phones: [] as string[],
   in_app_targets: [] as string[],
   in_app_aggregation_window: 60,
 })
@@ -459,6 +431,7 @@ watch(
       if (props.channel && isEdit.value) {
         // 编辑模式：填充表单
         form.value = {
+          code: props.channel.code || '',
           name: props.channel.name || '',
           type: props.channel.type || 'email',
           config: props.channel.config || '{}',
@@ -481,12 +454,6 @@ watch(
           email_cc: parseStringArray(props.channel.email_cc),
           email_bcc: parseStringArray(props.channel.email_bcc),
           email_security_mode: props.channel.email_security_mode || 'starttls',
-          sms_provider: props.channel.sms_provider || '',
-          sms_access_key_id: props.channel.sms_access_key_id || '',
-          sms_access_key_secret: props.channel.sms_access_key_secret || '',
-          sms_sign_name: props.channel.sms_sign_name || '',
-          sms_template_code: props.channel.sms_template_code || '',
-          sms_phones: parseStringArray(props.channel.sms_phones),
           in_app_targets: parseStringArray(props.channel.in_app_targets),
           in_app_aggregation_window: props.channel.in_app_aggregation_window ?? 60,
         }
@@ -507,6 +474,7 @@ watch(
       } else {
         // 新建模式：重置表单
         form.value = {
+          code: '',
           name: '',
           type: 'email',
           config: '{}',
@@ -529,12 +497,6 @@ watch(
           email_cc: [],
           email_bcc: [],
           email_security_mode: 'starttls',
-          sms_provider: '',
-          sms_access_key_id: '',
-          sms_access_key_secret: '',
-          sms_sign_name: '',
-          sms_template_code: '',
-          sms_phones: [],
           in_app_targets: [],
           in_app_aggregation_window: 60,
         }
@@ -561,6 +523,7 @@ const handleOk = async () => {
     const quietHoursPayload = form.value.quiet_hours && form.value.quiet_hours.trim() ? form.value.quiet_hours : '{}'
 
     const data: any = {
+      code: form.value.code,
       name: form.value.name,
       type: form.value.type,
       config: form.value.config,
@@ -636,18 +599,6 @@ const validateChannelConfig = () => {
     }
     if (!form.value.email_password) return '请输入 SMTP 密码/授权码'
   }
-  if (form.value.type === 'sms') {
-    if (
-      !form.value.sms_provider ||
-      !form.value.sms_access_key_id ||
-      !form.value.sms_sign_name ||
-      !form.value.sms_template_code ||
-      !form.value.sms_phones.length
-    ) {
-      return '请补齐短信渠道必填字段'
-    }
-    if (!form.value.sms_access_key_secret) return '请输入 AccessKey Secret'
-  }
   if (form.value.type === 'in_app') {
     if (form.value.in_app_aggregation_window < 10 || form.value.in_app_aggregation_window > 3600) {
       return '同告警聚合窗口须在 10～3600 秒之间'
@@ -670,16 +621,6 @@ const appendChannelPayload = (data: any) => {
     data.email_bcc = form.value.email_bcc
     data.email_security_mode = form.value.email_security_mode
   }
-  if (form.value.type === 'sms') {
-    data.sms_provider = form.value.sms_provider
-    data.sms_access_key_id = form.value.sms_access_key_id
-    if (!isMaskedSecret(form.value.sms_access_key_secret)) {
-      data.sms_access_key_secret = form.value.sms_access_key_secret
-    }
-    data.sms_sign_name = form.value.sms_sign_name
-    data.sms_template_code = form.value.sms_template_code
-    data.sms_phones = form.value.sms_phones
-  }
   if (form.value.type === 'in_app') {
     data.in_app_targets = form.value.in_app_targets
     data.in_app_aggregation_window = form.value.in_app_aggregation_window
diff --git a/src/views/ops/pages/alert/notice/components/RoutingConfigPanel.vue b/src/views/ops/pages/alert/notice/components/RoutingConfigPanel.vue
index 672931c..5cd4e45 100644
--- a/src/views/ops/pages/alert/notice/components/RoutingConfigPanel.vue
+++ b/src/views/ops/pages/alert/notice/components/RoutingConfigPanel.vue
@@ -11,6 +11,7 @@
         </template>
         <template #members="{ record }">{{ idArray(record.member_user_ids).length }} 人</template>
         <template #scope="{ record }">{{ scopeText(record) }}</template>
+        <template #owner="{ record }">{{ responsibilityOwnerText(record) }}</template>
         <template #actions="{ record }">
           <a-space>
             <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
@@ -53,7 +54,7 @@
         <a-row :gutter="16">
           <a-col v-if="activeKey === 'responsibility'" :span="12"><a-form-item label="规则编码" required><a-input v-model="form.code" /></a-form-item></a-col>
           <a-col :span="activeKey === 'responsibility' ? 12 : 16"><a-form-item label="名称" required><a-input v-model="form.name" /></a-form-item></a-col>
-          <a-col :span="activeKey === 'responsibility' ? 12 : 8"><a-form-item label="优先级" required><a-input-number v-model="form.priority" :min="1" style="width: 100%" /></a-form-item></a-col>
+          <a-col :span="activeKey === 'responsibility' ? 12 : 8"><a-form-item label="优先级（数值越小越高）" required><a-input-number v-model="form.priority" :min="1" style="width: 100%" /></a-form-item></a-col>
         </a-row>
         <a-divider orientation="left">匹配范围（留空表示不限）</a-divider>
         <a-row :gutter="16">
@@ -74,7 +75,21 @@
         </a-form-item>
 
         <template v-if="activeKey === 'responsibility'">
-          <a-form-item label="负责人" required><a-select v-model="form.owner_user_id" allow-search :options="userOptions" /></a-form-item>
+          <a-form-item label="负责人类型" required>
+            <a-radio-group v-model="form.owner_type" type="button">
+              <a-radio value="internal">系统用户</a-radio>
+              <a-radio value="external">外部联系人</a-radio>
+            </a-radio-group>
+          </a-form-item>
+          <a-form-item v-if="form.owner_type === 'internal'" label="系统用户" required>
+            <a-select v-model="form.owner_user_id" allow-search :options="userOptions" />
+          </a-form-item>
+          <a-form-item v-else label="外部联系人" required>
+            <a-space fill>
+              <a-select v-model="form.external_contact_id" allow-search :options="externalContactOptions" style="flex: 1" />
+              <a-button @click="contactModalVisible = true">新建联系人</a-button>
+            </a-space>
+          </a-form-item>
           <a-form-item label="订阅通知组"><a-select v-model="form.subscriber_group_ids" multiple allow-clear :options="groupOptions" /></a-form-item>
           <a-form-item label="抄送人员"><a-select v-model="form.cc_user_ids" multiple allow-clear :options="userOptions" /></a-form-item>
         </template>
@@ -90,6 +105,16 @@
       <a-form-item label="说明"><a-textarea v-model="form.description" :auto-size="{ minRows: 2, maxRows: 4 }" /></a-form-item>
     </a-form>
   </a-modal>
+
+  <a-modal v-model:visible="contactModalVisible" title="新建外部联系人" width="560px" :confirm-loading="contactSaving" @ok="createContact">
+    <a-form :model="contactForm" layout="vertical">
+      <a-form-item label="姓名" required><a-input v-model="contactForm.name" :max-length="100" /></a-form-item>
+      <a-form-item label="手机号"><a-input v-model="contactForm.phone" /></a-form-item>
+      <a-form-item label="邮箱"><a-input v-model="contactForm.email" /></a-form-item>
+      <a-form-item label="备注"><a-textarea v-model="contactForm.remarks" :rows="2" /></a-form-item>
+      <a-alert type="info">手机号和邮箱至少填写一项；填写两项时，已配置的短信和邮件渠道都会发送。</a-alert>
+    </a-form>
+  </a-modal>
 </template>
 
 <script setup lang="ts">
@@ -118,6 +143,7 @@ import { fetchNoticeChannelList } from '@/api/ops/noticeChannel'
 import { fetchAlertLevelOptions } from '@/api/ops/alertLevel'
 import { fetchBusinessSystems } from '@/api/ops/businessSystem'
 import { fetchUserList, type UserItem } from '@/api/ops/rbac2'
+import { createExternalContact, fetchExternalContactOptions, type ExternalContact } from '@/api/ops/externalContact'
 
 type ConfigKey = 'message' | 'group' | 'subscription' | 'responsibility'
 
@@ -137,13 +163,17 @@ const modalVisible = ref(false)
 const saving = ref(false)
 const editingID = ref<number>()
 const users = ref<UserItem[]>([])
+const externalContacts = ref<ExternalContact[]>([])
 const businessSystems = ref<Array<{ label: string; value: number }>>([])
 const groupOptions = ref<Array<{ label: string; value: number }>>([])
 const channelOptions = ref<Array<{ label: string; value: number }>>([])
 const severityOptions = ref<Array<{ label: string; value: string }>>([])
+const contactModalVisible = ref(false)
+const contactSaving = ref(false)
+const contactForm = ref({ name: '', phone: '', email: '', remarks: '' })
 
 const resourceCategories = [
-  { label: '服务器/主机', value: 'host' }, { label: '网络设备', value: 'network' },
+  { label: '服务器/主机', value: 'host' }, { label: '办公PC', value: 'pc' }, { label: '网络设备', value: 'network' },
   { label: '安全设备', value: 'security' }, { label: '存储设备', value: 'storage' },
   { label: '数据库', value: 'database' }, { label: '中间件', value: 'middleware' },
   { label: '业务系统', value: 'business' }, { label: '机房设备', value: 'room_device' },
@@ -152,6 +182,7 @@ const deviceLevels = [
   { label: '核心', value: 'core' }, { label: '重要', value: 'important' }, { label: '普通', value: 'normal' },
 ]
 const userOptions = computed(() => users.value.map((user) => ({ label: user.name || user.username || `用户 ${user.id}`, value: Number(user.id) })))
+const externalContactOptions = computed(() => externalContacts.value.map((contact) => ({ label: `${contact.name}（${contact.phone || contact.email}）`, value: contact.id })))
 const templateVariableText = '{{.AlertName}}、{{.Severity}}、{{.Summary}}、{{.ResourceUID}}、{{.IP}}、{{.StartsAt}}、{{.ResolvedAt}}、{{.Duration}} 等变量'
 
 const baseForm = () => ({
@@ -159,7 +190,8 @@ const baseForm = () => ({
   subject_template: '', body_template: '', recovery_subject_template: '', recovery_body_template: '',
   member_user_ids: [] as number[], resource_category: '', business_system_id: undefined as number | undefined,
   ip_cidr: '', device_level: '', label_matchers: {} as Record<string, string>, label_matcher_rows: [] as Array<{ key: string; value: string }>,
-  owner_user_id: undefined as number | undefined,
+  owner_type: 'internal' as 'internal' | 'external', owner_user_id: undefined as number | undefined,
+  external_contact_id: undefined as number | undefined,
   subscriber_group_ids: [] as number[], cc_user_ids: [] as number[], severity_filter: [] as string[],
   channel_ids: [] as number[], notification_group_ids: [] as number[],
 })
@@ -172,6 +204,7 @@ const columns = computed<TableColumnData[]>(() => {
   if (activeKey.value === 'subscription' || activeKey.value === 'responsibility') {
     result.push({ title: '优先级', dataIndex: 'priority', width: 90 }, { title: '匹配范围', slotName: 'scope', width: 300 })
   }
+  if (activeKey.value === 'responsibility') result.push({ title: '负责人', slotName: 'owner', width: 180 })
   result.push({ title: '状态', slotName: 'enabled', width: 90 }, { title: '操作', slotName: 'actions', width: 150, fixed: 'right' })
   return result
 })
@@ -215,6 +248,13 @@ const scopeText = (record: any) => {
   return parts.join(' / ') || '全部监控对象'
 }
 
+const responsibilityOwnerText = (record: any) => {
+  if (record.owner_type === 'external') {
+    return externalContacts.value.find((item) => item.id === Number(record.external_contact_id))?.name || `外部联系人 ${record.external_contact_id}`
+  }
+  return users.value.find((item) => Number(item.id) === Number(record.owner_user_id))?.name || `系统用户 ${record.owner_user_id}`
+}
+
 const openCreate = () => {
   editingID.value = undefined
   form.value = baseForm()
@@ -241,7 +281,8 @@ const saveRow = async () => {
   if (activeKey.value !== 'subscription' && !form.value.code.trim()) return Message.warning('请输入编码')
   if (activeKey.value === 'message' && (!form.value.subject_template || !form.value.body_template || !form.value.recovery_subject_template || !form.value.recovery_body_template)) return Message.warning('请补齐触发和恢复消息内容')
   if (activeKey.value === 'group' && !form.value.member_user_ids.length) return Message.warning('请选择通知组成员')
-  if (activeKey.value === 'responsibility' && !form.value.owner_user_id) return Message.warning('请选择负责人')
+  if (activeKey.value === 'responsibility' && form.value.owner_type === 'internal' && !form.value.owner_user_id) return Message.warning('请选择系统用户')
+  if (activeKey.value === 'responsibility' && form.value.owner_type === 'external' && !form.value.external_contact_id) return Message.warning('请选择外部联系人')
   if (activeKey.value === 'subscription' && !form.value.channel_ids.length) return Message.warning('请选择通知渠道')
   saving.value = true
   try {
@@ -255,6 +296,10 @@ const saveRow = async () => {
     }
     const { label_matcher_rows: _labelMatcherRows, ...formPayload } = form.value
     const payload: any = { ...formPayload, label_matchers: labelMatchers, id: editingID.value }
+    if (activeKey.value === 'responsibility') {
+      payload.owner_user_id = form.value.owner_type === 'internal' ? form.value.owner_user_id : undefined
+      payload.external_contact_id = form.value.owner_type === 'external' ? form.value.external_contact_id : undefined
+    }
     const api = editingID.value
       ? { message: updateMessageTemplate, group: updateNotificationGroup, subscription: updateNotificationPolicy, responsibility: updateResponsibility }[activeKey.value]
       : { message: createMessageTemplate, group: createNotificationGroup, subscription: createNotificationPolicy, responsibility: createResponsibility }[activeKey.value]
@@ -282,10 +327,11 @@ const removeRow = async (record: any) => {
 const loadOptions = async () => {
   optionLoading.value = true
   try {
-    const [userRes, businessRes, groupRes, channelRes, severityRes]: any[] = await Promise.all([
+    const [userRes, businessRes, groupRes, channelRes, severityRes, contactRes]: any[] = await Promise.all([
       fetchUserList({ page: 1, size: 100, status: 1 }), fetchBusinessSystems({ page: 1, size: 100, status: 'active' }),
       fetchNotificationGroupList({ page: 1, page_size: 100, enabled: true }), fetchNoticeChannelList({ page: 1, page_size: 100 }),
       fetchAlertLevelOptions({ enabled: 'true' }),
+      fetchExternalContactOptions(),
     ])
     const userRaw = userRes.details ?? userRes.data
     users.value = Array.isArray(userRaw) ? userRaw : userRaw?.data || []
@@ -294,11 +340,39 @@ const loadOptions = async () => {
     channelOptions.value = (channelRes.details?.data || []).filter((item: any) => item.enabled).map((item: any) => ({ label: item.name, value: item.id }))
     const severities = Array.isArray(severityRes.details) ? severityRes.details : severityRes.details?.data || []
     severityOptions.value = severities.map((item: any) => ({ label: item.name, value: item.code }))
+    externalContacts.value = Array.isArray(contactRes) ? contactRes : contactRes.details || []
   } finally {
     optionLoading.value = false
   }
 }
 
+const createContact = async () => {
+  if (!contactForm.value.name.trim()) return Message.warning('请输入联系人姓名')
+  if (!contactForm.value.phone.trim() && !contactForm.value.email.trim()) return Message.warning('手机号和邮箱至少填写一项')
+  contactSaving.value = true
+  try {
+    const response: any = await createExternalContact({
+      code: `external_${Date.now().toString(36)}`,
+      name: contactForm.value.name.trim(),
+      phone: contactForm.value.phone.trim(),
+      email: contactForm.value.email.trim(),
+      remarks: contactForm.value.remarks.trim(),
+      enabled: true,
+    })
+    if (response.code !== 0 || !response.details) throw new Error(response.message || '新建外部联系人失败')
+    externalContacts.value = [...externalContacts.value, response.details].sort((left, right) => left.name.localeCompare(right.name, 'zh-CN'))
+    form.value.owner_type = 'external'
+    form.value.external_contact_id = response.details.id
+    contactForm.value = { name: '', phone: '', email: '', remarks: '' }
+    contactModalVisible.value = false
+    Message.success('外部联系人已新建并选中')
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '新建外部联系人失败')
+  } finally {
+    contactSaving.value = false
+  }
+}
+
 onMounted(() => Promise.all([loadActiveList(), loadOptions()]))
 </script>
 
diff --git a/src/views/ops/pages/alert/notice/index.vue b/src/views/ops/pages/alert/notice/index.vue
index e4005d3..9e134ed 100644
--- a/src/views/ops/pages/alert/notice/index.vue
+++ b/src/views/ops/pages/alert/notice/index.vue
@@ -38,17 +38,20 @@
 
       <!-- 表格自定义列：渠道类型 -->
       <template #type="{ record }">
-        <a-tag :color="getChannelTypeColor(record.type)">
-          {{ getChannelTypeName(record.type) }}
-        </a-tag>
+        <a-space>
+          <a-tag :color="getChannelTypeColor(record.type)">
+            {{ getChannelTypeName(record.type) }}
+          </a-tag>
+          <a-tag v-if="record.type === 'sms'" color="arcoblue">系统固定</a-tag>
+        </a-space>
       </template>
 
       <!-- 表格自定义列：操作 -->
       <template #actions="{ record }">
         <a-space>
           <a-button type="text" size="small" @click="handleDetail(record)">详情</a-button>
-          <a-button type="text" size="small" @click="handleEdit(record)">编辑</a-button>
-          <a-popconfirm content="确认删除该通知渠道吗？" @ok="handleDelete(record)">
+          <a-button v-if="record.type !== 'sms'" type="text" size="small" @click="handleEdit(record)">编辑</a-button>
+          <a-popconfirm v-if="record.type !== 'sms'" content="确认删除该通知渠道吗？" @ok="handleDelete(record)">
             <a-button type="text" size="small" status="danger">删除</a-button>
           </a-popconfirm>
         </a-space>
diff --git a/src/views/ops/pages/alert/setting/components/PolicyCreateDialog.vue b/src/views/ops/pages/alert/setting/components/PolicyCreateDialog.vue
deleted file mode 100644
index 5cf3436..0000000
--- a/src/views/ops/pages/alert/setting/components/PolicyCreateDialog.vue
+++ /dev/null
@@ -1,427 +0,0 @@
-<template>
-  <a-modal
-    :visible="visible"
-    title="新建告警策略"
-    width="800px"
-    :mask-closable="false"
-    :body-style="{ overflowX: 'hidden' }"
-    @cancel="handleCancel"
-    @before-ok="handleSubmit"
-    @update:visible="handleVisibleChange"
-  >
-    <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical" :style="{ marginBottom: '40px' }">
-      <a-divider orientation="left">基础信息</a-divider>
-
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item field="name" label="策略名称" required>
-            <a-input v-model="formData.name" placeholder="请输入策略名称" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="priority" label="优先级">
-            <a-select v-model="formData.priority" placeholder="请选择优先级" allow-clear>
-              <a-option :value="1">1 (最高)</a-option>
-              <a-option :value="2">2</a-option>
-              <a-option :value="3">3</a-option>
-              <a-option :value="4">4</a-option>
-              <a-option :value="5">5 (最低)</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-form-item field="description" label="策略描述">
-        <a-textarea v-model="formData.description" placeholder="请输入策略描述" :auto-size="{ minRows: 2, maxRows: 4 }" allow-clear />
-      </a-form-item>
-
-      <a-form-item field="enabled" label="启用状态">
-        <a-switch v-model="formData.enabled" :checked-value="true" :unchecked-value="false">
-          <template #checked>启用</template>
-          <template #unchecked>禁用</template>
-        </a-switch>
-      </a-form-item>
-
-      <a-divider orientation="left">模板与拓展配置</a-divider>
-
-      <a-form-item field="template_id" label="关联模板">
-        <a-select v-model="formData.template_id" placeholder="请选择告警模板（可选）" allow-search allow-clear :loading="templateLoading">
-          <a-option v-for="template in templateOptions" :key="template.id" :value="template.id">
-            {{ template.name }}
-          </a-option>
-        </a-select>
-      </a-form-item>
-
-      <a-form-item field="labels" label="拓展配置">
-        <a-textarea
-          v-model="formData.labels"
-          placeholder='请输入拓展配置，JSON格式，例如：{"env":"prod","team":"ops"}'
-          :auto-size="{ minRows: 2, maxRows: 4 }"
-          allow-clear
-        />
-        <template #extra>请输入有效的 JSON 格式配置</template>
-      </a-form-item>
-
-      <a-divider orientation="left">自动建单与派单</a-divider>
-
-      <a-form-item field="auto_create_ticket" label="触发时自动建单">
-        <a-switch v-model="formData.auto_create_ticket" :checked-value="true" :unchecked-value="false">
-          <template #checked>开启</template>
-          <template #unchecked>关闭</template>
-        </a-switch>
-      </a-form-item>
-
-      <a-form-item field="feedback_template_id" label="工单模板">
-        <a-select
-          v-model="formData.feedback_template_id"
-          placeholder="请选择工单模板（可选）"
-          allow-search
-          allow-clear
-          :loading="feedbackTemplateLoading"
-          :disabled="!formData.auto_create_ticket"
-        >
-          <a-option :value="0">不使用特定模板</a-option>
-          <a-option v-for="item in feedbackTemplateOptions" :key="item.id" :value="item.id">
-            {{ item.template_name }} ({{ item.template_code }})
-          </a-option>
-        </a-select>
-        <template #extra>
-          {{ formData.auto_create_ticket ? '建议默认选择可用模板，未选择时将按 0 处理' : '请先开启自动建单后再选择工单模板' }}
-        </template>
-      </a-form-item>
-
-      <a-form-item label="派单规则">
-        <a-table :data="dispatchRuleData" :pagination="false" :bordered="true" size="medium" class="dispatch-table">
-          <template #columns>
-            <a-table-column title="告警级别" data-index="severity">
-              <template #cell="{ record }">
-                <a-tag :color="record.color">
-                  {{ record.name }}
-                </a-tag>
-              </template>
-            </a-table-column>
-            <a-table-column title="处理人" data-index="assignee_id">
-              <template #cell="{ record }">
-                <a-select
-                  v-model="record.assignee_id"
-                  placeholder="请选择处理人"
-                  allow-search
-                  allow-clear
-                  :filter-option="false"
-                  :loading="userLoading"
-                  @search="handleUserSearch"
-                  :style="{ width: '100%' }"
-                  :trigger-props="selectTriggerProps"
-                >
-                  <a-option v-for="user in userOptions" :key="user.id" :value="user.id">
-                    {{ user.name || user.account }} ({{ user.account }})
-                  </a-option>
-                </a-select>
-              </template>
-            </a-table-column>
-          </template>
-        </a-table>
-      </a-form-item>
-
-      <a-form-item label="默认处理人">
-        <a-select
-          v-model="defaultAssigneeId"
-          placeholder="请选择默认处理人"
-          allow-search
-          allow-clear
-          :filter-option="false"
-          :loading="userLoading"
-          @search="handleUserSearch"
-          :trigger-props="selectTriggerProps"
-        >
-          <a-option v-for="user in userOptions" :key="user.id" :value="user.id">
-            {{ user.name || user.account }} ({{ user.account }})
-          </a-option>
-        </a-select>
-      </a-form-item>
-    </a-form>
-
-    <template #footer>
-      <a-button @click="handleCancel">取消</a-button>
-      <a-button type="primary" :loading="submitLoading" @click="handleSubmit">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, watch } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import type { FormInstance } from '@arco-design/web-vue'
-import { createPolicy, fetchTemplateList, fetchSeverityOptions, fetchFeedbackTemplateOptions } from '@/api/ops/alertPolicy'
-import { fetchUserList } from '@/api/ops/rbac2'
-
-interface Props {
-  visible: boolean
-}
-
-defineProps<Props>()
-const emit = defineEmits(['update:visible', 'success'])
-
-const formRef = ref<FormInstance>()
-const submitLoading = ref(false)
-const templateLoading = ref(false)
-const feedbackTemplateLoading = ref(false)
-const userLoading = ref(false)
-
-const formData = reactive({
-  name: '',
-  description: '',
-  enabled: true,
-  priority: 3,
-  labels: '',
-  template_id: undefined as number | undefined,
-  auto_create_ticket: false,
-  feedback_template_id: undefined as number | undefined,
-  dispatch_rule: '',
-})
-
-const formRules = {
-  name: [{ required: true, message: '请输入策略名称' }],
-  labels: [
-    {
-      validator: (value: string, callback: any) => {
-        if (!value) {
-          callback()
-          return
-        }
-        try {
-          JSON.parse(value)
-          callback()
-        } catch (error) {
-          callback('拓展配置格式错误，请输入有效的 JSON 格式')
-        }
-      },
-    },
-  ],
-}
-
-const templateOptions = ref<any[]>([])
-const feedbackTemplateOptions = ref<any[]>([])
-const userOptions = ref<any[]>([])
-const severityList = ref<any[]>([
-  { code: 'critical', name: '严重', color: 'red' },
-  { code: 'major', name: '重要', color: 'orange' },
-  { code: 'warning', name: '警告', color: 'yellow' },
-  { code: 'info', name: '信息', color: 'blue' },
-  { code: 'minor', name: '次要', color: 'gray' },
-])
-const dispatchRuleData = ref<any[]>([])
-const defaultAssigneeId = ref<number | undefined>(undefined)
-
-const loadTemplateOptions = async () => {
-  templateLoading.value = true
-  try {
-    const res = await fetchTemplateList({ page: 1, page_size: 1000 })
-    if (res.code === 0 && res.details?.data) {
-      templateOptions.value = res.details.data
-    }
-  } catch (error) {
-    console.error('获取模板列表失败:', error)
-  } finally {
-    templateLoading.value = false
-  }
-}
-
-const loadSeverityList = async () => {
-  try {
-    const res: any = await fetchSeverityOptions({ enabled: 'true' })
-    const list = Array.isArray(res?.details) ? res.details : res?.details?.data || res?.details?.list || res?.data || res
-    severityList.value = Array.isArray(list) ? list : []
-    initDispatchRuleData()
-  } catch (error) {
-    console.error('获取告警级别失败:', error)
-  }
-}
-
-const loadUserOptions = async (keyword = '') => {
-  userLoading.value = true
-  try {
-    const workspace = import.meta.env.VITE_APP_WORKSPACE || ''
-    const res = await fetchUserList({
-      workspace,
-      keyword: keyword || undefined,
-      status: 1,
-    })
-    const { data, details } = res
-    const rawList = !Array.isArray(data) && Array.isArray(data?.data)
-      ? data.data
-      : !Array.isArray(details) && Array.isArray(details?.data)
-        ? details.data
-        : Array.isArray(details)
-          ? details
-          : Array.isArray(data)
-            ? data
-            : []
-    userOptions.value = rawList.map((item: any) => ({
-      id: Number(item.id),
-      name: item.name || '',
-      account: item.account || item.username || '',
-    }))
-  } catch (error) {
-    console.error('获取用户下拉选项失败:', error)
-    userOptions.value = []
-  } finally {
-    userLoading.value = false
-  }
-}
-
-const handleUserSearch = (value: string) => {
-  loadUserOptions(value)
-}
-
-const getSelectPopupContainer = (triggerNode: HTMLElement) => {
-  return triggerNode.closest('.arco-modal') || document.body
-}
-
-const selectTriggerProps = {
-  updateAtScroll: true,
-  autoFitPopupMinWidth: true,
-  getPopupContainer: getSelectPopupContainer,
-}
-
-const loadFeedbackTemplateOptions = async () => {
-  feedbackTemplateLoading.value = true
-  try {
-    const res = await fetchFeedbackTemplateOptions({ status: 'active' })
-    const rawOptions = Array.isArray(res?.data)
-      ? res.data
-      : Array.isArray(res?.details?.data)
-        ? res.details.data
-        : Array.isArray(res?.details)
-          ? res.details
-          : []
-
-    feedbackTemplateOptions.value = rawOptions.map((item: any) => ({
-      id: Number(item.id),
-      template_name: item.template_name || item.name || `模板-${item.id}`,
-      template_code: item.template_code || item.code || '',
-      status: item.status,
-    }))
-  } catch (error) {
-    console.error('获取工单模板下拉选项失败:', error)
-  } finally {
-    feedbackTemplateLoading.value = false
-  }
-}
-
-const initDispatchRuleData = () => {
-  dispatchRuleData.value = severityList.value.map((severity) => ({
-    severity_code: severity.code,
-    name: severity.name,
-    color: severity.color,
-    assignee_id: undefined,
-  }))
-}
-
-const generateDispatchRule = (): string => {
-  const by_severity: Record<string, number> = {}
-  dispatchRuleData.value.forEach((item) => {
-    if (item.assignee_id !== undefined) {
-      by_severity[item.severity_code] = item.assignee_id
-    }
-  })
-
-  const rule: Record<string, any> = {}
-  if (Object.keys(by_severity).length > 0) {
-    rule.by_severity = by_severity
-  }
-  if (defaultAssigneeId.value !== undefined) {
-    rule.default_assignee_id = defaultAssigneeId.value
-  }
-
-  return Object.keys(rule).length > 0 ? JSON.stringify(rule) : ''
-}
-
-const resetForm = () => {
-  formData.name = ''
-  formData.description = ''
-  formData.enabled = true
-  formData.priority = 3
-  formData.labels = ''
-  formData.template_id = undefined
-  formData.auto_create_ticket = false
-  formData.feedback_template_id = undefined
-  formData.dispatch_rule = ''
-  defaultAssigneeId.value = undefined
-  initDispatchRuleData()
-}
-
-const handleVisibleChange = (visible: boolean) => {
-  emit('update:visible', visible)
-}
-
-const handleCancel = () => {
-  emit('update:visible', false)
-  resetForm()
-}
-
-const handleSubmit = async () => {
-  try {
-    await formRef.value?.validate()
-  } catch {
-    return
-  }
-
-  submitLoading.value = true
-  try {
-    formData.dispatch_rule = generateDispatchRule()
-    const data = {
-      name: formData.name,
-      description: formData.description || undefined,
-      enabled: !!formData.enabled,
-      priority: formData.priority ?? undefined,
-      labels: formData.labels || undefined,
-      template_id: formData.template_id ?? undefined,
-      auto_create_ticket: !!formData.auto_create_ticket,
-      feedback_template_id: formData.feedback_template_id ?? 0,
-      dispatch_rule: formData.dispatch_rule || undefined,
-    }
-
-    const res = await createPolicy(data)
-    // 后端是业务 code 约定；接口返回失败时不应继续展示成功提示
-    if (res?.code !== 0) {
-      throw new Error(res?.message || '创建策略失败')
-    }
-    Message.success('策略创建成功')
-    emit('success')
-    handleCancel()
-  } catch (error: any) {
-    console.error('创建策略失败:', error)
-    Message.error(error.message || '创建策略失败')
-  } finally {
-    submitLoading.value = false
-  }
-}
-
-watch(
-  () => formData.auto_create_ticket,
-  (enabled) => {
-    if (!enabled) {
-      formData.feedback_template_id = undefined
-    }
-  }
-)
-
-loadTemplateOptions()
-loadSeverityList()
-loadFeedbackTemplateOptions()
-loadUserOptions()
-initDispatchRuleData()
-</script>
-
-<script lang="ts">
-export default {
-  name: 'PolicyCreateDialog',
-}
-</script>
-
-<style scoped lang="less">
-.dispatch-table {
-  width: 100%;
-}
-</style>
diff --git a/src/views/ops/pages/alert/setting/components/PolicyFormDialog.vue b/src/views/ops/pages/alert/setting/components/PolicyFormDialog.vue
deleted file mode 100644
index 9a3e21c..0000000
--- a/src/views/ops/pages/alert/setting/components/PolicyFormDialog.vue
+++ /dev/null
@@ -1,534 +0,0 @@
-<template>
-  <a-modal
-    :visible="visible"
-    :title="`编辑告警策略 - ${policyName}`"
-    width="800px"
-    :mask-closable="false"
-    :body-style="{ overflowX: 'hidden' }"
-    @cancel="handleCancel"
-    @before-ok="handleSubmit"
-    @update:visible="handleVisibleChange"
-  >
-    <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical" :style="{ marginBottom: '40px' }">
-      <!-- 策略基础信息 -->
-      <a-divider orientation="left">基础信息</a-divider>
-
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item field="name" label="策略名称" required>
-            <a-input v-model="formData.name" placeholder="请输入策略名称" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="priority" label="优先级">
-            <a-select v-model="formData.priority" placeholder="请选择优先级" allow-clear>
-              <a-option :value="1">1 (最高)</a-option>
-              <a-option :value="2">2</a-option>
-              <a-option :value="3">3</a-option>
-              <a-option :value="4">4</a-option>
-              <a-option :value="5">5 (最低)</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-form-item field="description" label="策略描述">
-        <a-textarea v-model="formData.description" placeholder="请输入策略描述" :auto-size="{ minRows: 2, maxRows: 4 }" allow-clear />
-      </a-form-item>
-
-      <a-form-item field="enabled" label="启用状态">
-        <a-switch v-model="formData.enabled" :checked-value="true" :unchecked-value="false">
-          <template #checked>启用</template>
-          <template #unchecked>禁用</template>
-        </a-switch>
-      </a-form-item>
-
-      <!-- 模板与拓展配置 -->
-      <a-divider orientation="left">模板与拓展配置</a-divider>
-
-      <a-form-item field="template_id" label="关联模板">
-        <a-select v-model="formData.template_id" placeholder="请选择告警模板（可选）" allow-search allow-clear :loading="templateLoading">
-          <a-option v-for="template in templateOptions" :key="template.id" :value="template.id">
-            {{ template.name }}
-          </a-option>
-        </a-select>
-      </a-form-item>
-
-      <a-form-item field="labels" label="拓展配置">
-        <a-textarea
-          v-model="formData.labels"
-          placeholder='请输入拓展配置，JSON格式，例如：{"env":"prod","team":"ops"}'
-          :auto-size="{ minRows: 2, maxRows: 4 }"
-          allow-clear
-        />
-        <template #extra>请输入有效的 JSON 格式配置</template>
-      </a-form-item>
-
-      <!-- 自动建单与派单配置 -->
-      <a-divider orientation="left">自动建单与派单</a-divider>
-
-      <a-form-item field="auto_create_ticket" label="触发时自动建单">
-        <a-switch v-model="formData.auto_create_ticket" :checked-value="true" :unchecked-value="false">
-          <template #checked>开启</template>
-          <template #unchecked>关闭</template>
-        </a-switch>
-      </a-form-item>
-
-      <a-form-item field="feedback_template_id" label="工单模板">
-        <a-select
-          v-model="formData.feedback_template_id"
-          placeholder="请选择工单模板（可选）"
-          allow-search
-          allow-clear
-          :loading="feedbackTemplateLoading"
-          :disabled="!formData.auto_create_ticket"
-        >
-          <a-option :value="0">不使用特定模板</a-option>
-          <a-option v-for="item in feedbackTemplateOptions" :key="item.id" :value="item.id">
-            {{ item.template_name }} ({{ item.template_code }})
-          </a-option>
-        </a-select>
-        <template #extra>
-          {{ formData.auto_create_ticket ? '建议默认选择可用模板，未选择时将按 0 处理' : '请先开启自动建单后再选择工单模板' }}
-        </template>
-      </a-form-item>
-
-      <a-form-item label="派单规则">
-        <a-table :data="dispatchRuleData" :pagination="false" :bordered="true" size="medium" class="dispatch-table">
-          <template #columns>
-            <a-table-column title="告警级别" data-index="severity">
-              <template #cell="{ record }">
-                <a-tag :color="record.color">
-                  {{ record.name }}
-                </a-tag>
-              </template>
-            </a-table-column>
-            <a-table-column title="处理人" data-index="assignee_id">
-              <template #cell="{ record }">
-                <a-select
-                  v-model="record.assignee_id"
-                  placeholder="请选择处理人"
-                  allow-search
-                  allow-clear
-                  :filter-option="false"
-                  :loading="userLoading"
-                  @search="handleUserSearch"
-                  :style="{ width: '100%' }"
-                  :trigger-props="selectTriggerProps"
-                >
-                  <a-option v-for="user in userOptions" :key="user.id" :value="user.id">
-                    {{ user.name || user.account }} ({{ user.account }})
-                  </a-option>
-                </a-select>
-              </template>
-            </a-table-column>
-          </template>
-        </a-table>
-      </a-form-item>
-
-      <a-form-item label="默认处理人">
-        <a-select
-          v-model="defaultAssigneeId"
-          placeholder="请选择默认处理人"
-          allow-search
-          allow-clear
-          :filter-option="false"
-          :loading="userLoading"
-          @search="handleUserSearch"
-          :trigger-props="selectTriggerProps"
-        >
-          <a-option v-for="user in userOptions" :key="user.id" :value="user.id">
-            {{ user.name || user.account }} ({{ user.account }})
-          </a-option>
-        </a-select>
-      </a-form-item>
-    </a-form>
-
-    <template #footer>
-      <a-button @click="handleCancel">取消</a-button>
-      <a-button type="primary" :loading="submitLoading" @click="handleSubmit">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, watch } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import type { FormInstance } from '@arco-design/web-vue'
-import {
-  fetchPolicyDetail,
-  updatePolicy,
-  fetchTemplateList,
-  fetchSeverityOptions,
-  fetchFeedbackTemplateOptions,
-} from '@/api/ops/alertPolicy'
-import { fetchUserList } from '@/api/ops/rbac2'
-
-// Props
-interface Props {
-  visible: boolean
-  policyId?: number
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits(['update:visible', 'success'])
-
-// 表单引用
-const formRef = ref<FormInstance>()
-
-// 加载状态
-const submitLoading = ref(false)
-const templateLoading = ref(false)
-const feedbackTemplateLoading = ref(false)
-const userLoading = ref(false)
-
-const policyName = ref('')
-
-// 表单数据
-const formData = reactive({
-  name: '',
-  description: '',
-  enabled: true,
-  priority: 3,
-  labels: '',
-  template_id: undefined,
-  auto_create_ticket: false,
-  feedback_template_id: undefined as number | undefined,
-  dispatch_rule: '',
-})
-
-// 表单验证规则
-const formRules = {
-  name: [{ required: true, message: '请输入策略名称' }],
-  labels: [
-    {
-      validator: (value: string, callback: any) => {
-        if (!value) {
-          callback()
-          return
-        }
-        try {
-          JSON.parse(value)
-          callback()
-        } catch (error) {
-          callback('拓展配置格式错误，请输入有效的 JSON 格式')
-        }
-      },
-    },
-  ],
-}
-
-// 模板选项
-const templateOptions = ref<any[]>([])
-const feedbackTemplateOptions = ref<any[]>([])
-
-// 用户选项（模拟数据，实际应从用户服务获取）
-const userOptions = ref<any[]>([])
-
-// 告警级别列表
-const severityList = ref<any[]>([
-  { code: 'critical', name: '严重', color: 'red' },
-  { code: 'major', name: '重要', color: 'orange' },
-  { code: 'warning', name: '警告', color: 'yellow' },
-  { code: 'info', name: '信息', color: 'blue' },
-  { code: 'minor', name: '次要', color: 'gray' },
-])
-
-// 派单规则数据
-const dispatchRuleData = ref<any[]>([])
-const defaultAssigneeId = ref<number | undefined>(undefined)
-
-// 加载模板列表
-const loadTemplateOptions = async () => {
-  templateLoading.value = true
-  try {
-    const res = await fetchTemplateList({ page: 1, page_size: 1000 })
-    if (res.code === 0 && res.details?.data) {
-      templateOptions.value = res.details.data
-    }
-  } catch (error) {
-    console.error('获取模板列表失败:', error)
-  } finally {
-    templateLoading.value = false
-  }
-}
-
-// 加载告警级别
-const loadSeverityList = async () => {
-  try {
-    const res: any = await fetchSeverityOptions({ enabled: 'true' })
-    const list = Array.isArray(res?.details) ? res.details : res?.details?.data || res?.details?.list || res?.data || res
-    severityList.value = Array.isArray(list) ? list : []
-  } catch (error) {
-    console.error('获取告警级别失败:', error)
-  }
-}
-
-const loadUserOptions = async (keyword = '') => {
-  userLoading.value = true
-  try {
-    const workspace = import.meta.env.VITE_APP_WORKSPACE || ''
-    const res = await fetchUserList({
-      workspace,
-      keyword: keyword || undefined,
-      status: 1,
-    })
-    const { data, details } = res
-    const rawList = !Array.isArray(data) && Array.isArray(data?.data)
-      ? data.data
-      : !Array.isArray(details) && Array.isArray(details?.data)
-        ? details.data
-        : Array.isArray(details)
-          ? details
-          : Array.isArray(data)
-            ? data
-            : []
-    userOptions.value = rawList.map((item: any) => ({
-      id: Number(item.id),
-      name: item.name || '',
-      account: item.account || item.username || '',
-    }))
-  } catch (error) {
-    console.error('获取用户下拉选项失败:', error)
-    userOptions.value = []
-  } finally {
-    userLoading.value = false
-  }
-}
-
-const handleUserSearch = (value: string) => {
-  loadUserOptions(value)
-}
-
-const getSelectPopupContainer = (triggerNode: HTMLElement) => {
-  return triggerNode.closest('.arco-modal') || document.body
-}
-
-const selectTriggerProps = {
-  updateAtScroll: true,
-  autoFitPopupMinWidth: true,
-  getPopupContainer: getSelectPopupContainer,
-}
-
-const loadFeedbackTemplateOptions = async () => {
-  feedbackTemplateLoading.value = true
-  try {
-    const res = await fetchFeedbackTemplateOptions({ status: 'active' })
-    const rawOptions = Array.isArray(res?.data)
-      ? res.data
-      : Array.isArray(res?.details?.data)
-        ? res.details.data
-        : Array.isArray(res?.details)
-          ? res.details
-          : []
-
-    feedbackTemplateOptions.value = rawOptions.map((item: any) => ({
-      id: Number(item.id),
-      template_name: item.template_name || item.name || `模板-${item.id}`,
-      template_code: item.template_code || item.code || '',
-      status: item.status,
-    }))
-  } catch (error) {
-    console.error('获取工单模板下拉选项失败:', error)
-  } finally {
-    feedbackTemplateLoading.value = false
-  }
-}
-
-// 初始化派单规则数据
-const initDispatchRuleData = () => {
-  dispatchRuleData.value = severityList.value.map((severity) => ({
-    severity_code: severity.code,
-    name: severity.name,
-    color: severity.color,
-    assignee_id: undefined,
-  }))
-}
-
-// 解析派单规则
-const parseDispatchRule = (ruleStr: string) => {
-  try {
-    if (!ruleStr) return
-    const rule = JSON.parse(ruleStr)
-
-    if (rule.by_severity) {
-      dispatchRuleData.value.forEach((item) => {
-        if (rule.by_severity[item.severity_code] !== undefined) {
-          item.assignee_id = rule.by_severity[item.severity_code]
-        }
-      })
-    }
-
-    if (rule.default_assignee_id !== undefined) {
-      defaultAssigneeId.value = rule.default_assignee_id
-    }
-  } catch (error) {
-    console.error('解析派单规则失败:', error)
-  }
-}
-
-// 生成派单规则 JSON
-const generateDispatchRule = (): string => {
-  const by_severity: any = {}
-  dispatchRuleData.value.forEach((item) => {
-    if (item.assignee_id !== undefined) {
-      by_severity[item.severity_code] = item.assignee_id
-    }
-  })
-
-  const rule: any = {}
-  if (Object.keys(by_severity).length > 0) {
-    rule.by_severity = by_severity
-  }
-  if (defaultAssigneeId.value !== undefined) {
-    rule.default_assignee_id = defaultAssigneeId.value
-  }
-
-  return Object.keys(rule).length > 0 ? JSON.stringify(rule) : ''
-}
-
-// 加载策略详情
-const loadPolicyDetail = async () => {
-  if (!props.policyId) return
-
-  try {
-    const res = await fetchPolicyDetail(props.policyId)
-    if (res.code === 0 && res.details) {
-      const policy = res.details
-
-      policyName.value = policy.name
-      formData.name = policy.name
-      formData.description = policy.description || ''
-      formData.enabled = policy.enabled
-      formData.priority = policy.priority || 3
-      formData.labels = policy.labels || ''
-      formData.template_id = policy.template_id
-      formData.auto_create_ticket = policy.auto_create_ticket || false
-      formData.feedback_template_id = policy.feedback_template_id ?? undefined
-      formData.dispatch_rule = policy.dispatch_rule || ''
-
-      // 解析派单规则
-      parseDispatchRule(policy.dispatch_rule || '')
-    }
-  } catch (error) {
-    console.error('获取策略详情失败:', error)
-    Message.error('获取策略详情失败')
-  }
-}
-
-// 重置表单
-const resetForm = () => {
-  formData.name = ''
-  formData.description = ''
-  formData.enabled = true
-  formData.priority = 3
-  formData.labels = ''
-  formData.template_id = undefined
-  formData.auto_create_ticket = false
-  formData.feedback_template_id = undefined
-  formData.dispatch_rule = ''
-  policyName.value = ''
-  defaultAssigneeId.value = undefined
-  initDispatchRuleData()
-}
-
-// 处理可见性变化
-const handleVisibleChange = (visible: boolean) => {
-  emit('update:visible', visible)
-}
-
-// 取消
-const handleCancel = () => {
-  emit('update:visible', false)
-  resetForm()
-}
-
-// 提交（Arco Form.validate() 校验通过时 resolve 为 undefined，不能写成 if (!valid)）
-const handleSubmit = async () => {
-  try {
-    await formRef.value?.validate()
-  } catch {
-    return
-  }
-
-  submitLoading.value = true
-
-  try {
-    // 生成派单规则
-    formData.dispatch_rule = generateDispatchRule()
-
-    const data = {
-      name: formData.name,
-      description: formData.description || undefined,
-      enabled: !!formData.enabled,
-      priority: formData.priority ?? undefined,
-      labels: formData.labels || undefined,
-      template_id: formData.template_id ?? undefined,
-      auto_create_ticket: !!formData.auto_create_ticket,
-      feedback_template_id: formData.feedback_template_id ?? 0,
-      dispatch_rule: formData.dispatch_rule || undefined,
-    }
-
-    if (!props.policyId) {
-      Message.error('缺少策略ID，无法编辑')
-      return
-    }
-
-    await updatePolicy({ id: props.policyId, ...data })
-    Message.success('策略更新成功')
-
-    emit('success')
-    handleCancel()
-  } catch (error: any) {
-    console.error('保存策略失败:', error)
-    Message.error(error.message || '保存策略失败')
-  } finally {
-    submitLoading.value = false
-  }
-}
-
-// 监听 visible 变化
-watch(
-  () => props.visible,
-  (visible) => {
-    if (visible) {
-      if (props.policyId) {
-        loadPolicyDetail()
-      } else {
-        Message.error('缺少策略ID，无法打开编辑弹窗')
-        emit('update:visible', false)
-      }
-    } else {
-      resetForm()
-    }
-  }
-)
-
-watch(
-  () => formData.auto_create_ticket,
-  (enabled) => {
-    if (!enabled) {
-      formData.feedback_template_id = undefined
-    }
-  }
-)
-
-// 初始化
-loadTemplateOptions()
-loadSeverityList()
-loadFeedbackTemplateOptions()
-loadUserOptions()
-initDispatchRuleData()
-</script>
-
-<script lang="ts">
-export default {
-  name: 'PolicyFormDialog',
-}
-</script>
-
-<style scoped lang="less">
-.dispatch-table {
-  width: 100%;
-}
-</style>
diff --git a/src/views/ops/pages/alert/template/components/RuleEditor.vue b/src/views/ops/pages/alert/setting/components/RuleEditor.vue
similarity index 76%
rename from src/views/ops/pages/alert/template/components/RuleEditor.vue
rename to src/views/ops/pages/alert/setting/components/RuleEditor.vue
index f3160ee..a46df33 100644
--- a/src/views/ops/pages/alert/template/components/RuleEditor.vue
+++ b/src/views/ops/pages/alert/setting/components/RuleEditor.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="rule-editor">
-    <a-form ref="ruleFormRef" :model="{ rules: localRules }" layout="vertical">
+    <a-form ref="ruleFormRef" :model="{ rules: localRules }" layout="vertical" :disabled="readOnly">
       <div v-if="localRules.length === 0" class="empty-rules">
         <a-empty description="暂无规则，请点击上方按钮添加" />
       </div>
@@ -8,7 +8,7 @@
       <div v-else class="rules-container">
         <a-card v-for="(rule, index) in localRules" :key="index" class="rule-card" :title="`规则 ${index + 1}: ${rule.name || '未命名'}`">
           <template #extra>
-            <a-button type="text" size="small" status="danger" @click="handleRemoveRule(index)">
+            <a-button v-if="!readOnly" type="text" size="small" status="danger" @click="handleRemoveRule(index)">
               <template #icon><icon-delete /></template>
               删除
             </a-button>
@@ -18,6 +18,11 @@
           <div class="rule-section">
             <div class="section-title">基本信息</div>
             <a-row :gutter="16">
+              <a-col :xs="24" :sm="12" :md="6">
+                <a-form-item label="规则编码" :field="`rules[${index}].code`" :rules="getRuleFieldRules('code')">
+                  <a-input v-model="rule.code" placeholder="例如 CPU_USAGE_HIGH" :disabled="Boolean(rule.id)" @change="syncUpdate(index)" />
+                </a-form-item>
+              </a-col>
               <a-col :xs="24" :sm="12" :md="6">
                 <a-form-item label="规则名称" :field="`rules[${index}].name`" :rules="getRuleFieldRules('name')">
                   <a-input v-model="rule.name" placeholder="请输入规则名称" @change="syncUpdate(index)" />
@@ -25,11 +30,8 @@
               </a-col>
               <a-col :xs="24" :sm="12" :md="6">
                 <a-form-item label="数据源" :field="`rules[${index}].data_source`" :rules="getRuleFieldRules('data_source')">
-                  <a-select v-model="rule.data_source" placeholder="请选择" @change="handleRuleDataSourceChange(index)">
-                    <a-option v-for="item in DATA_SOURCES" :key="item.value" :value="item.value">
-                      {{ item.label }}
-                    </a-option>
-                  </a-select>
+                  <a-input :model-value="dataSourceLabel(rule.data_source)" disabled />
+                  <template #extra>由适用类型自动确定</template>
                 </a-form-item>
               </a-col>
               <a-col :xs="24" :sm="12" :md="6">
@@ -38,12 +40,11 @@
                     v-model="rule.metric_name"
                     placeholder="请选择指标"
                     allow-search
-                    :loading="rule._metricsLoading"
-                    @dropdown-visible-change="handleMetricsDropdownChange($event, index)"
-                    @change="syncUpdate(index)"
+                    :loading="metricLoading"
+                    @change="handleMetricChange(index)"
                   >
-                    <a-option v-for="metric in rule._metrics" :key="metric.metric_name" :value="metric.metric_name">
-                      {{ metric.metric_name }} ({{ metric.metric_unit || '无单位' }})
+                    <a-option v-for="metric in metricOptions" :key="metric.metric_code" :value="metric.metric_code">
+                      {{ metric.metric_name }}（{{ metric.unit || '无单位' }}）
                     </a-option>
                   </a-select>
                 </a-form-item>
@@ -85,7 +86,7 @@
               <a-col :xs="24" :sm="12" :md="6">
                 <a-form-item label="比较运算符" :field="`rules[${index}].compare_op`" :rules="getRuleFieldRules('compare_op')">
                   <a-select v-model="rule.compare_op" placeholder="请选择" @change="syncUpdate(index)">
-                    <a-option v-for="item in availableCompareOperators(rule.rule_type)" :key="item.value" :value="item.value">
+                    <a-option v-for="item in availableCompareOperators(rule)" :key="item.value" :value="item.value">
                       {{ item.label }}
                     </a-option>
                   </a-select>
@@ -180,21 +181,22 @@
 
 <script lang="ts" setup>
 import { ref, watch } from 'vue'
-import type { FormInstance } from '@arco-design/web-vue'
+import { Message, type FormInstance } from '@arco-design/web-vue'
 import {
   fetchSeverityOptions,
-  fetchMetricsMeta,
+  fetchMetricDefinitionOptions,
   DATA_SOURCES,
+  getPolicyDataSource,
   COMPARE_OPERATORS,
   RULE_TYPES,
-  type AlertRule,
+  type AlertRuleInput,
   type AlertSeverity,
-  type MetricMeta,
-} from '@/api/ops/alertTemplate'
+  type MetricDefinition,
+  type PolicyCategory,
+} from '@/api/ops/alertPolicy'
 
-interface RuleItem extends AlertRule {
-  _metrics?: MetricMeta[]
-  _metricsLoading?: boolean
+interface RuleItem extends AlertRuleInput {
+  id?: number
   _baseline?: BaselineForm
 }
 
@@ -208,6 +210,8 @@ interface BaselineForm {
 const props = defineProps<{
   rules: RuleItem[]
   severityOptions: AlertSeverity[]
+  policyCategory: PolicyCategory | ''
+  readOnly?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -221,6 +225,10 @@ const ruleFormRef = ref<FormInstance | null>(null)
 // 本地规则数据（深拷贝）
 const localRules = ref<RuleItem[]>([])
 
+// 同一策略分类下的所有规则共用一份指标目录
+const metricOptions = ref<MetricDefinition[]>([])
+const metricLoading = ref(false)
+
 // 告警级别下拉选项（支持搜索后局部刷新）
 const baseSeverityOptions = ref<AlertSeverity[]>([])
 const localSeverityOptions = ref<AlertSeverity[]>([])
@@ -324,6 +332,7 @@ const handleSeveritySearch = (keyword: string) => {
 // 动态生成验证规则
 const getRuleFieldRules = (field: string) => {
   const messages: Record<string, string> = {
+    code: '请输入规则编码',
     name: '请输入规则名称',
     data_source: '请选择数据源',
     metric_name: '请选择指标名称',
@@ -337,8 +346,25 @@ const getRuleFieldRules = (field: string) => {
   return [{ required: true, message: messages[field] || '该字段为必填项' }]
 }
 
-const availableCompareOperators = (ruleType: string) =>
-  ruleType === 'dynamic' ? COMPARE_OPERATORS.filter((item) => item.value !== '==' && item.value !== '!=') : COMPARE_OPERATORS
+const metricCompareOperators = (rule: RuleItem): string[] => {
+  const metric = metricOptions.value.find((item) => item.metric_code === rule.metric_name)
+  if (!metric?.compare_operators) return COMPARE_OPERATORS.map((item) => item.value)
+  try {
+    const parsed = JSON.parse(metric.compare_operators)
+    return Array.isArray(parsed) ? parsed : []
+  } catch {
+    return []
+  }
+}
+
+const availableCompareOperators = (rule: RuleItem) => {
+  const supported = new Set(metricCompareOperators(rule))
+  return COMPARE_OPERATORS.filter(
+    (item) => supported.has(item.value) && (rule.rule_type !== 'dynamic' || !['==', '!='].includes(item.value))
+  )
+}
+
+const dataSourceLabel = (value: string) => DATA_SOURCES.find((item) => item.value === value)?.label || value
 
 // 暴露验证方法给父组件
 const validate = async () => {
@@ -352,12 +378,13 @@ defineExpose({
 // 同步更新到父组件
 const syncUpdate = (index: number) => {
   const newRules = [...props.rules]
-  const { _metrics, _metricsLoading, _baseline, ...rest } = localRules.value[index]
+  const { _baseline, ...rest } = localRules.value[index]
   if (rest.rule_type === 'dynamic' && ['==', '!='].includes(rest.compare_op)) {
     rest.compare_op = '>'
   }
+  rest.data_source = getPolicyDataSource(props.policyCategory)
   const baseline_config = rest.rule_type === 'dynamic' ? JSON.stringify(_baseline || defaultBaselineConfig()) : '{}'
-  newRules[index] = { ...rest, baseline_config, _metrics, _metricsLoading } as RuleItem
+  newRules[index] = { ...rest, baseline_config } as RuleItem
   emit('update:rules', newRules)
 }
 
@@ -366,15 +393,6 @@ const handleRemoveRule = (index: number) => {
   emit('remove', index)
 }
 
-// 规则数据源变化
-const handleRuleDataSourceChange = (index: number) => {
-  localRules.value[index].metric_name = ''
-  localRules.value[index]._metrics = []
-  syncUpdate(index)
-  // 数据源变化后自动加载指标
-  handleLoadMetrics(index)
-}
-
 const handleRuleTypeChange = (index: number) => {
   const rule = localRules.value[index]
   if (rule.rule_type === 'dynamic') {
@@ -386,42 +404,73 @@ const handleRuleTypeChange = (index: number) => {
   syncUpdate(index)
 }
 
-// 下拉框展开时加载指标（备用触发）
-const handleMetricsDropdownChange = (visible: boolean, index: number) => {
-  if (visible) {
-    handleLoadMetrics(index)
+const handleMetricChange = (index: number) => {
+  const rule = localRules.value[index]
+  const metric = metricOptions.value.find((item) => item.metric_code === rule.metric_name)
+  if (!metric) {
+    syncUpdate(index)
+    return
   }
+  rule.data_source = metric.data_source
+  rule.name = `${metric.metric_name}告警`
+  if (!rule.code) {
+    rule.code = `R_${metric.metric_code}`.toUpperCase().replace(/[^A-Z0-9_]/g, '_')
+  }
+  try {
+    const suggestion = JSON.parse(metric.threshold_suggestion || '{}')
+    if (suggestion.compare_op) rule.compare_op = suggestion.compare_op
+    if (typeof suggestion.threshold === 'number') rule.threshold = suggestion.threshold
+    if (Number(suggestion.duration) >= 0) rule.duration = Number(suggestion.duration)
+    if (Number(suggestion.eval_interval) > 0) rule.eval_interval = Number(suggestion.eval_interval)
+    if (suggestion.severity_code) rule.severity_code = suggestion.severity_code
+  } catch {
+    // 没有建议阈值时保留当前规则配置
+  }
+  syncUpdate(index)
 }
 
-// 加载指标
-const handleLoadMetrics = async (index: number) => {
-  // 每次都重新获取引用，避免引用失效
-  if (!localRules.value[index]?.data_source) {
-    return
-  }
-  if (localRules.value[index]._metrics && localRules.value[index]._metrics!.length > 0) {
+let metricRequestSequence = 0
+
+// 按策略分类加载共享指标目录
+const loadMetricOptions = async () => {
+  const category = props.policyCategory
+  const sequence = ++metricRequestSequence
+  metricOptions.value = []
+  if (!category) {
+    metricLoading.value = false
     return
   }
 
-  localRules.value[index]._metricsLoading = true
+  metricLoading.value = true
 
   try {
-    const res: any = await fetchMetricsMeta({
-      data_source: localRules.value[index].data_source,
-      limit: 500,
+    const res: any = await fetchMetricDefinitionOptions({
+      policy_category: category,
+      alert_supported: true,
     })
-
-    if (res.code === 0) {
-      localRules.value[index]._metrics = res.details?.metrics || []
-      // 同步更新到父组件
-      syncUpdate(index)
-    }
+    if (sequence !== metricRequestSequence) return
+    if (res?.code !== 0) throw new Error(res?.message || '加载指标目录失败')
+    metricOptions.value = res.details?.list || []
   } catch (error) {
-    console.error('加载指标失败:', error)
+    if (sequence !== metricRequestSequence) return
+    Message.error(error instanceof Error ? error.message : '加载指标目录失败')
   } finally {
-    localRules.value[index]._metricsLoading = false
+    if (sequence === metricRequestSequence) metricLoading.value = false
   }
 }
+
+watch(
+  () => props.policyCategory,
+  (category, previousCategory) => {
+    const dataSource = getPolicyDataSource(category)
+    localRules.value.forEach((rule) => {
+      rule.data_source = dataSource
+      if (previousCategory && previousCategory !== category) rule.metric_name = ''
+    })
+    void loadMetricOptions()
+  },
+  { immediate: true }
+)
 </script>
 
 <script lang="ts">
diff --git a/src/views/ops/pages/alert/setting/components/RuleFormDialog.vue b/src/views/ops/pages/alert/setting/components/RuleFormDialog.vue
deleted file mode 100644
index e46b491..0000000
--- a/src/views/ops/pages/alert/setting/components/RuleFormDialog.vue
+++ /dev/null
@@ -1,454 +0,0 @@
-<template>
-  <a-modal
-    :visible="visible"
-    :title="isEdit ? '编辑告警规则' : '新建告警规则'"
-    width="800px"
-    :mask-closable="false"
-    @cancel="handleCancel"
-    @update:visible="handleVisibleChange"
-  >
-    <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical" :style="{ marginBottom: '40px' }">
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item field="name" label="规则名称" required>
-            <a-input v-model="formData.name" placeholder="请输入规则名称" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="rule_type" label="规则类型" required>
-            <a-select v-model="formData.rule_type" placeholder="请选择规则类型" @change="handleRuleTypeChange">
-              <a-option value="static">静态规则</a-option>
-              <a-option value="dynamic">动态基线</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item field="enabled" label="启用状态">
-            <a-switch v-model="formData.enabled" :checked-value="true" :unchecked-value="false">
-              <template #checked>启用</template>
-              <template #unchecked>禁用</template>
-            </a-switch>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="severity_id" label="告警级别" required>
-            <a-select
-              v-model="formData.severity_id"
-              placeholder="请选择告警级别"
-              :loading="severityLoading"
-              allow-search
-              :filter-option="false"
-              @search="handleSeveritySearch"
-            >
-              <a-option v-for="severity in severityOptions" :key="severity.id" :value="severity.id">
-                <a-tag :color="severity.color">{{ severity.name }}</a-tag>
-              </a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-form-item field="metric_name" label="指标名称" required>
-        <a-input v-model="formData.metric_name" placeholder="请输入指标名称，如：cpu_usage" allow-clear />
-      </a-form-item>
-
-      <!-- 阈值条件 -->
-      <a-row :gutter="16">
-        <a-col :span="6">
-          <a-form-item field="compare_op" label="比较操作符" required>
-            <a-select v-model="formData.compare_op" placeholder="请选择">
-              <a-option value=">">></a-option>
-              <a-option value="<"><</a-option>
-              <a-option value=">=">&ge;</a-option>
-              <a-option value="<=">&le;</a-option>
-              <a-option v-if="formData.rule_type !== 'dynamic'" value="==">=</a-option>
-              <a-option v-if="formData.rule_type !== 'dynamic'" value="!=">&ne;</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item field="threshold" :label="formData.rule_type === 'dynamic' ? '偏离比例（%）' : '阈值'" required>
-            <a-input-number
-              v-model="formData.threshold"
-              :placeholder="formData.rule_type === 'dynamic' ? '请输入偏离比例' : '请输入阈值'"
-              :min="formData.rule_type === 'dynamic' ? 0 : undefined"
-              :precision="2"
-              allow-clear
-              :style="{ width: '100%' }"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="duration" label="持续时间（秒）">
-            <a-input-number
-              v-model="formData.duration"
-              placeholder="请输入持续时间"
-              :min="0"
-              :precision="0"
-              allow-clear
-              :style="{ width: '100%' }"
-            />
-            <template #extra>持续时间达到设定值才会触发告警</template>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item field="eval_interval" label="评估间隔（秒）" required>
-            <a-input-number v-model="formData.eval_interval" :min="1" :precision="0" :style="{ width: '100%' }" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row v-if="formData.rule_type === 'dynamic'" :gutter="16">
-        <a-col :span="6">
-          <a-form-item field="lookback_seconds" label="基线窗口（秒）" required>
-            <a-input-number v-model="formData.lookback_seconds" :min="formData.eval_interval" :precision="0" :style="{ width: '100%' }" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item field="baseline_aggregation" label="基线聚合" required>
-            <a-select v-model="formData.baseline_aggregation">
-              <a-option value="avg">平均值</a-option>
-              <a-option value="max">最大值</a-option>
-              <a-option value="min">最小值</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item field="current_aggregation" label="当前值聚合" required>
-            <a-select v-model="formData.current_aggregation">
-              <a-option value="avg">平均值</a-option>
-              <a-option value="max">最大值</a-option>
-              <a-option value="min">最小值</a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6">
-          <a-form-item field="min_samples" label="最少样本数" required>
-            <a-input-number v-model="formData.min_samples" :min="1" :precision="0" :style="{ width: '100%' }" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-form-item field="description" label="规则描述">
-        <a-textarea v-model="formData.description" placeholder="请输入规则描述" :auto-size="{ minRows: 2, maxRows: 4 }" allow-clear />
-      </a-form-item>
-    </a-form>
-
-    <template #footer>
-      <a-button @click="handleCancel">取消</a-button>
-      <a-button type="primary" :loading="submitLoading" @click="handleSubmit">保存</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import type { FormInstance } from '@arco-design/web-vue'
-import { fetchRuleDetail, createRule, updateRule, fetchSeverityOptions } from '@/api/ops/alertPolicy'
-
-// Props
-interface Props {
-  visible: boolean
-  ruleId?: number
-  policyId?: number
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits(['update:visible', 'success'])
-
-// 表单引用
-const formRef = ref<FormInstance>()
-
-// 加载状态
-const submitLoading = ref(false)
-const severityLoading = ref(false)
-
-// 是否为编辑模式
-const isEdit = computed(() => !!props.ruleId)
-
-// 表单数据
-const formData = reactive({
-  name: '',
-  rule_type: 'static',
-  enabled: true,
-  severity_id: 0 as number,
-  metric_name: '',
-  data_source: 'dc-control',
-  threshold: undefined as number | undefined,
-  compare_op: '>',
-  duration: 60,
-  eval_interval: 60,
-  lookback_seconds: 3600,
-  baseline_aggregation: 'avg',
-  current_aggregation: 'avg',
-  min_samples: 1,
-  description: '',
-})
-
-// 表单验证规则
-const formRules = {
-  name: [{ required: true, message: '请输入规则名称' }],
-  rule_type: [{ required: true, message: '请选择规则类型' }],
-  severity_id: [{ required: true, message: '请选择告警级别' }],
-  metric_name: [
-    {
-      validator: (value: string, callback: any) => {
-        if (!value) {
-          callback('请输入指标名称')
-          return
-        }
-        callback()
-      },
-    },
-  ],
-  compare_op: [
-    {
-      validator: (value: string, callback: any) => {
-        if (!value) {
-          callback('请选择比较操作符')
-          return
-        }
-        callback()
-      },
-    },
-  ],
-  threshold: [
-    {
-      validator: (value: number, callback: any) => {
-        if (value === undefined) {
-          callback('请输入阈值')
-          return
-        }
-        callback()
-      },
-    },
-  ],
-}
-
-// 告警级别选项
-const severityOptions = ref<any[]>([])
-const baseSeverityOptions = ref<any[]>([])
-
-// 加载告警级别列表
-const loadSeverityOptions = async (keyword?: string) => {
-  severityLoading.value = true
-  try {
-    const res: any = await fetchSeverityOptions({
-      keyword,
-      enabled: 'true',
-    })
-
-    const list = Array.isArray(res?.details) ? res.details : res?.details?.data || res?.details?.list || res?.data || res
-    const fetchedOptions = Array.isArray(list) ? list : []
-
-    // 首次/keyword 为空时缓存“全量可用选项”
-    const isBaseLoad = !keyword || keyword.trim().length === 0
-    if (isBaseLoad) {
-      baseSeverityOptions.value = fetchedOptions
-    }
-
-    // 防止搜索后缩小 options 导致当前已选项标签无法展示
-    const selectedId = formData.severity_id
-    const selectedOptions = baseSeverityOptions.value.filter((s) => s?.id === selectedId)
-
-    const mergedMap = new Map<number, any>()
-    ;[...fetchedOptions, ...selectedOptions].forEach((item) => {
-      if (typeof item?.id === 'number') {
-        mergedMap.set(item.id, item)
-      }
-    })
-
-    severityOptions.value = Array.from(mergedMap.values())
-  } catch (error) {
-    console.error('获取告警级别失败:', error)
-  } finally {
-    severityLoading.value = false
-  }
-}
-
-let severitySearchTimer: ReturnType<typeof setTimeout> | null = null
-const handleSeveritySearch = (keyword: string) => {
-  if (severitySearchTimer) {
-    clearTimeout(severitySearchTimer)
-  }
-
-  severitySearchTimer = setTimeout(() => {
-    loadSeverityOptions(keyword)
-  }, 300)
-}
-
-// 规则类型变化处理
-const handleRuleTypeChange = (value: string) => {
-  if (!formData.compare_op || (value === 'dynamic' && ['==', '!='].includes(formData.compare_op))) {
-    formData.compare_op = '>'
-  }
-}
-
-// 加载规则详情
-const loadRuleDetail = async () => {
-  if (!props.ruleId) return
-
-  try {
-    const res = await fetchRuleDetail(props.ruleId)
-    if (res.code === 0 && res.details) {
-      const rule = res.details
-
-      formData.name = rule.name
-      formData.rule_type = rule.rule_type === 'dynamic' ? 'dynamic' : 'static'
-      formData.enabled = rule.enabled
-      formData.severity_id = rule.severity_id
-      formData.metric_name = rule.metric_name || ''
-      formData.data_source = rule.data_source || 'dc-control'
-      formData.threshold = rule.threshold
-        formData.compare_op = rule.compare_op || '>'
-        if (formData.rule_type === 'dynamic' && ['==', '!='].includes(formData.compare_op)) {
-          formData.compare_op = '>'
-        }
-      formData.duration = rule.duration ?? 60
-      formData.eval_interval = rule.eval_interval ?? 60
-      if (rule.rule_type === 'dynamic') {
-        try {
-          const baseline = JSON.parse(rule.baseline_config || '{}')
-          formData.lookback_seconds = baseline.lookback_seconds || 3600
-          formData.baseline_aggregation = baseline.aggregation || 'avg'
-          formData.current_aggregation = baseline.current_aggregation || 'avg'
-          formData.min_samples = baseline.min_samples || 1
-        } catch {
-          formData.lookback_seconds = 3600
-          formData.baseline_aggregation = 'avg'
-          formData.current_aggregation = 'avg'
-          formData.min_samples = 1
-        }
-      }
-      formData.description = rule.description || ''
-    }
-  } catch (error) {
-    console.error('获取规则详情失败:', error)
-    Message.error('获取规则详情失败')
-  }
-}
-
-// 重置表单
-const resetForm = () => {
-  formData.name = ''
-  formData.rule_type = 'static'
-  formData.enabled = true
-  formData.severity_id = 0
-  formData.metric_name = ''
-  formData.data_source = 'dc-control'
-  formData.threshold = undefined
-  formData.compare_op = '>'
-  formData.duration = 60
-  formData.eval_interval = 60
-  formData.lookback_seconds = 3600
-  formData.baseline_aggregation = 'avg'
-  formData.current_aggregation = 'avg'
-  formData.min_samples = 1
-  formData.description = ''
-}
-
-// 处理可见性变化
-const handleVisibleChange = (visible: boolean) => {
-  emit('update:visible', visible)
-}
-
-// 取消
-const handleCancel = () => {
-  emit('update:visible', false)
-  resetForm()
-}
-
-// 提交（Arco Form.validate() 通过时 resolve 为 undefined，不可写成 if (!valid)）
-const handleSubmit = async () => {
-  try {
-    await formRef.value?.validate()
-  } catch {
-    return
-  }
-
-  if (!props.policyId) {
-    Message.warning('缺少策略 ID')
-    return
-  }
-
-  submitLoading.value = true
-
-  try {
-    const { lookback_seconds, baseline_aggregation, current_aggregation, min_samples, ...ruleFields } = formData
-    const data = {
-      ...ruleFields,
-      policy_id: props.policyId,
-      severity_id: formData.severity_id,
-      baseline_config:
-        formData.rule_type === 'dynamic'
-          ? JSON.stringify({
-              lookback_seconds,
-              aggregation: baseline_aggregation,
-              current_aggregation,
-              min_samples,
-            })
-          : '{}',
-    }
-
-    // 按契约：rule/create 不做 jsonb 默认值归一化。
-    // 当 jsonb 字段无内容时，必须显式传 "{}"（否则可能反序列化为空串导致 SQLSTATE 22P02）。
-    const createPayload = !isEdit.value
-      ? {
-          ...data,
-          labels: '{}',
-          annotations: '{}',
-        }
-      : data
-
-    // 编辑模式
-    if (isEdit.value && props.ruleId) {
-      await updateRule({ id: props.ruleId, ...data })
-      Message.success('规则更新成功')
-    } else {
-      // 新建模式
-      await createRule(createPayload)
-      Message.success('规则创建成功')
-    }
-
-    emit('success')
-    handleCancel()
-  } catch (error: any) {
-    console.error('保存规则失败:', error)
-    Message.error(error.message || '保存规则失败')
-  } finally {
-    submitLoading.value = false
-  }
-}
-
-// 监听 visible 变化
-watch(
-  () => props.visible,
-  (visible) => {
-    if (visible) {
-      if (isEdit.value) {
-        loadRuleDetail()
-      } else {
-        resetForm()
-      }
-    } else {
-      resetForm()
-    }
-  }
-)
-
-// 初始化
-loadSeverityOptions()
-</script>
-
-<script lang="ts">
-export default {
-  name: 'RuleFormDialog',
-}
-</script>
diff --git a/src/views/ops/pages/alert/setting/components/RuleManageDialog.vue b/src/views/ops/pages/alert/setting/components/RuleManageDialog.vue
deleted file mode 100644
index 8b25789..0000000
--- a/src/views/ops/pages/alert/setting/components/RuleManageDialog.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-  <a-modal
-    :visible="visible"
-    :title="`规则管理 - ${policyName}`"
-    width="1200px"
-    :mask-closable="false"
-    @cancel="handleCancel"
-    @update:visible="handleVisibleChange"
-  >
-    <div class="rule-manage-content">
-      <!-- 工具栏 -->
-      <div class="toolbar">
-        <a-input-search v-model="searchKeyword" placeholder="请输入规则名称搜索" style="width: 300px" allow-clear @search="handleSearch" />
-        <a-button type="primary" @click="handleCreateRule">
-          <template #icon>
-            <icon-plus />
-          </template>
-          新建规则
-        </a-button>
-      </div>
-
-      <!-- 规则列表 -->
-      <a-table
-        :data="ruleData"
-        :loading="ruleLoading"
-        :pagination="rulePagination"
-        :bordered="true"
-        size="medium"
-        @page-change="handlePageChange"
-      >
-        <template #columns>
-          <a-table-column title="规则名称" data-index="name" :width="200" />
-          <a-table-column title="规则类型" data-index="rule_type" :width="100">
-            <template #cell="{ record }">
-              <a-tag>{{ getRuleTypeText(record.rule_type) }}</a-tag>
-            </template>
-          </a-table-column>
-          <a-table-column title="启用状态" data-index="enabled" :width="100">
-            <template #cell="{ record }">
-              <a-tag :color="record.enabled ? 'green' : 'gray'">
-                {{ record.enabled ? '启用' : '禁用' }}
-              </a-tag>
-            </template>
-          </a-table-column>
-          <a-table-column title="指标/表达式" data-index="metric_expr" :width="200">
-            <template #cell="{ record }">
-              <span :title="record.metric_name">
-                {{ record.metric_name || '-' }}
-              </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="阈值条件" data-index="threshold" :width="120">
-            <template #cell="{ record }">
-              <span v-if="record.threshold !== undefined">{{ getCompareOpText(record.compare_op) }} {{ record.threshold }}</span>
-              <span v-else>-</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="持续时间" data-index="duration" :width="100">
-            <template #cell="{ record }">
-              <span v-if="record.duration">{{ formatDuration(record.duration) }}</span>
-              <span v-else>-</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="告警级别" data-index="severity" :width="120">
-            <template #cell="{ record }">
-              <div v-if="record.severity" :style="{ display: 'flex', alignItems: 'center', gap: '8px' }">
-                <div
-                  :style="{
-                    width: '16px',
-                    height: '16px',
-                    backgroundColor: record.severity.color,
-                    border: '1px solid var(--color-border-2)',
-                    borderRadius: '3px',
-                  }"
-                ></div>
-                <span>{{ record.severity.name }}</span>
-              </div>
-              <span v-else>-</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="操作" data-index="actions" :width="150" fixed="right">
-            <template #cell="{ record }">
-              <a-space>
-                <a-button type="text" size="small" @click="handleEditRule(record)">编辑</a-button>
-                <a-popconfirm content="确定要删除该规则吗？" @ok="handleDeleteRule(record)">
-                  <a-button type="text" size="small" status="danger">删除</a-button>
-                </a-popconfirm>
-              </a-space>
-            </template>
-          </a-table-column>
-        </template>
-      </a-table>
-    </div>
-
-    <!-- 新建/编辑规则弹窗 -->
-    <rule-form-dialog v-model:visible="ruleFormVisible" :rule-id="currentRuleId" :policy-id="policyId" @success="handleRuleFormSuccess" />
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, watch } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import { IconPlus } from '@arco-design/web-vue/es/icon'
-import { fetchRuleList, deleteRule } from '@/api/ops/alertPolicy'
-import RuleFormDialog from './RuleFormDialog.vue'
-
-// Props
-interface Props {
-  visible: boolean
-  policyId?: number
-  policyName?: string
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits(['update:visible', 'success'])
-
-// 状态管理
-const ruleLoading = ref(false)
-const ruleData = ref<any[]>([])
-const searchKeyword = ref('')
-
-// 规则分页
-const rulePagination = reactive({
-  current: 1,
-  pageSize: 10,
-  total: 0,
-})
-
-// 规则表单
-const ruleFormVisible = ref(false)
-const currentRuleId = ref<number | undefined>(undefined)
-
-// 规则类型映射
-const ruleTypeMap: Record<string, string> = {
-  static: '静态规则',
-  dynamic: '动态规则',
-}
-
-// 比较操作符映射
-const compareOpMap: Record<string, string> = {
-  '>': '>',
-  '<': '<',
-  '>=': '≥',
-  '<=': '≤',
-  '==': '=',
-  '!=': '≠',
-}
-
-// 获取规则类型文本
-const getRuleTypeText = (type: string) => {
-  return ruleTypeMap[type] || type
-}
-
-// 获取比较操作符文本
-const getCompareOpText = (op: string) => {
-  return compareOpMap[op] || op
-}
-
-// 格式化持续时间
-const formatDuration = (seconds: number) => {
-  if (seconds < 60) {
-    return `${seconds}秒`
-  } else if (seconds < 3600) {
-    return `${Math.floor(seconds / 60)}分钟`
-  } else {
-    return `${Math.floor(seconds / 3600)}小时`
-  }
-}
-
-// 加载规则列表
-const loadRuleList = async () => {
-  if (!props.policyId) return
-
-  ruleLoading.value = true
-
-  try {
-    const res = await fetchRuleList({
-      policy_id: props.policyId,
-      page: rulePagination.current,
-      page_size: rulePagination.pageSize,
-      keyword: searchKeyword.value || undefined,
-    })
-
-    ruleData.value = res.details?.data || []
-    rulePagination.total = res.details?.total || 0
-  } catch (error) {
-    console.error('获取规则列表失败:', error)
-    Message.error('获取规则列表失败')
-    ruleData.value = []
-    rulePagination.total = 0
-  } finally {
-    ruleLoading.value = false
-  }
-}
-
-// 搜索
-const handleSearch = () => {
-  rulePagination.current = 1
-  loadRuleList()
-}
-
-// 分页变化
-const handlePageChange = (current: number) => {
-  rulePagination.current = current
-  loadRuleList()
-}
-
-// 新建规则
-const handleCreateRule = () => {
-  if (!props.policyId) {
-    Message.warning('请先选择策略')
-    return
-  }
-  currentRuleId.value = undefined
-  ruleFormVisible.value = true
-}
-
-// 编辑规则
-const handleEditRule = (record: any) => {
-  currentRuleId.value = record.id
-  ruleFormVisible.value = true
-}
-
-// 删除规则
-const handleDeleteRule = async (record: any) => {
-  try {
-    await deleteRule(record.id)
-    Message.success('规则删除成功')
-
-    // 如果当前页只有一条数据，且不是第一页，则跳到上一页
-    if (ruleData.value.length === 1 && rulePagination.current > 1) {
-      rulePagination.current--
-    }
-
-    loadRuleList()
-  } catch (error) {
-    console.error('删除规则失败:', error)
-    Message.error('删除规则失败')
-  }
-}
-
-// 规则表单成功回调
-const handleRuleFormSuccess = () => {
-  loadRuleList()
-  emit('success')
-}
-
-// 处理可见性变化
-const handleVisibleChange = (visible: boolean) => {
-  emit('update:visible', visible)
-}
-
-// 取消
-const handleCancel = () => {
-  emit('update:visible', false)
-}
-
-// 监听 visible 变化
-watch(
-  () => props.visible,
-  (visible) => {
-    if (visible) {
-      searchKeyword.value = ''
-      rulePagination.current = 1
-      loadRuleList()
-    }
-  }
-)
-</script>
-
-<script lang="ts">
-export default {
-  name: 'RuleManageDialog',
-}
-</script>
-
-<style scoped lang="less">
-.rule-manage-content {
-  .toolbar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16px;
-    padding: 16px;
-    background-color: var(--color-fill-2);
-    border-radius: 4px;
-  }
-}
-</style>
diff --git a/src/views/ops/pages/alert/setting/config/columns.ts b/src/views/ops/pages/alert/setting/config/columns.ts
index 133fe4a..3251a30 100644
--- a/src/views/ops/pages/alert/setting/config/columns.ts
+++ b/src/views/ops/pages/alert/setting/config/columns.ts
@@ -1,79 +1,15 @@
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
 
 export const columns: TableColumnData[] = [
-  {
-    title: '序号',
-    dataIndex: 'index',
-    slotName: 'index',
-    width: 80,
-  },
-  {
-    title: '策略名称',
-    dataIndex: 'name',
-    slotName: 'name',
-    width: 200,
-    ellipsis: true,
-    tooltip: true,
-  },
-  {
-    title: '策略描述',
-    dataIndex: 'description',
-    width: 250,
-    ellipsis: true,
-    tooltip: true,
-  },
-  {
-    title: '启用状态',
-    dataIndex: 'enabled',
-    slotName: 'enabled',
-    width: 100,
-  },
-  {
-    title: '优先级',
-    dataIndex: 'priority',
-    width: 80,
-  },
-  {
-    title: '规则数',
-    dataIndex: 'rule_count',
-    slotName: 'rule_count',
-    width: 80,
-  },
-  {
-    title: '通知渠道数',
-    dataIndex: 'channel_count',
-    slotName: 'channel_count',
-    width: 100,
-  },
-  {
-    title: '抑制规则数',
-    dataIndex: 'suppression_rule_count',
-    slotName: 'suppression_rule_count',
-    width: 100,
-  },
-  {
-    title: '自动建单',
-    dataIndex: 'auto_create_ticket',
-    slotName: 'auto_create_ticket',
-    width: 100,
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'created_at',
-    slotName: 'created_at',
-    width: 180,
-  },
-  {
-    title: '最后修改',
-    dataIndex: 'updated_at',
-    slotName: 'updated_at',
-    width: 180,
-  },
-  {
-    title: '操作',
-    dataIndex: 'actions',
-    slotName: 'actions',
-    fixed: 'right',
-    width: 300,
-  },
+  { title: '序号', dataIndex: 'index', slotName: 'index', width: 70 },
+  { title: '策略名称', dataIndex: 'name', slotName: 'name', width: 230, ellipsis: true, tooltip: true },
+  { title: '策略编码', dataIndex: 'code', width: 180, ellipsis: true, tooltip: true },
+  { title: '适用类型', dataIndex: 'category', slotName: 'category', width: 160 },
+  { title: '启用状态', dataIndex: 'enabled', slotName: 'enabled', width: 100 },
+  { title: '规则数', dataIndex: 'rule_count', slotName: 'rule_count', width: 80 },
+  { title: '通知渠道', dataIndex: 'channel_count', slotName: 'channel_count', width: 100 },
+  { title: '绑定资源', dataIndex: 'binding_count', slotName: 'binding_count', width: 100 },
+  { title: '自动建单', dataIndex: 'auto_create_ticket', slotName: 'auto_create_ticket', width: 100 },
+  { title: '最后修改', dataIndex: 'updated_at', slotName: 'updated_at', width: 180 },
+  { title: '操作', dataIndex: 'actions', slotName: 'actions', fixed: 'right', width: 300 },
 ]
diff --git a/src/views/ops/pages/alert/setting/config/search-form.ts b/src/views/ops/pages/alert/setting/config/search-form.ts
index 3792c4c..aed868b 100644
--- a/src/views/ops/pages/alert/setting/config/search-form.ts
+++ b/src/views/ops/pages/alert/setting/config/search-form.ts
@@ -1,11 +1,12 @@
 import type { FormItem } from '@/components/search-form/types'
+import { POLICY_CATEGORIES } from '@/api/ops/alertPolicy'
 
 export const searchFormConfig: FormItem[] = [
   {
     field: 'keyword',
     label: '关键字',
     type: 'input',
-    placeholder: '请输入策略名称或描述',
+    placeholder: '请输入策略名称、编码或描述',
   },
   {
     field: 'enabled',
@@ -19,16 +20,10 @@ export const searchFormConfig: FormItem[] = [
     ],
   },
   {
-    field: 'priority',
-    label: '优先级',
+    field: 'category',
+    label: '适用类型',
     type: 'select',
-    placeholder: '请选择优先级',
-    options: [
-      { label: '1 (最高)', value: 1 },
-      { label: '2', value: 2 },
-      { label: '3', value: 3 },
-      { label: '4', value: 4 },
-      { label: '5 (最低)', value: 5 },
-    ],
+    placeholder: '请选择适用类型',
+    options: [{ label: '全部', value: '' }, ...POLICY_CATEGORIES.map((item) => ({ label: item.label, value: item.value }))],
   },
 ]
diff --git a/src/views/ops/pages/alert/setting/edit/components/PolicySuppressionRuleEditor.vue b/src/views/ops/pages/alert/setting/edit/components/PolicySuppressionRuleEditor.vue
new file mode 100644
index 0000000..542c488
--- /dev/null
+++ b/src/views/ops/pages/alert/setting/edit/components/PolicySuppressionRuleEditor.vue
@@ -0,0 +1,366 @@
+<template>
+  <section class="suppression-rule-editor">
+    <button class="rule-header" type="button" @click="expanded = !expanded">
+      <span class="rule-header-main">
+        <icon-right class="fold-icon" :class="{ expanded }" />
+        <span>
+          <span class="rule-title">{{ rule.name || `抑制规则 ${index + 1}` }}</span>
+          <span class="rule-code">{{ rule.code || '待填写规则编码' }}</span>
+        </span>
+        <a-tag :color="rule.enabled ? 'green' : 'gray'">{{ rule.enabled ? '已启用' : '未启用' }}</a-tag>
+      </span>
+      <span class="rule-header-type">{{ typeLabel }}</span>
+    </button>
+
+    <div v-show="expanded" class="rule-content">
+      <div v-if="!readOnly" class="rule-actions">
+        <a-button type="text" status="danger" size="small" @click="emit('remove')">删除规则</a-button>
+      </div>
+
+      <a-row :gutter="12">
+        <a-col :span="12">
+          <a-form-item label="规则编码" required>
+            <a-input v-model="rule.code" placeholder="例如 DEDUP_HOST_ALERT" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="规则名称" required>
+            <a-input v-model="rule.name" placeholder="请输入规则名称" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <a-form-item label="抑制方式" required>
+        <div class="type-options">
+          <button
+            v-for="item in suppressionTypes"
+            :key="item.value"
+            type="button"
+            class="type-option"
+            :class="{ selected: rule.type === item.value }"
+            :disabled="readOnly"
+            @click="rule.type = item.value"
+          >
+            <span class="type-option-name">{{ item.label }}</span>
+            <span class="type-option-description">{{ typeDescriptions[item.value] }}</span>
+          </button>
+        </div>
+      </a-form-item>
+
+      <a-form-item label="当前告警匹配范围">
+        <MatcherConditionEditor :key="`matchers-${formVersion}`" ref="matchersEditorRef" :raw-value="rule.matchers" :read-only="readOnly" />
+        <template #extra>满足全部条件的当前策略告警才会被处理；不设条件时匹配当前策略全部告警。</template>
+      </a-form-item>
+
+      <template v-if="rule.type === 'dedup'">
+        <a-divider orientation="left">去重设置</a-divider>
+        <a-row :gutter="12">
+          <a-col :span="12">
+            <a-form-item label="去重窗口（秒）">
+              <a-input-number v-model="rule.dedup_window" :min="1" style="width: 100%" />
+              <template #extra>窗口内相同告警只保留首次通知。</template>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="去重键">
+              <a-select v-model="dedupKeys" multiple allow-create allow-search placeholder="请选择或输入字段">
+                <a-option v-for="item in groupingFieldOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </template>
+
+      <template v-if="rule.type === 'aggregate'">
+        <a-divider orientation="left">聚合设置</a-divider>
+        <a-row :gutter="12">
+          <a-col :span="8"><a-form-item label="聚合窗口（秒）"><a-input-number v-model="rule.aggregate_window" :min="1" style="width: 100%" /></a-form-item></a-col>
+          <a-col :span="8"><a-form-item label="聚合阈值"><a-input-number v-model="rule.aggregate_count" :min="1" style="width: 100%" /></a-form-item></a-col>
+          <a-col :span="8">
+            <a-form-item label="分组字段">
+              <a-select v-model="aggregateGroupBy" multiple allow-create allow-search placeholder="请选择或输入字段">
+                <a-option v-for="item in groupingFieldOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </template>
+
+      <template v-if="rule.type === 'dependency'">
+        <a-divider orientation="left">依赖抑制配置</a-divider>
+        <a-form-item label="上游告警匹配条件">
+          <MatcherConditionEditor :key="`source-${formVersion}`" ref="sourceMatchersEditorRef" :raw-value="rule.source_matchers" :read-only="readOnly" />
+          <template #extra>用于识别上游资源正在发生的告警。</template>
+        </a-form-item>
+        <a-form-item label="目标告警补充条件">
+          <MatcherConditionEditor :key="`target-${formVersion}`" ref="targetMatchersEditorRef" :raw-value="rule.target_matchers" :read-only="readOnly" />
+          <template #extra>与“当前告警匹配范围”同时成立，用于进一步缩小受影响告警的范围。</template>
+        </a-form-item>
+        <a-alert type="info">依赖关系由现有资源拓扑确定；此处只配置上游和目标告警范围。</a-alert>
+      </template>
+
+      <template v-if="rule.type === 'throttle'">
+        <a-divider orientation="left">限流设置</a-divider>
+        <a-row :gutter="12">
+          <a-col :span="12"><a-form-item label="限流次数"><a-input-number v-model="rule.throttle_count" :min="1" style="width: 100%" /></a-form-item></a-col>
+          <a-col :span="12"><a-form-item label="限流窗口（秒）"><a-input-number v-model="rule.throttle_window" :min="1" style="width: 100%" /></a-form-item></a-col>
+        </a-row>
+      </template>
+
+      <template v-if="rule.type === 'schedule'">
+        <a-divider orientation="left">时间计划</a-divider>
+        <ScheduleWindowEditor :key="`schedule-${formVersion}`" ref="scheduleEditorRef" :raw-value="rule.schedule" :read-only="readOnly" />
+      </template>
+
+      <a-form-item label="启用状态" class="enabled-field">
+        <a-switch v-model="rule.enabled" />
+      </a-form-item>
+    </div>
+  </section>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { SUPPRESSION_TYPE_OPTIONS, type PolicySuppressionRuleInput, type SuppressionType } from '@/api/ops/alertPolicy'
+import MatcherConditionEditor from '../../../suppress/components/MatcherConditionEditor.vue'
+import ScheduleWindowEditor from '../../../suppress/components/ScheduleWindowEditor.vue'
+
+interface StructuredEditor {
+  serialize: () => string
+}
+
+interface Props {
+  modelValue: PolicySuppressionRuleInput
+  index: number
+  readOnly?: boolean
+}
+
+const props = defineProps<Props>()
+const emit = defineEmits<{
+  (event: 'remove'): void
+}>()
+
+const defaultRule = (): PolicySuppressionRuleInput => ({
+  code: '',
+  name: '',
+  type: 'dedup',
+  enabled: true,
+  priority: 1,
+  dedup_window: 300,
+  dedup_keys: 'fingerprint',
+  aggregate_window: 300,
+  group_by: '',
+  aggregate_count: 5,
+  source_matchers: '{}',
+  target_matchers: '{}',
+  throttle_count: 1,
+  throttle_window: 300,
+  schedule: '{}',
+  matchers: '{}',
+})
+
+const rule = ref<PolicySuppressionRuleInput>(defaultRule())
+const expanded = ref(true)
+const formVersion = ref(0)
+const dedupKeys = ref<string[]>([])
+const aggregateGroupBy = ref<string[]>([])
+const matchersEditorRef = ref<StructuredEditor>()
+const sourceMatchersEditorRef = ref<StructuredEditor>()
+const targetMatchersEditorRef = ref<StructuredEditor>()
+const scheduleEditorRef = ref<StructuredEditor>()
+
+const groupingFieldOptions = [
+  { value: 'alertname', label: '告警名称' },
+  { value: 'fingerprint', label: '告警指纹' },
+  { value: 'policy_id', label: '告警策略' },
+  { value: 'rule_id', label: '告警规则' },
+  { value: 'resource_category', label: '资源类型' },
+  { value: 'server_identity', label: '服务/服务器标识' },
+  { value: 'ip', label: 'IP 地址' },
+]
+
+const suppressionTypes = SUPPRESSION_TYPE_OPTIONS as Array<{ value: SuppressionType; label: string }>
+const typeDescriptions: Record<SuppressionType, string> = {
+  dedup: '合并重复告警',
+  aggregate: '汇总同类告警',
+  dependency: '上游异常时抑制',
+  throttle: '限制通知频率',
+  schedule: '指定时段抑制',
+}
+const typeLabel = computed(() => suppressionTypes.find((item) => item.value === rule.value.type)?.label || '-')
+
+const splitFieldValues = (value?: string) =>
+  value
+    ?.split(',')
+    .map((item) => item.trim())
+    .filter(Boolean) || []
+
+watch(
+  () => props.modelValue,
+  (value) => {
+    rule.value = { ...defaultRule(), ...value }
+    dedupKeys.value = splitFieldValues(value.dedup_keys)
+    aggregateGroupBy.value = splitFieldValues(value.group_by)
+    formVersion.value += 1
+  },
+  { immediate: true, deep: true }
+)
+
+const serialize = (): PolicySuppressionRuleInput => {
+  const code = rule.value.code.trim()
+  const name = rule.value.name.trim()
+  if (!code) throw new Error(`请填写第 ${props.index + 1} 条抑制规则的规则编码`)
+  if (!name) throw new Error(`请填写第 ${props.index + 1} 条抑制规则的规则名称`)
+
+  const result: PolicySuppressionRuleInput = {
+    ...rule.value,
+    code,
+    name,
+    matchers: matchersEditorRef.value?.serialize() || '{}',
+    dedup_keys: dedupKeys.value.map((item) => item.trim()).filter(Boolean).join(','),
+    group_by: aggregateGroupBy.value.map((item) => item.trim()).filter(Boolean).join(','),
+  }
+  if (result.type === 'dependency') {
+    result.source_matchers = sourceMatchersEditorRef.value?.serialize() || '{}'
+    result.target_matchers = targetMatchersEditorRef.value?.serialize() || '{}'
+  }
+  if (result.type === 'schedule') result.schedule = scheduleEditorRef.value?.serialize() || '{}'
+  return result
+}
+
+defineExpose({ serialize })
+</script>
+
+<style scoped lang="less">
+.suppression-rule-editor {
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+  background: var(--color-bg-2);
+}
+
+.suppression-rule-editor + .suppression-rule-editor {
+  margin-top: 12px;
+}
+
+.rule-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  min-height: 52px;
+  padding: 10px 12px;
+  color: var(--color-text-1);
+  text-align: left;
+  background: transparent;
+  border: 0;
+  cursor: pointer;
+}
+
+.rule-header-main {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  gap: 8px;
+}
+
+.fold-icon {
+  flex: 0 0 auto;
+  color: var(--color-text-3);
+  transform: rotate(0deg);
+  transition: transform 0.16s ease;
+}
+
+.fold-icon.expanded {
+  transform: rotate(90deg);
+}
+
+.rule-title,
+.rule-code {
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.rule-title {
+  font-weight: 500;
+}
+
+.rule-code,
+.rule-header-type {
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.rule-header-type {
+  flex: 0 0 auto;
+  margin-left: 12px;
+}
+
+.rule-content {
+  padding: 0 14px 14px;
+  border-top: 1px solid var(--color-border-2);
+}
+
+.rule-actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 6px;
+}
+
+.type-options {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(112px, 1fr));
+  gap: 8px;
+}
+
+.type-option {
+  min-height: 62px;
+  padding: 9px 10px;
+  color: var(--color-text-2);
+  text-align: left;
+  background: var(--color-bg-2);
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.type-option:hover:not(:disabled) {
+  border-color: #b7d3ff;
+  background: #f8fbff;
+}
+
+.type-option.selected {
+  border-color: #165dff;
+  background: #f2f7ff;
+}
+
+.type-option:disabled {
+  cursor: not-allowed;
+}
+
+.type-option-name,
+.type-option-description {
+  display: block;
+}
+
+.type-option-name {
+  color: var(--color-text-1);
+  font-size: 13px;
+  font-weight: 500;
+}
+
+.type-option.selected .type-option-name {
+  color: #165dff;
+}
+
+.type-option-description {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.enabled-field {
+  margin-bottom: 0;
+}
+</style>
diff --git a/src/views/ops/pages/alert/setting/edit/index.vue b/src/views/ops/pages/alert/setting/edit/index.vue
new file mode 100644
index 0000000..f34d1b3
--- /dev/null
+++ b/src/views/ops/pages/alert/setting/edit/index.vue
@@ -0,0 +1,512 @@
+<template>
+  <div class="policy-edit-page">
+    <div class="page-header">
+      <div class="header-left">
+        <a-button type="text" @click="handleBack">
+          <template #icon><icon-left /></template>
+          返回列表
+        </a-button>
+        <a-divider direction="vertical" />
+        <h2 class="page-title">{{ pageTitle }}</h2>
+        <a-tag v-if="formData.isSystemPreset" color="arcoblue">系统预置</a-tag>
+      </div>
+      <a-space>
+        <a-button @click="handleBack">{{ readOnly ? '关闭' : '取消' }}</a-button>
+        <a-button v-if="!readOnly" type="primary" :loading="submitting" @click="handleSubmit">
+          {{ isEdit ? '保存' : '创建' }}
+        </a-button>
+      </a-space>
+    </div>
+
+    <div class="page-content">
+      <a-spin :loading="loading" style="width: 100%">
+        <a-alert v-if="formData.bindingCount > 0" type="warning" class="binding-alert">
+          当前策略已绑定 {{ formData.bindingCount }} 个资源。修改规则、启停状态或通知配置会影响这些资源，保存前请核对。
+        </a-alert>
+
+        <a-row :gutter="20">
+          <a-col :xs="24" :sm="24" :md="10" :lg="8">
+            <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical" :disabled="readOnly">
+              <a-card class="info-card" title="基础信息">
+                <a-form-item label="策略编码" field="code" required>
+                  <a-input v-model="formData.code" placeholder="例如 LINUX_SERVER_DEFAULT" :disabled="isEdit" />
+                  <template #extra>跨环境稳定标识，创建后不可修改</template>
+                </a-form-item>
+
+                <a-form-item label="策略名称" field="name" required>
+                  <a-input v-model="formData.name" placeholder="请输入策略名称" />
+                </a-form-item>
+
+                <a-form-item label="适用类型" field="category" required>
+                  <a-select v-model="formData.category" placeholder="请选择适用类型" :disabled="isEdit" @change="handleCategoryChange">
+                    <a-option v-for="item in POLICY_CATEGORIES" :key="item.value" :value="item.value">
+                      {{ item.label }}
+                    </a-option>
+                  </a-select>
+                  <template #extra>每种类型只显示自己的标准指标，创建后不可修改</template>
+                </a-form-item>
+
+                <a-form-item label="启用状态" field="enabled">
+                  <a-switch v-model="formData.enabled" />
+                </a-form-item>
+
+                <a-form-item label="管理标签" field="tagsList">
+                  <a-input-tag v-model="formData.tagsList" placeholder="输入后按回车添加" allow-clear />
+                  <template #extra>仅用于搜索和分类，不参与告警计算</template>
+                </a-form-item>
+
+                <a-form-item label="描述" field="description">
+                  <a-textarea v-model="formData.description" :max-length="500" :auto-size="{ minRows: 3, maxRows: 6 }" show-word-limit />
+                </a-form-item>
+              </a-card>
+
+              <a-card class="info-card" title="通知与工单">
+                <a-form-item label="通知渠道" field="channelIds">
+                  <a-select
+                    v-model="formData.channelIds"
+                    placeholder="请选择已启用的通知渠道"
+                    multiple
+                    allow-search
+                    :loading="optionsLoading"
+                  >
+                    <a-option v-for="item in channelOptions" :key="item.id" :value="item.id">
+                      {{ item.name }}（{{ item.type }}）
+                    </a-option>
+                  </a-select>
+                </a-form-item>
+
+                <a-form-item label="触发时自动建单" field="autoCreateTicket">
+                  <a-switch v-model="formData.autoCreateTicket" />
+                </a-form-item>
+
+                <a-form-item v-if="formData.autoCreateTicket" label="工单模板" field="feedbackTemplateId" required>
+                  <a-select v-model="formData.feedbackTemplateId" placeholder="请选择启用的工单模板" allow-search :loading="optionsLoading">
+                    <a-option v-for="item in feedbackTemplateOptions" :key="item.id" :value="item.id">
+                      {{ item.name }}（{{ item.code }}）
+                    </a-option>
+                  </a-select>
+                </a-form-item>
+              </a-card>
+
+              <a-card class="info-card">
+                <template #title>
+                  <span>策略专用抑制规则（{{ formData.suppressionRules.length }}）</span>
+                </template>
+                <template v-if="!readOnly" #extra>
+                  <a-button type="text" size="small" @click="addSuppressionRule">添加</a-button>
+                </template>
+
+                <a-empty v-if="formData.suppressionRules.length === 0" description="未配置专用抑制规则" />
+                <PolicySuppressionRuleEditor
+                  v-for="(item, index) in formData.suppressionRules"
+                  :key="item.code || index"
+                  ref="suppressionRuleEditorRefs"
+                  :model-value="item"
+                  :index="index"
+                  :read-only="readOnly"
+                  @remove="removeSuppressionRule(index)"
+                />
+              </a-card>
+            </a-form>
+          </a-col>
+
+          <a-col :xs="24" :sm="24" :md="14" :lg="16">
+            <a-card class="rules-card">
+              <template #title>
+                <a-space><span>告警规则</span><a-tag>{{ formData.rules.length }} 条</a-tag></a-space>
+              </template>
+              <template v-if="!readOnly" #extra>
+                <a-button type="primary" size="small" :disabled="!formData.category" @click="handleAddRule">
+                  <template #icon><icon-plus /></template>
+                  添加规则
+                </a-button>
+              </template>
+
+              <a-empty v-if="formData.rules.length === 0" description="请选择适用类型后添加规则" />
+              <RuleEditor
+                v-else
+                ref="ruleEditorRef"
+                v-model:rules="formData.rules"
+                :severity-options="severityOptions"
+                :policy-category="formData.category"
+                :read-only="readOnly"
+                @remove="handleRemoveRule"
+              />
+            </a-card>
+          </a-col>
+        </a-row>
+      </a-spin>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Message, Modal } from '@arco-design/web-vue'
+import type { FormInstance } from '@arco-design/web-vue/es/form'
+import RuleEditor from '../components/RuleEditor.vue'
+import PolicySuppressionRuleEditor from './components/PolicySuppressionRuleEditor.vue'
+import {
+  POLICY_CATEGORIES,
+  createPolicy,
+  fetchChannelList,
+  fetchFeedbackTemplateOptions,
+  fetchPolicyDetail,
+  fetchSeverityOptions,
+  getPolicyDataSource,
+  updatePolicy,
+  type AlertRuleInput,
+  type AlertSeverity,
+  type NotificationChannel,
+  type PolicyCategory,
+  type PolicySaveInput,
+  type PolicySuppressionRuleInput,
+} from '@/api/ops/alertPolicy'
+
+interface RuleItem extends AlertRuleInput {
+  id?: number
+}
+
+interface FormData {
+  code: string
+  name: string
+  category: PolicyCategory | ''
+  description: string
+  enabled: boolean
+  tagsList: string[]
+  autoCreateTicket: boolean
+  feedbackTemplateId?: number
+  channelIds: number[]
+  rules: RuleItem[]
+  suppressionRules: PolicySuppressionRuleInput[]
+  isSystemPreset: boolean
+  bindingCount: number
+}
+
+const route = useRoute()
+const router = useRouter()
+const policyId = computed(() => Number(route.query.id || 0))
+const isEdit = computed(() => policyId.value > 0)
+const readOnly = computed(() => route.query.mode === 'view')
+const pageTitle = computed(() => (readOnly.value ? '查看告警策略' : isEdit.value ? '编辑告警策略' : '新建告警策略'))
+
+const loading = ref(false)
+const submitting = ref(false)
+const optionsLoading = ref(false)
+const formRef = ref<FormInstance>()
+const ruleEditorRef = ref<{ validate: () => Promise<unknown> } | null>(null)
+const suppressionRuleEditorRefs = ref<Array<{ serialize: () => PolicySuppressionRuleInput }>>([])
+const channelOptions = ref<NotificationChannel[]>([])
+const severityOptions = ref<AlertSeverity[]>([])
+const feedbackTemplateOptions = ref<Array<{ id: number; name: string; code: string }>>([])
+
+const formData = ref<FormData>({
+  code: '',
+  name: '',
+  category: '',
+  description: '',
+  enabled: true,
+  tagsList: [],
+  autoCreateTicket: false,
+  feedbackTemplateId: undefined,
+  channelIds: [],
+  rules: [],
+  suppressionRules: [],
+  isSystemPreset: false,
+  bindingCount: 0,
+})
+
+const formRules = {
+  code: [
+    { required: true, message: '请输入策略编码' },
+    { match: /^[A-Za-z][A-Za-z0-9_-]{2,99}$/, message: '编码需以字母开头，长度 3 至 100 位' },
+  ],
+  name: [{ required: true, message: '请输入策略名称' }],
+  category: [{ required: true, message: '请选择适用类型' }],
+  feedbackTemplateId: [
+    {
+      validator: (value: number | undefined, callback: (error?: string) => void) => {
+        if (formData.value.autoCreateTicket && !value) callback('启用自动建单时必须选择工单模板')
+        else callback()
+      },
+    },
+  ],
+}
+
+const extractList = (res: any) => {
+  const details = res?.details
+  if (Array.isArray(details)) return details
+  if (Array.isArray(details?.data)) return details.data
+  if (Array.isArray(details?.list)) return details.list
+  if (Array.isArray(res?.data)) return res.data
+  return []
+}
+
+const loadOptions = async () => {
+  optionsLoading.value = true
+  try {
+    const [channelRes, severityRes, feedbackRes] = await Promise.all([
+      fetchChannelList({ enabled: true, page: 1, page_size: 1000 }),
+      fetchSeverityOptions({ enabled: 'true' }),
+      fetchFeedbackTemplateOptions({ status: 'active' }),
+    ])
+    channelOptions.value = extractList(channelRes)
+    severityOptions.value = extractList(severityRes)
+    feedbackTemplateOptions.value = extractList(feedbackRes).map((item: any) => ({
+      id: Number(item.id),
+      name: item.template_name || item.name || `工单模板-${item.id}`,
+      code: item.template_code || item.code || '',
+    }))
+  } catch (error) {
+    console.error('加载策略选项失败:', error)
+    Message.error('加载通知渠道、告警级别或工单模板失败')
+  } finally {
+    optionsLoading.value = false
+  }
+}
+
+const loadDetail = async () => {
+  if (!policyId.value) return
+  loading.value = true
+  try {
+    const res: any = await fetchPolicyDetail(policyId.value)
+    const detail = res?.details
+    if (res?.code !== 0 || !detail) throw new Error(res?.message || '告警策略不存在')
+    formData.value = {
+      code: detail.code,
+      name: detail.name,
+      category: detail.category,
+      description: detail.description || '',
+      enabled: Boolean(detail.enabled),
+      tagsList: (detail.tags || '').split(',').map((item: string) => item.trim()).filter(Boolean),
+      autoCreateTicket: Boolean(detail.auto_create_ticket),
+      feedbackTemplateId: detail.feedback_template_id || undefined,
+      channelIds: (detail.channels || []).map((item: NotificationChannel) => item.id),
+      rules: (detail.rules || []).map((item: any) => ({
+        id: item.id,
+        code: item.code,
+        name: item.name,
+        description: item.description || '',
+        rule_type: item.rule_type,
+        enabled: Boolean(item.enabled),
+        metric_name: item.metric_name,
+        data_source: item.data_source,
+        threshold: Number(item.threshold),
+        compare_op: item.compare_op,
+        duration: Number(item.duration),
+        eval_interval: Number(item.eval_interval),
+        baseline_config: item.baseline_config || '{}',
+        severity_code: item.severity?.code || '',
+        labels: item.labels || '{}',
+        annotations: item.annotations || '{}',
+      })),
+      suppressionRules: (detail.suppression_rules || []).map((item: any) => ({
+        code: item.code,
+        name: item.name,
+        description: item.description || '',
+        type: item.type,
+        enabled: Boolean(item.enabled),
+        priority: Number(item.priority || 1),
+        dedup_window: Number(item.dedup_window || 300),
+        dedup_keys: item.dedup_keys || '',
+        aggregate_window: Number(item.aggregate_window || 300),
+        group_by: item.group_by || '',
+        aggregate_count: Number(item.aggregate_count || 5),
+        source_matchers: item.source_matchers || '{}',
+        target_matchers: item.target_matchers || '{}',
+        throttle_count: Number(item.throttle_count || 1),
+        throttle_window: Number(item.throttle_window || 300),
+        schedule: item.schedule || '{}',
+        matchers: item.matchers || '{}',
+      })),
+      isSystemPreset: Boolean(detail.is_system_preset),
+      bindingCount: Number(detail.binding_count || 0),
+    }
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error.message || '获取告警策略失败')
+    handleBack()
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleCategoryChange = () => {
+  formData.value.rules = []
+}
+
+const handleAddRule = () => {
+  if (!formData.value.category) return
+  formData.value.rules.push({
+    code: '',
+    name: '',
+    description: '',
+    rule_type: 'static',
+    enabled: true,
+    metric_name: '',
+    data_source: getPolicyDataSource(formData.value.category),
+    threshold: 0,
+    compare_op: '>=',
+    duration: 300,
+    eval_interval: 60,
+    baseline_config: '{}',
+    severity_code: severityOptions.value[0]?.code || '',
+    labels: '{}',
+    annotations: '{}',
+  })
+}
+
+const handleRemoveRule = (index: number) => formData.value.rules.splice(index, 1)
+
+const addSuppressionRule = () => {
+  formData.value.suppressionRules.push({
+    code: '',
+    name: '',
+    description: '',
+    type: 'dedup',
+    enabled: true,
+    priority: 1,
+    dedup_window: 300,
+    dedup_keys: 'fingerprint',
+    aggregate_window: 300,
+    group_by: '',
+    aggregate_count: 5,
+    source_matchers: '{}',
+    target_matchers: '{}',
+    throttle_count: 1,
+    throttle_window: 300,
+    schedule: '{}',
+    matchers: '{}',
+  })
+}
+
+const removeSuppressionRule = (index: number) => formData.value.suppressionRules.splice(index, 1)
+
+const syncSuppressionRules = () => {
+  formData.value.suppressionRules = suppressionRuleEditorRefs.value.map((editor) => editor.serialize())
+}
+
+const save = async () => {
+  const payload: PolicySaveInput = {
+    code: formData.value.code,
+    name: formData.value.name,
+    description: formData.value.description,
+    category: formData.value.category as PolicyCategory,
+    tags: formData.value.tagsList.join(','),
+    enabled: formData.value.enabled,
+    auto_create_ticket: formData.value.autoCreateTicket,
+    feedback_template_id: formData.value.autoCreateTicket ? Number(formData.value.feedbackTemplateId) : 0,
+    channel_ids: formData.value.channelIds,
+    rules: formData.value.rules.map(({ id: _id, ...rule }) => rule),
+    suppression_rules: formData.value.suppressionRules,
+  }
+
+  submitting.value = true
+  try {
+    const res: any = isEdit.value ? await updatePolicy({ id: policyId.value, ...payload }) : await createPolicy(payload)
+    if (res?.code !== 0) throw new Error(res?.message || '保存告警策略失败')
+    Message.success(isEdit.value ? '告警策略已保存' : '告警策略已创建')
+    handleBack()
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error.message || '保存告警策略失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+const handleSubmit = async () => {
+  try {
+    await formRef.value?.validate()
+    if (formData.value.rules.length === 0) throw new Error('告警策略至少需要一条规则')
+    await ruleEditorRef.value?.validate()
+    syncSuppressionRules()
+  } catch (error: any) {
+    Message.warning(typeof error?.message === 'string' ? error.message : '请检查策略和规则配置')
+    return
+  }
+
+  if (isEdit.value && formData.value.bindingCount > 0) {
+    Modal.confirm({
+      title: '确认修改已绑定策略',
+      content: `该策略已绑定 ${formData.value.bindingCount} 个资源。保存后新配置将直接用于这些资源，是否继续？`,
+      onOk: save,
+    })
+    return
+  }
+  await save()
+}
+
+const handleBack = () => router.push('/alert/setting')
+
+watch(
+  () => formData.value.autoCreateTicket,
+  (enabled) => {
+    if (!enabled) formData.value.feedbackTemplateId = undefined
+  }
+)
+
+onMounted(async () => {
+  await loadOptions()
+  await loadDetail()
+})
+</script>
+
+<script lang="ts">
+export default { name: 'AlertPolicyEditPage' }
+</script>
+
+<style scoped lang="less">
+.policy-edit-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--color-fill-2);
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 16px 20px;
+  background-color: var(--color-bg-2);
+  border-bottom: 1px solid var(--color-border);
+
+  .header-left {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .page-title {
+    margin: 0;
+    font-size: 18px;
+    font-weight: 500;
+  }
+}
+
+.page-content {
+  flex: 1;
+  padding: 20px;
+  overflow: auto;
+}
+
+.binding-alert,
+.info-card {
+  margin-bottom: 16px;
+}
+
+.rules-card {
+  min-height: 560px;
+}
+
+@media (max-width: 768px) {
+  .page-header {
+    align-items: flex-start;
+    gap: 12px;
+  }
+
+  .page-content {
+    padding: 12px;
+  }
+}
+</style>
diff --git a/src/views/ops/pages/alert/setting/index.vue b/src/views/ops/pages/alert/setting/index.vue
index db6fcd8..fc7d481 100644
--- a/src/views/ops/pages/alert/setting/index.vue
+++ b/src/views/ops/pages/alert/setting/index.vue
@@ -8,178 +8,165 @@
       :loading="loading"
       :pagination="pagination"
       title="告警策略管理"
-      search-button-text="查询"
-      reset-button-text="重置"
       @update:form-model="handleFormModelUpdate"
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
-      @refresh="handleRefresh"
+      @refresh="fetchPolicyData"
     >
-      <!-- 序号 -->
       <template #index="{ rowIndex }">
         {{ rowIndex + 1 + (pagination.current - 1) * pagination.pageSize }}
       </template>
 
-      <!-- 策略名称 -->
       <template #name="{ record }">
         <a-space>
-          <a-tag v-if="!record.enabled" color="gray">禁用</a-tag>
+          <a-tag v-if="record.is_system_preset" color="arcoblue">系统预置</a-tag>
           <span>{{ record.name }}</span>
         </a-space>
       </template>
 
-      <!-- 启用状态 -->
+      <template #category="{ record }">
+        {{ categoryLabel(record.category) }}
+      </template>
+
       <template #enabled="{ record }">
-        <a-switch :model-value="record.enabled" :checked-value="true" :unchecked-value="false" @change="handleToggleEnabled(record)" />
+        <a-switch
+          :model-value="record.enabled"
+          :loading="toggleLoadingId === record.id"
+          @change="handleToggleEnabled(record)"
+        />
       </template>
 
-      <!-- 规则数 -->
-      <template #rule_count="{ record }">
-        <span>{{ record.rules?.length || 0 }} 条</span>
-      </template>
+      <template #rule_count="{ record }">{{ record.rules?.length || 0 }} 条</template>
+      <template #channel_count="{ record }">{{ record.channels?.length || 0 }} 个</template>
+      <template #binding_count="{ record }">{{ record.binding_count || 0 }} 个</template>
 
-      <!-- 通知渠道数 -->
-      <template #channel_count="{ record }">
-        <span>{{ record.channels?.length || 0 }} 个</span>
-      </template>
-
-      <!-- 抑制规则数 -->
-      <template #suppression_rule_count="{ record }">
-        <span>{{ record.suppression_rules?.length || 0 }} 条</span>
-      </template>
-
-      <!-- 自动建单 -->
       <template #auto_create_ticket="{ record }">
         <a-tag :color="record.auto_create_ticket ? 'green' : 'gray'">
           {{ record.auto_create_ticket ? '是' : '否' }}
         </a-tag>
       </template>
 
-      <!-- 创建时间 -->
-      <template #created_at="{ record }">
-        {{ formatDate(record.created_at) }}
-      </template>
+      <template #updated_at="{ record }">{{ formatDate(record.updated_at) }}</template>
 
-      <!-- 最后修改 -->
-      <template #updated_at="{ record }">
-        {{ formatDate(record.updated_at) }}
-      </template>
-
-      <!-- 操作 -->
       <template #actions="{ record }">
-        <a-space>
+        <a-space wrap>
+          <a-button type="text" size="small" @click="handleView(record)">查看</a-button>
           <a-button type="text" size="small" @click="handleEdit(record)">编辑</a-button>
-          <a-button type="text" size="small" @click="handleManageRules(record)">规则管理</a-button>
-          <a-popconfirm content="确定要删除该策略吗？删除后将无法恢复，且会影响告警评估。" @ok="handleDelete(record)">
-            <a-button type="text" size="small" status="danger">删除</a-button>
+          <a-button type="text" size="small" @click="openCopy(record)">复制</a-button>
+          <a-button type="text" size="small" @click="handleExport(record)">导出</a-button>
+          <a-popconfirm
+            v-if="!record.is_system_preset"
+            :content="record.binding_count > 0 ? `策略已绑定 ${record.binding_count} 个资源，不能删除` : '确定删除该告警策略吗？历史告警不会删除。'"
+            :disabled="record.binding_count > 0"
+            @ok="handleDelete(record)"
+          >
+            <a-button type="text" size="small" status="danger" :disabled="record.binding_count > 0">删除</a-button>
           </a-popconfirm>
         </a-space>
       </template>
 
-      <!-- 工具栏左侧按钮 -->
       <template #toolbar-left>
-        <a-button type="primary" @click="handleCreate">
-          <template #icon>
-            <icon-plus />
-          </template>
-          新建策略
-        </a-button>
+        <a-space>
+          <a-button type="primary" @click="handleCreate">
+            <template #icon><icon-plus /></template>
+            新建策略
+          </a-button>
+          <a-button @click="chooseImportFile">导入策略</a-button>
+          <input ref="importFileRef" class="hidden-file" type="file" accept="application/json,.json" @change="handleImportFile" />
+        </a-space>
       </template>
     </search-table>
 
-    <!-- 编辑策略弹窗 -->
-    <policy-form-dialog v-model:visible="policyFormVisible" :policy-id="currentPolicyId" @success="handlePolicyFormSuccess" />
+    <a-modal v-model:visible="copyVisible" title="复制告警策略" :ok-loading="copyLoading" @ok="handleCopy">
+      <a-form :model="copyForm" layout="vertical">
+        <a-form-item label="新策略编码" required>
+          <a-input v-model="copyForm.code" placeholder="请输入唯一策略编码" />
+        </a-form-item>
+        <a-form-item label="新策略名称" required>
+          <a-input v-model="copyForm.name" placeholder="请输入策略名称" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
 
-    <!-- 新建策略弹窗 -->
-    <policy-create-dialog v-model:visible="createPolicyVisible" @success="handlePolicyFormSuccess" />
-
-    <!-- 规则管理弹窗 -->
-    <rule-manage-dialog
-      v-model:visible="ruleManageVisible"
-      :policy-id="currentPolicyId"
-      :policy-name="currentPolicyName"
-      @success="handleRuleManageSuccess"
-    />
+    <a-modal v-model:visible="importVisible" title="导入告警策略" :ok-loading="importLoading" @ok="handleImport">
+      <a-alert type="info" class="import-tip">
+        导入后策略默认禁用。编码冲突时请在此填写新编码；通知渠道、告警级别和工单模板必须已存在。
+      </a-alert>
+      <a-form :model="importForm" layout="vertical">
+        <a-form-item label="策略编码" required>
+          <a-input v-model="importForm.code" placeholder="请输入唯一策略编码" />
+        </a-form-item>
+        <a-form-item label="策略名称" required>
+          <a-input v-model="importForm.name" />
+        </a-form-item>
+        <a-form-item label="适用类型">
+          <a-input :model-value="categoryLabel(importForm.category)" disabled />
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed, onMounted } from 'vue'
+import { computed, reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
-import { IconPlus } from '@arco-design/web-vue/es/icon'
-import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
 import { searchFormConfig } from './config/search-form'
 import { columns as columnsConfig } from './config/columns'
-import { fetchPolicyList, deletePolicy, updatePolicy } from '@/api/ops/alertPolicy'
-import PolicyFormDialog from './components/PolicyFormDialog.vue'
-import PolicyCreateDialog from './components/PolicyCreateDialog.vue'
-import RuleManageDialog from './components/RuleManageDialog.vue'
+import {
+  POLICY_CATEGORIES,
+  copyPolicy,
+  deletePolicy,
+  exportPolicy,
+  fetchPolicyList,
+  importPolicy,
+  updatePolicy,
+  type AlertPolicy,
+  type PolicyCategory,
+  type PolicyDocument,
+} from '@/api/ops/alertPolicy'
 
-// 状态管理
+const router = useRouter()
 const loading = ref(false)
-const tableData = ref<any[]>([])
-
-const formModel = ref({
-  keyword: '',
-  enabled: 'all',
-  priority: undefined,
-})
-
-const pagination = reactive({
-  current: 1,
-  pageSize: 20,
-  total: 0,
-})
-
-// 表单项配置
-const formItems = computed<FormItem[]>(() => searchFormConfig)
-
-// 表格列配置
+const tableData = ref<AlertPolicy[]>([])
+const toggleLoadingId = ref(0)
+const formModel = ref({ keyword: '', enabled: 'all', category: '' })
+const pagination = reactive({ current: 1, pageSize: 20, total: 0 })
+const formItems = computed(() => searchFormConfig)
 const columns = computed(() => columnsConfig)
 
-// 当前选中的策略
-const currentPolicyId = ref<number | undefined>(undefined)
-const currentPolicyName = ref('')
+const copyVisible = ref(false)
+const copyLoading = ref(false)
+const copyForm = reactive({ sourceId: 0, code: '', name: '' })
 
-// 弹窗可见性
-const policyFormVisible = ref(false)
-const createPolicyVisible = ref(false)
-const ruleManageVisible = ref(false)
+const importFileRef = ref<HTMLInputElement>()
+const importVisible = ref(false)
+const importLoading = ref(false)
+const importDocument = ref<PolicyDocument | null>(null)
+const importForm = reactive({ code: '', name: '', category: '' })
+
+const responseMessage = (error: any, fallback: string) => error?.response?.data?.message || error?.message || fallback
+
+const categoryLabel = (category: string) => POLICY_CATEGORIES.find((item) => item.value === category)?.label || category || '-'
 
-// 获取策略列表
 const fetchPolicyData = async () => {
   loading.value = true
-
   try {
     const params: any = {
       page: pagination.current,
       page_size: pagination.pageSize,
       keyword: formModel.value.keyword || undefined,
+      category: formModel.value.category || undefined,
     }
-
-    // 处理启用状态筛选
-    if (formModel.value.enabled && formModel.value.enabled !== 'all') {
-      params.enabled = formModel.value.enabled === 'true'
-    }
-
-    // 处理优先级筛选
-    if (formModel.value.priority !== undefined && formModel.value.priority !== null) {
-      params.priority = Number(formModel.value.priority)
-    }
-
-    const res = await fetchPolicyList(params)
-
-    // 优先适配分页层字段：total/page/page_size/data，并兼容历史返回结构
-    const pageData = res?.data?.data ?? res?.details?.data ?? res?.data ?? []
-    const pageTotal = res?.data?.total ?? res?.details?.total ?? res?.total ?? 0
-
-    tableData.value = Array.isArray(pageData) ? pageData : []
-    pagination.total = Number(pageTotal) || 0
+    if (formModel.value.enabled !== 'all') params.enabled = formModel.value.enabled === 'true'
+    const res: any = await fetchPolicyList(params)
+    const page = res?.details || res?.data || {}
+    tableData.value = Array.isArray(page?.data) ? page.data : []
+    pagination.total = Number(page?.total || 0)
   } catch (error) {
-    console.error('获取告警策略列表失败:', error)
-    Message.error('获取告警策略列表失败')
+    Message.error(responseMessage(error, '获取告警策略失败'))
     tableData.value = []
     pagination.total = 0
   } finally {
@@ -187,134 +174,154 @@ const fetchPolicyData = async () => {
   }
 }
 
-// 格式化日期
-const formatDate = (dateStr: string) => {
-  if (!dateStr) return ''
-  const date = new Date(dateStr)
-  return date.toLocaleString('zh-CN', {
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-  })
-}
-
-// 搜索
+const formatDate = (value: string) => (value ? new Date(value).toLocaleString('zh-CN') : '-')
+const handleFormModelUpdate = (value: any) => Object.assign(formModel.value, value)
 const handleSearch = () => {
   pagination.current = 1
   fetchPolicyData()
 }
-
-// 处理表单模型更新
-const handleFormModelUpdate = (value: any) => {
-  formModel.value = {
-    ...formModel.value,
-    ...value,
-  }
-}
-
-// 重置
 const handleReset = () => {
-  formModel.value = {
-    keyword: '',
-    enabled: 'all',
-    priority: undefined,
-  }
+  formModel.value = { keyword: '', enabled: 'all', category: '' }
   pagination.current = 1
   fetchPolicyData()
 }
-
-// 分页变化
 const handlePageChange = (current: number) => {
   pagination.current = current
   fetchPolicyData()
 }
 
-// 刷新
-const handleRefresh = () => {
-  fetchPolicyData()
-  Message.success('数据已刷新')
-}
+const handleCreate = () => router.push('/alert/setting/edit')
+const handleView = (record: AlertPolicy) => router.push({ path: '/alert/setting/edit', query: { id: record.id, mode: 'view' } })
+const handleEdit = (record: AlertPolicy) => router.push({ path: '/alert/setting/edit', query: { id: record.id } })
 
-// 新建策略
-const handleCreate = () => {
-  createPolicyVisible.value = true
-}
-
-// 编辑策略
-const handleEdit = (record: any) => {
-  currentPolicyId.value = record.id
-  policyFormVisible.value = true
-}
-
-// 切换启用状态
-const handleToggleEnabled = async (record: any) => {
+const handleToggleEnabled = async (record: AlertPolicy) => {
+  toggleLoadingId.value = record.id
   try {
-    const newStatus = !record.enabled
-    await updatePolicy({
-      id: record.id,
-      enabled: newStatus,
-    })
-
-    Message.success(newStatus ? '策略已启用' : '策略已禁用')
-    record.enabled = newStatus
+    const res: any = await updatePolicy({ id: record.id, enabled: !record.enabled })
+    if (res?.code !== 0) throw new Error(res?.message || '更新失败')
+    record.enabled = !record.enabled
+    Message.success(record.enabled ? '策略已启用' : '策略已禁用')
   } catch (error) {
-    console.error('更新策略状态失败:', error)
-    Message.error('更新策略状态失败')
+    Message.error(responseMessage(error, '更新策略状态失败'))
+  } finally {
+    toggleLoadingId.value = 0
   }
 }
 
-// 删除策略
-const handleDelete = async (record: any) => {
-  try {
-    await deletePolicy(record.id)
-    Message.success('策略删除成功')
+const openCopy = (record: AlertPolicy) => {
+  copyForm.sourceId = record.id
+  copyForm.code = `${record.code}_COPY`
+  copyForm.name = `${record.name}（副本）`
+  copyVisible.value = true
+}
 
-    // 如果当前页只有一条数据，且不是第一页，则跳到上一页
-    if (tableData.value.length === 1 && pagination.current > 1) {
-      pagination.current--
+const handleCopy = async () => {
+  if (!copyForm.code.trim() || !copyForm.name.trim()) {
+    Message.warning('请填写新策略编码和名称')
+    return false
+  }
+  copyLoading.value = true
+  try {
+    const res: any = await copyPolicy({ source_id: copyForm.sourceId, code: copyForm.code, name: copyForm.name })
+    if (res?.code !== 0) throw new Error(res?.message || '复制失败')
+    Message.success('告警策略已复制')
+    copyVisible.value = false
+    await fetchPolicyData()
+    return true
+  } catch (error) {
+    Message.error(responseMessage(error, '复制告警策略失败'))
+    return false
+  } finally {
+    copyLoading.value = false
+  }
+}
+
+const handleExport = async (record: AlertPolicy) => {
+  try {
+    const res: any = await exportPolicy(record.id)
+    if (res?.code !== 0 || !res?.details) throw new Error(res?.message || '导出失败')
+    const blob = new Blob([JSON.stringify(res.details, null, 2)], { type: 'application/json;charset=utf-8' })
+    const url = URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = `${record.code}.json`
+    link.click()
+    URL.revokeObjectURL(url)
+  } catch (error) {
+    Message.error(responseMessage(error, '导出告警策略失败'))
+  }
+}
+
+const chooseImportFile = () => importFileRef.value?.click()
+
+const handleImportFile = async (event: Event) => {
+  const input = event.target as HTMLInputElement
+  const file = input.files?.[0]
+  input.value = ''
+  if (!file) return
+  try {
+    const document = JSON.parse(await file.text()) as PolicyDocument
+    if (document.format !== 'ops-alert-policy' || document.version !== 1 || !document.policy) {
+      throw new Error('不是受支持的告警策略文件')
     }
-
-    fetchPolicyData()
-  } catch (error) {
-    console.error('删除策略失败:', error)
-    Message.error('删除策略失败')
+    importDocument.value = document
+    importForm.code = String(document.policy.code || '')
+    importForm.name = String(document.policy.name || '')
+    importForm.category = String(document.policy.category || '')
+    importVisible.value = true
+  } catch (error: any) {
+    Message.error(error.message || '读取策略文件失败')
   }
 }
 
-// 规则管理
-const handleManageRules = (record: any) => {
-  currentPolicyId.value = record.id
-  currentPolicyName.value = record.name
-  ruleManageVisible.value = true
+const handleImport = async () => {
+  if (!importDocument.value || !importForm.code.trim() || !importForm.name.trim()) {
+    Message.warning('请填写策略编码和名称')
+    return false
+  }
+  importLoading.value = true
+  try {
+    const document: PolicyDocument = JSON.parse(JSON.stringify(importDocument.value))
+    document.policy.code = importForm.code
+    document.policy.name = importForm.name
+    const res: any = await importPolicy(document)
+    if (res?.code !== 0) throw new Error(res?.message || '导入失败')
+    Message.success('告警策略已导入，当前为禁用状态')
+    importVisible.value = false
+    await fetchPolicyData()
+    return true
+  } catch (error) {
+    Message.error(responseMessage(error, '导入告警策略失败'))
+    return false
+  } finally {
+    importLoading.value = false
+  }
 }
 
-// 策略表单成功回调
-const handlePolicyFormSuccess = () => {
-  fetchPolicyData()
+const handleDelete = async (record: AlertPolicy) => {
+  try {
+    const res: any = await deletePolicy(record.id)
+    if (res?.code !== 0) throw new Error(res?.message || '删除失败')
+    Message.success('告警策略已删除')
+    await fetchPolicyData()
+  } catch (error) {
+    Message.error(responseMessage(error, '删除告警策略失败'))
+  }
 }
 
-// 规则管理成功回调
-const handleRuleManageSuccess = () => {
-  fetchPolicyData()
-}
-
-// 初始化加载数据
-onMounted(() => {
-  fetchPolicyData()
-})
-</script>
-
-<script lang="ts">
-export default {
-  name: 'AlertPolicySetting',
-}
+fetchPolicyData()
 </script>
 
 <style scoped lang="less">
 .container {
-  margin-top: 20px;
+  padding: 20px;
+}
+
+.hidden-file {
+  display: none;
+}
+
+.import-tip {
+  margin-bottom: 16px;
 }
 </style>
diff --git a/src/views/ops/pages/alert/suppress/components/MatcherConditionEditor.vue b/src/views/ops/pages/alert/suppress/components/MatcherConditionEditor.vue
new file mode 100644
index 0000000..4717a0b
--- /dev/null
+++ b/src/views/ops/pages/alert/suppress/components/MatcherConditionEditor.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="matcher-editor">
+    <div v-if="conditions.length" class="matcher-list">
+      <div v-for="(condition, index) in conditions" :key="condition.id" class="matcher-row" :class="{ 'has-custom-key': condition.field === 'label' }">
+        <a-select v-model="condition.field" class="matcher-field" :disabled="readOnly" @change="resetCustomKey(condition)">
+          <a-option v-for="item in fieldOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+        </a-select>
+        <a-input v-if="condition.field === 'label'" v-model="condition.key" class="matcher-label-key" placeholder="标签名，例如 env" :disabled="readOnly" />
+        <a-input v-model="condition.value" class="matcher-value" :placeholder="valuePlaceholder(condition)" :disabled="readOnly" />
+        <a-button v-if="!readOnly" type="text" status="danger" @click="conditions.splice(index, 1)">删除</a-button>
+      </div>
+    </div>
+    <div v-else class="empty-tip">未设置条件，表示匹配全部告警。</div>
+    <a-button v-if="!readOnly" type="outline" size="small" @click="addCondition">添加条件</a-button>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, ref, watch } from 'vue'
+
+type MatcherField = 'alertname' | 'severity' | 'fingerprint' | 'resource_uid' | 'resource_category' | 'server_identity' | 'ip' | 'label'
+
+interface MatcherCondition {
+  id: number
+  field: MatcherField
+  key: string
+  value: string
+}
+
+interface Props {
+  rawValue?: string
+  readOnly?: boolean
+}
+
+const props = defineProps<Props>()
+const readOnly = computed(() => props.readOnly)
+
+const fieldOptions: Array<{ value: MatcherField; label: string }> = [
+  { value: 'alertname', label: '告警名称' },
+  { value: 'severity', label: '告警级别' },
+  { value: 'fingerprint', label: '告警指纹' },
+  { value: 'resource_uid', label: '资源 UID' },
+  { value: 'resource_category', label: '资源类型' },
+  { value: 'server_identity', label: '服务/服务器标识' },
+  { value: 'ip', label: 'IP 地址' },
+  { value: 'label', label: '自定义标签' },
+]
+
+const conditions = ref<MatcherCondition[]>([])
+let sequence = 0
+
+const matcherFieldSet = new Set(fieldOptions.map((item) => item.value))
+
+const createCondition = (field: MatcherField = 'alertname', key = '', value = ''): MatcherCondition => ({
+  id: sequence++,
+  field,
+  key,
+  value,
+})
+
+const parseMatchers = (rawValue?: string): MatcherCondition[] => {
+  const raw = rawValue?.trim() || '{}'
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(raw)
+  } catch {
+    throw new Error('匹配条件数据无效')
+  }
+  if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') throw new Error('匹配条件必须是对象')
+
+  const result: MatcherCondition[] = []
+  for (const [key, rawValue] of Object.entries(parsed as Record<string, unknown>)) {
+    if (key === 'labels') {
+      if (!rawValue || Array.isArray(rawValue) || typeof rawValue !== 'object') throw new Error('标签条件数据无效')
+      for (const [labelKey, labelValue] of Object.entries(rawValue as Record<string, unknown>)) {
+        if (labelValue === null || typeof labelValue === 'object') throw new Error('标签条件值无效')
+        result.push(createCondition('label', labelKey, String(labelValue)))
+      }
+      continue
+    }
+    if (rawValue === null || typeof rawValue === 'object') throw new Error('匹配条件值无效')
+    const normalizedKey = key === 'alert_name' ? 'alertname' : key === 'service_identity' ? 'server_identity' : key
+    const field = matcherFieldSet.has(normalizedKey as MatcherField) ? (normalizedKey as MatcherField) : 'label'
+    result.push(createCondition(field, field === 'label' ? key : '', String(rawValue)))
+  }
+  return result
+}
+
+const serialize = (): string => {
+  const result: Record<string, string> = {}
+  for (const [index, condition] of conditions.value.entries()) {
+    const key = (condition.field === 'label' ? condition.key : condition.field).trim()
+    const value = condition.value.trim()
+    if (!key && !value) throw new Error(`请填写第 ${index + 1} 条匹配条件`)
+    if (!key || !value) throw new Error(`请完整填写第 ${index + 1} 条匹配条件`)
+    if (key in result) throw new Error(`匹配字段重复：${key}`)
+    result[key] = value
+  }
+  return JSON.stringify(result)
+}
+
+const addCondition = () => {
+  conditions.value.push(createCondition())
+}
+
+const resetCustomKey = (condition: MatcherCondition) => {
+  if (condition.field !== 'label') condition.key = ''
+}
+
+const valuePlaceholder = (condition: MatcherCondition) => {
+  if (condition.field === 'severity') return '例如 warning|critical'
+  if (condition.field === 'label') return '标签值，例如 production'
+  return '请输入匹配值'
+}
+
+watch(
+  () => props.rawValue,
+  (value) => {
+    conditions.value = parseMatchers(value)
+  },
+  { immediate: true }
+)
+
+defineExpose({ serialize })
+</script>
+
+<style scoped lang="less">
+.matcher-editor {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  width: 100%;
+  min-width: 0;
+  gap: 8px;
+}
+
+.matcher-list {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  gap: 8px;
+}
+
+.matcher-row {
+  display: grid;
+  grid-template-columns: minmax(0, 0.8fr) minmax(0, 1.2fr) auto;
+  width: 100%;
+  min-width: 0;
+  gap: 8px;
+  align-items: center;
+}
+
+.matcher-field,
+.matcher-label-key,
+.matcher-value {
+  width: 100%;
+  min-width: 0;
+}
+
+.has-custom-key {
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) auto;
+}
+
+.has-custom-key .matcher-field {
+  grid-column: 1 / 3;
+}
+
+.has-custom-key .matcher-label-key {
+  grid-column: 1;
+}
+
+.has-custom-key .matcher-value {
+  grid-column: 2;
+}
+
+.has-custom-key :deep(.arco-btn) {
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.empty-tip {
+  padding: 8px 10px;
+  color: var(--color-text-3);
+  background: var(--color-fill-2);
+  border-radius: 3px;
+  font-size: 12px;
+}
+</style>
diff --git a/src/views/ops/pages/alert/suppress/components/ScheduleWindowEditor.vue b/src/views/ops/pages/alert/suppress/components/ScheduleWindowEditor.vue
new file mode 100644
index 0000000..3e95c96
--- /dev/null
+++ b/src/views/ops/pages/alert/suppress/components/ScheduleWindowEditor.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="schedule-editor">
+    <a-form-item label="时区" required>
+      <a-input v-model="schedule.timezone" placeholder="例如 Asia/Shanghai" :disabled="readOnly" />
+      <template #extra>使用 IANA 时区名称，例如 Asia/Shanghai。</template>
+    </a-form-item>
+
+    <div class="window-list">
+      <section v-for="(window, index) in schedule.windows" :key="window.id" class="window-card">
+        <div class="window-card-header">
+          <span>时间段 {{ index + 1 }}</span>
+          <a-button v-if="!readOnly" type="text" status="danger" size="small" @click="schedule.windows.splice(index, 1)">删除</a-button>
+        </div>
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="开始时间" required>
+              <a-time-picker v-model="window.start" placeholder="请选择" format="HH:mm" value-format="HH:mm" style="width: 100%" :disabled="readOnly" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="结束时间" required>
+              <a-time-picker v-model="window.end" placeholder="请选择" format="HH:mm" value-format="HH:mm" style="width: 100%" :disabled="readOnly" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="适用星期">
+              <a-checkbox-group v-model="window.weekdays" :disabled="readOnly">
+                <a-checkbox v-for="day in weekdayOptions" :key="day.value" :value="day.value">{{ day.label }}</a-checkbox>
+              </a-checkbox-group>
+              <template #extra>未选择星期时，表示每天生效；结束时间早于开始时间时表示跨天。</template>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </section>
+    </div>
+    <a-button v-if="!readOnly" type="outline" @click="addWindow">添加时间段</a-button>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, reactive, watch } from 'vue'
+
+interface ScheduleWindow {
+  id: number
+  start: string
+  end: string
+  weekdays: number[]
+}
+
+interface ScheduleDraft {
+  timezone: string
+  windows: ScheduleWindow[]
+}
+
+interface Props {
+  rawValue?: string
+  readOnly?: boolean
+}
+
+const props = defineProps<Props>()
+const readOnly = computed(() => props.readOnly)
+
+const weekdayOptions = [
+  { value: 1, label: '周一' },
+  { value: 2, label: '周二' },
+  { value: 3, label: '周三' },
+  { value: 4, label: '周四' },
+  { value: 5, label: '周五' },
+  { value: 6, label: '周六' },
+  { value: 7, label: '周日' },
+]
+
+const schedule = reactive<ScheduleDraft>({ timezone: 'Asia/Shanghai', windows: [] })
+let sequence = 0
+
+const createWindow = (start = '', end = '', weekdays: number[] = []): ScheduleWindow => ({
+  id: sequence++,
+  start,
+  end,
+  weekdays,
+})
+
+const resetSchedule = (rawValue?: string) => {
+  const raw = rawValue?.trim() || '{}'
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(raw)
+  } catch {
+    throw new Error('时间计划数据无效')
+  }
+  if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') throw new Error('时间计划必须是对象')
+  const value = parsed as Record<string, unknown>
+  const rawWindows = value.windows
+  if (rawWindows !== undefined && !Array.isArray(rawWindows)) throw new Error('时间计划的时间段数据无效')
+
+  schedule.timezone = typeof value.timezone === 'string' ? value.timezone : 'Asia/Shanghai'
+  schedule.windows = (rawWindows || []).map((item) => {
+    if (!item || Array.isArray(item) || typeof item !== 'object') throw new Error('时间计划的时间段数据无效')
+    const window = item as Record<string, unknown>
+    if (typeof window.start !== 'string' || typeof window.end !== 'string') throw new Error('时间计划的时间段数据无效')
+    if (window.weekdays !== undefined && (!Array.isArray(window.weekdays) || !window.weekdays.every((day) => Number.isInteger(day)))) {
+      throw new Error('时间计划的星期数据无效')
+    }
+    return createWindow(window.start, window.end, (window.weekdays as number[] | undefined) || [])
+  })
+}
+
+const addWindow = () => {
+  schedule.windows.push(createWindow())
+}
+
+const serialize = (): string => {
+  const timezone = schedule.timezone.trim()
+  if (!timezone) throw new Error('请填写时区')
+  if (!schedule.windows.length) throw new Error('请至少添加一个时间段')
+
+  const windows = schedule.windows.map((window, index) => {
+    if (!window.start || !window.end) throw new Error(`请完整填写第 ${index + 1} 个时间段`)
+    if (window.weekdays.some((day) => !Number.isInteger(day) || day < 1 || day > 7)) throw new Error(`第 ${index + 1} 个时间段的星期无效`)
+    return { start: window.start, end: window.end, weekdays: [...window.weekdays].sort((left, right) => left - right) }
+  })
+  return JSON.stringify({ timezone, windows })
+}
+
+watch(
+  () => props.rawValue,
+  (value) => resetSchedule(value),
+  { immediate: true }
+)
+
+defineExpose({ serialize })
+</script>
+
+<style scoped lang="less">
+.schedule-editor {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.window-list {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.window-card {
+  padding: 14px 14px 2px;
+  background: var(--color-fill-1);
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+}
+
+.window-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+  color: var(--color-text-2);
+  font-size: 13px;
+  font-weight: 500;
+}
+</style>
diff --git a/src/views/ops/pages/alert/suppress/components/SuppressionModal.vue b/src/views/ops/pages/alert/suppress/components/SuppressionModal.vue
index 1e774cd..f98e45d 100644
--- a/src/views/ops/pages/alert/suppress/components/SuppressionModal.vue
+++ b/src/views/ops/pages/alert/suppress/components/SuppressionModal.vue
@@ -2,7 +2,7 @@
   <a-modal
     :visible="visible"
     :title="title"
-    :width="800"
+    :width="920"
     :ok-loading="submitting"
     :mask-closable="false"
     @ok="handleOk"
@@ -10,67 +10,55 @@
   >
     <a-form ref="formRef" :model="formData" :rules="rules" layout="vertical">
       <a-row :gutter="16">
-        <!-- 基本信息 -->
         <a-col :span="12">
           <a-form-item label="规则名称" field="name" :rules="[{ required: true, message: '请输入规则名称' }]">
             <a-input v-model="formData.name" placeholder="请输入规则名称" :max-length="100" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="抑制类型" field="type" :rules="[{ required: true, message: '请选择抑制类型' }]">
-            <a-select v-model="formData.type" placeholder="请选择抑制类型" :disabled="isEdit">
-              <a-option v-for="item in SUPPRESSION_TYPE_OPTIONS" :key="item.value" :value="item.value">
-                {{ item.label }}
-              </a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
         <a-col :span="12">
           <a-form-item label="优先级" field="priority">
             <a-input-number v-model="formData.priority" placeholder="数值越小越先匹配" :min="1" :max="10000" style="width: 100%" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <a-form-item label="关联策略" field="policy_id">
-            <a-select v-model="formData.policy_id" placeholder="选择策略或留空表示全局" allow-clear allow-search>
-              <a-option :value="0">
-                <a-tag color="gray">全局</a-tag>
-              </a-option>
-              <a-option v-for="policy in policyOptions" :key="policy.id" :value="policy.id">
-                {{ policy.name }}
-              </a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
         <a-col :span="12">
           <a-form-item label="启用状态" field="enabled">
             <a-switch v-model="formData.enabled" />
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="描述" field="description">
+            <a-input v-model="formData.description" placeholder="请输入规则描述" :max-length="500" />
+          </a-form-item>
+        </a-col>
       </a-row>
 
-      <a-form-item label="描述" field="description">
-        <a-textarea v-model="formData.description" placeholder="请输入规则描述" :max-length="500" :auto-size="{ minRows: 2, maxRows: 4 }" />
+      <a-divider orientation="left">抑制方式</a-divider>
+      <a-form-item field="type" :rules="[{ required: true, message: '请选择抑制类型' }]">
+        <div class="type-options" :class="{ disabled: isEdit }">
+          <button
+            v-for="item in suppressionTypes"
+            :key="item.value"
+            type="button"
+            class="type-option"
+            :class="{ selected: formData.type === item.value }"
+            :disabled="isEdit"
+            @click="selectType(item.value)"
+          >
+            <span class="type-option-name">{{ item.label }}</span>
+            <span class="type-option-description">{{ typeDescriptions[item.value] }}</span>
+          </button>
+        </div>
+        <template #extra>{{ isEdit ? '规则创建后不可更换抑制方式。' : '选择后展示该方式所需的配置项。' }}</template>
       </a-form-item>
 
-      <!-- 匹配条件 -->
-      <a-form-item label="匹配条件 (JSON)" field="matchers">
-        <a-textarea
-          v-model="formData.matchers"
-          placeholder="JSON 格式的匹配条件，如 {} 表示全部告警"
-          :auto-size="{ minRows: 3, maxRows: 6 }"
-        />
+      <a-divider orientation="left">当前告警匹配范围</a-divider>
+      <a-form-item field="matchers">
+        <MatcherConditionEditor :key="`matchers-${formVersion}`" ref="matchersEditorRef" :raw-value="formData.matchers" />
+        <template #extra>只对符合全部条件的告警应用规则；不设置条件时表示全部告警，多个候选值使用 | 分隔。</template>
       </a-form-item>
 
-      <!-- dedup 类型配置 -->
       <template v-if="formData.type === 'dedup'">
-        <a-divider>去重配置</a-divider>
+        <a-divider orientation="left">去重配置</a-divider>
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="去重窗口 (秒)" field="dedup_window">
@@ -79,15 +67,17 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="去重键" field="dedup_keys">
-              <a-input v-model="formData.dedup_keys" placeholder="逗号分隔，如 fingerprint,alert_name" />
+              <a-select v-model="dedupKeys" multiple allow-create allow-search placeholder="请选择或输入字段">
+                <a-option v-for="item in groupingFieldOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+              </a-select>
+              <template #extra>相同去重键的告警在窗口内只保留首次通知。</template>
             </a-form-item>
           </a-col>
         </a-row>
       </template>
 
-      <!-- aggregate 类型配置 -->
       <template v-if="formData.type === 'aggregate'">
-        <a-divider>聚合配置</a-divider>
+        <a-divider orientation="left">聚合配置</a-divider>
         <a-row :gutter="16">
           <a-col :span="8">
             <a-form-item label="聚合窗口 (秒)" field="aggregate_window">
@@ -96,7 +86,9 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="分组字段" field="group_by">
-              <a-input v-model="formData.group_by" placeholder="逗号分隔" />
+              <a-select v-model="aggregateGroupBy" multiple allow-create allow-search placeholder="请选择或输入字段">
+                <a-option v-for="item in groupingFieldOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -107,20 +99,21 @@
         </a-row>
       </template>
 
-      <!-- dependency 类型配置 -->
       <template v-if="formData.type === 'dependency'">
-        <a-divider>依赖抑制配置</a-divider>
-        <a-form-item label="源匹配器 (JSON)" field="source_matchers">
-          <a-textarea v-model="formData.source_matchers" placeholder="JSON 格式的源匹配条件" :auto-size="{ minRows: 3, maxRows: 6 }" />
+        <a-divider orientation="left">依赖抑制配置</a-divider>
+        <a-form-item label="上游告警匹配条件" field="source_matchers">
+          <MatcherConditionEditor :key="`source-${formVersion}`" ref="sourceMatchersEditorRef" :raw-value="formData.source_matchers" />
+          <template #extra>用于识别上游资源正在发生的告警。</template>
         </a-form-item>
-        <a-form-item label="目标匹配器 (JSON)" field="target_matchers">
-          <a-textarea v-model="formData.target_matchers" placeholder="JSON 格式的目标匹配条件" :auto-size="{ minRows: 3, maxRows: 6 }" />
+        <a-form-item label="目标告警补充条件" field="target_matchers">
+          <MatcherConditionEditor :key="`target-${formVersion}`" ref="targetMatchersEditorRef" :raw-value="formData.target_matchers" />
+          <template #extra>与“当前告警匹配范围”同时成立，用于进一步缩小受影响告警的范围。</template>
         </a-form-item>
+        <a-alert type="info">依赖关系由现有资源拓扑确定；此处只配置上游和目标告警范围。</a-alert>
       </template>
 
-      <!-- throttle 类型配置 -->
       <template v-if="formData.type === 'throttle'">
-        <a-divider>限流配置</a-divider>
+        <a-divider orientation="left">限流配置</a-divider>
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="限流次数" field="throttle_count">
@@ -135,17 +128,13 @@
         </a-row>
       </template>
 
-      <!-- schedule 类型配置 -->
       <template v-if="formData.type === 'schedule'">
-        <a-divider>定时屏蔽配置</a-divider>
-        <a-form-item label="时间计划 (JSON)" field="schedule">
-          <a-textarea v-model="formData.schedule" placeholder="JSON 格式的时间计划配置" :auto-size="{ minRows: 5, maxRows: 10 }" />
-        </a-form-item>
+        <a-divider orientation="left">定时屏蔽配置</a-divider>
+        <ScheduleWindowEditor :key="`schedule-${formVersion}`" ref="scheduleEditorRef" :raw-value="formData.schedule" />
       </template>
 
-      <!-- 编辑时显示统计信息 -->
       <template v-if="isEdit">
-        <a-divider>运行统计</a-divider>
+        <a-divider orientation="left">运行统计</a-divider>
         <a-row :gutter="16">
           <a-col :span="8">
             <a-statistic title="命中次数" :value="formData.hit_count || 0" />
@@ -168,18 +157,18 @@
 
 <script lang="ts" setup>
 import { ref, computed, watch } from 'vue'
-import { SUPPRESSION_TYPE_OPTIONS, type SuppressionRule } from '@/api/ops/suppression'
-import type { PolicyOption, SuppressionFormData } from '../types'
+import { SUPPRESSION_TYPE_OPTIONS, createSuppression, updateSuppression, type SuppressionRule, type SuppressionType } from '@/api/ops/suppression'
+import type { SuppressionFormData } from '../types'
 import { DEFAULT_FORM_DATA, FORM_RULES } from '../constants'
-import { formatDateTime, validateJsonFields, buildUpdateData, buildCreateData } from '../utils'
-import { createSuppression, updateSuppression } from '@/api/ops/suppression'
+import { formatDateTime, buildUpdateData, buildCreateData } from '../utils'
 import { Message } from '@arco-design/web-vue'
+import MatcherConditionEditor from './MatcherConditionEditor.vue'
+import ScheduleWindowEditor from './ScheduleWindowEditor.vue'
 
 interface Props {
   visible: boolean
   isEdit: boolean
   data: SuppressionFormData
-  policyOptions: PolicyOption[]
   submitting: boolean
 }
 
@@ -195,6 +184,43 @@ const emit = defineEmits<Emits>()
 const formRef = ref()
 const formData = ref<SuppressionFormData>({ ...DEFAULT_FORM_DATA })
 const rules = FORM_RULES
+const formVersion = ref(0)
+const dedupKeys = ref<string[]>([])
+const aggregateGroupBy = ref<string[]>([])
+const matchersEditorRef = ref<StructuredEditor>()
+const sourceMatchersEditorRef = ref<StructuredEditor>()
+const targetMatchersEditorRef = ref<StructuredEditor>()
+const scheduleEditorRef = ref<StructuredEditor>()
+
+interface StructuredEditor {
+  serialize: () => string
+}
+
+const groupingFieldOptions = [
+  { value: 'alertname', label: '告警名称' },
+  { value: 'fingerprint', label: '告警指纹' },
+  { value: 'policy_id', label: '告警策略' },
+  { value: 'rule_id', label: '告警规则' },
+  { value: 'resource_category', label: '资源类型' },
+  { value: 'server_identity', label: '服务/服务器标识' },
+  { value: 'ip', label: 'IP 地址' },
+]
+
+const suppressionTypes = SUPPRESSION_TYPE_OPTIONS as Array<{ value: SuppressionType; label: string }>
+
+const typeDescriptions: Record<SuppressionType, string> = {
+  dedup: '同类告警仅保留首次通知',
+  aggregate: '在窗口内汇总同类告警',
+  dependency: '上游故障时抑制受影响告警',
+  throttle: '限制时间窗口内的通知次数',
+  schedule: '在指定时段内屏蔽告警',
+}
+
+const splitFieldValues = (value?: string) =>
+  value
+    ?.split(',')
+    .map((item) => item.trim())
+    .filter(Boolean) || []
 
 // 弹窗标题
 const title = computed(() => (props.isEdit ? `编辑抑制规则 - ${formData.value.name}` : '新建抑制规则'))
@@ -204,12 +230,30 @@ watch(
   () => props.data,
   (newData) => {
     if (newData) {
-      formData.value = { ...newData }
+      formData.value = { ...DEFAULT_FORM_DATA, ...newData }
+      dedupKeys.value = splitFieldValues(newData.dedup_keys)
+      aggregateGroupBy.value = splitFieldValues(newData.group_by)
+      formVersion.value += 1
     }
   },
   { immediate: true, deep: true }
 )
 
+const selectType = (type: SuppressionType) => {
+  if (!props.isEdit) formData.value.type = type
+}
+
+const syncStructuredFields = () => {
+  formData.value.matchers = matchersEditorRef.value?.serialize() || '{}'
+  formData.value.dedup_keys = dedupKeys.value.map((item) => item.trim()).filter(Boolean).join(',')
+  formData.value.group_by = aggregateGroupBy.value.map((item) => item.trim()).filter(Boolean).join(',')
+  if (formData.value.type === 'dependency') {
+    formData.value.source_matchers = sourceMatchersEditorRef.value?.serialize() || '{}'
+    formData.value.target_matchers = targetMatchersEditorRef.value?.serialize() || '{}'
+  }
+  if (formData.value.type === 'schedule') formData.value.schedule = scheduleEditorRef.value?.serialize() || '{}'
+}
+
 // 关闭弹窗
 const handleCancel = () => {
   emit('update:visible', false)
@@ -227,11 +271,10 @@ const handleOk = async () => {
     return false
   }
 
-  // 校验 JSON 字段
-  const jsonFields = ['matchers', 'source_matchers', 'target_matchers', 'schedule']
-  const jsonError = validateJsonFields(formData.value, jsonFields)
-  if (jsonError) {
-    Message.error(jsonError)
+  try {
+    syncStructuredFields()
+  } catch (error: any) {
+    Message.error(error.message || '请检查规则配置')
     return false
   }
 
@@ -285,3 +328,87 @@ export default {
   name: 'SuppressionModal',
 }
 </script>
+
+<style scoped lang="less">
+.type-options {
+  display: grid;
+  grid-template-columns: repeat(5, minmax(0, 1fr));
+  gap: 10px;
+}
+
+.type-option {
+  position: relative;
+  min-height: 78px;
+  padding: 11px 12px;
+  color: var(--color-text-2);
+  text-align: left;
+  background: var(--color-bg-2);
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+  cursor: pointer;
+  transition: all 0.16s ease;
+}
+
+.type-option:hover:not(:disabled) {
+  border-color: #b7d3ff;
+  background: #f8fbff;
+}
+
+.type-option.selected {
+  border-color: #165dff;
+  background: #f2f7ff;
+}
+
+.type-option.selected::after {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 14px;
+  height: 14px;
+  border-radius: 50%;
+  color: #fff;
+  background: #165dff;
+  content: '✓';
+  font-size: 10px;
+  font-weight: 600;
+  line-height: 14px;
+  text-align: center;
+}
+
+.type-option:disabled {
+  cursor: not-allowed;
+}
+
+.type-option-name,
+.type-option-description {
+  display: block;
+}
+
+.type-option-name {
+  color: var(--color-text-1);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 20px;
+}
+
+.type-option.selected .type-option-name {
+  color: #165dff;
+}
+
+.type-option-description {
+  margin-top: 4px;
+  color: var(--color-text-3);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.type-options.disabled .type-option:not(.selected) {
+  background: var(--color-fill-1);
+}
+
+@media (max-width: 768px) {
+  .type-options {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+</style>
diff --git a/src/views/ops/pages/alert/suppress/config/columns.ts b/src/views/ops/pages/alert/suppress/config/columns.ts
index 90d66ca..9ee0787 100644
--- a/src/views/ops/pages/alert/suppress/config/columns.ts
+++ b/src/views/ops/pages/alert/suppress/config/columns.ts
@@ -40,12 +40,6 @@ export const getTableColumns = (): TableColumnData[] => [
     dataIndex: 'priority',
     width: 80,
   },
-  {
-    title: '作用范围',
-    dataIndex: 'policy_id',
-    width: 120,
-    slotName: 'policy',
-  },
   {
     title: '关键配置',
     dataIndex: 'config',
diff --git a/src/views/ops/pages/alert/suppress/config/formItems.ts b/src/views/ops/pages/alert/suppress/config/formItems.ts
index 0507d7c..70bf0b7 100644
--- a/src/views/ops/pages/alert/suppress/config/formItems.ts
+++ b/src/views/ops/pages/alert/suppress/config/formItems.ts
@@ -1,12 +1,11 @@
-import { computed, type Ref } from 'vue'
+import { computed } from 'vue'
 import type { FormItem } from '@/components/search-form/types'
 import { SUPPRESSION_TYPE_OPTIONS } from '@/api/ops/suppression'
-import type { PolicyOption } from '../types'
 
 /**
  * 获取筛选表单项配置
  */
-export const useFormItems = (policyOptions: Ref<PolicyOption[]>) => {
+export const useFormItems = () => {
   return computed<FormItem[]>(() => [
     {
       field: 'keyword',
@@ -23,18 +22,6 @@ export const useFormItems = (policyOptions: Ref<PolicyOption[]>) => {
       placeholder: '请选择',
       options: [{ value: '', label: '全部' }, ...SUPPRESSION_TYPE_OPTIONS],
     },
-    {
-      field: 'policy_id',
-      label: '关联策略',
-      type: 'select',
-      span: 6,
-      placeholder: '请选择',
-      options: [
-        { value: '', label: '全部' },
-        { value: '0', label: '仅全局规则' },
-        ...policyOptions.value.map((p) => ({ value: String(p.id), label: p.name })),
-      ],
-    },
     {
       field: 'enabled',
       label: '启用状态',
diff --git a/src/views/ops/pages/alert/suppress/constants.ts b/src/views/ops/pages/alert/suppress/constants.ts
index 0333226..7e0f7dc 100644
--- a/src/views/ops/pages/alert/suppress/constants.ts
+++ b/src/views/ops/pages/alert/suppress/constants.ts
@@ -3,7 +3,7 @@ import type { SuppressionFormData } from './types'
 /**
  * 页面标题
  */
-export const PAGE_TITLE = '告警抑制规则（降噪）管理'
+export const PAGE_TITLE = '全局告警抑制管理'
 
 /**
  * 默认表单数据
@@ -13,7 +13,6 @@ export const DEFAULT_FORM_DATA: SuppressionFormData = {
   type: 'dedup',
   enabled: true,
   priority: 100,
-  policy_id: 0,
   description: '',
   matchers: '{}',
   dedup_window: 300,
@@ -54,6 +53,5 @@ export const DEFAULT_PAGINATION = {
 export const DEFAULT_SEARCH_FORM = {
   keyword: '',
   type: '',
-  policy_id: '',
   enabled: '',
 }
diff --git a/src/views/ops/pages/alert/suppress/hooks/index.ts b/src/views/ops/pages/alert/suppress/hooks/index.ts
index 95ee648..3dfbf01 100644
--- a/src/views/ops/pages/alert/suppress/hooks/index.ts
+++ b/src/views/ops/pages/alert/suppress/hooks/index.ts
@@ -1,2 +1 @@
-export { usePolicy } from './usePolicy'
 export { useTable } from './useTable'
diff --git a/src/views/ops/pages/alert/suppress/hooks/usePolicy.ts b/src/views/ops/pages/alert/suppress/hooks/usePolicy.ts
deleted file mode 100644
index 68c00e6..0000000
--- a/src/views/ops/pages/alert/suppress/hooks/usePolicy.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ref } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import { fetchPolicyList } from '@/api/ops/alertPolicy'
-import type { PolicyOption } from '../types'
-
-/**
- * 策略相关逻辑
- */
-export const usePolicy = () => {
-  const policyOptions = ref<PolicyOption[]>([])
-
-  /**
-   * 获取策略列表
-   */
-  const fetchPolicyOptions = async () => {
-    try {
-      const res = await fetchPolicyList({ page_size: 1000 })
-      if (res.code === 0 && res.details) {
-        policyOptions.value = (res.details.data || []).map((p: any) => ({
-          id: p.id,
-          name: p.name,
-        }))
-      }
-    } catch (error) {
-      console.error('获取策略列表失败:', error)
-    }
-  }
-
-  /**
-   * 获取策略名称
-   */
-  const getPolicyName = (policyId: number) => {
-    const policy = policyOptions.value.find((p) => p.id === policyId)
-    return policy?.name || ''
-  }
-
-  return {
-    policyOptions,
-    fetchPolicyOptions,
-    getPolicyName,
-  }
-}
diff --git a/src/views/ops/pages/alert/suppress/hooks/useTable.ts b/src/views/ops/pages/alert/suppress/hooks/useTable.ts
index d5b1fdb..c81e36e 100644
--- a/src/views/ops/pages/alert/suppress/hooks/useTable.ts
+++ b/src/views/ops/pages/alert/suppress/hooks/useTable.ts
@@ -33,10 +33,6 @@ export const useTable = () => {
         params.type = formModel.value.type
       }
 
-      if (formModel.value.policy_id) {
-        params.policy_id = Number(formModel.value.policy_id)
-      }
-
       if (formModel.value.enabled) {
         params.enabled = formModel.value.enabled === 'true'
       }
@@ -140,7 +136,7 @@ export const useTable = () => {
   const handleDelete = (record: SuppressionRule) => {
     Modal.confirm({
       title: '确认删除',
-      content: `确定要删除抑制规则「${record.name}」吗？删除后将影响告警降噪行为，请确认是否被模板引用。`,
+      content: `确定要删除全局抑制规则「${record.name}」吗？删除后所有告警将不再应用该规则。`,
       okText: '删除',
       cancelText: '取消',
       okButtonProps: { status: 'danger' },
@@ -161,13 +157,6 @@ export const useTable = () => {
     })
   }
 
-  /**
-   * 跳转到策略详情
-   */
-  const handleGoToPolicy = (policyId: number) => {
-    Message.info(`跳转到策略 #${policyId} 详情页`)
-  }
-
   return {
     loading,
     tableData,
@@ -183,6 +172,5 @@ export const useTable = () => {
     handlePageSizeChange,
     handleToggleEnabled,
     handleDelete,
-    handleGoToPolicy,
   }
 }
diff --git a/src/views/ops/pages/alert/suppress/index.vue b/src/views/ops/pages/alert/suppress/index.vue
index c17629e..92b0e5c 100644
--- a/src/views/ops/pages/alert/suppress/index.vue
+++ b/src/views/ops/pages/alert/suppress/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="container">
+    <a-alert type="warning" show-icon class="scope-tip">
+      本页面的规则对所有告警策略生效，请谨慎设置匹配范围。只针对某一套策略的抑制规则，请进入对应告警策略编辑页维护。
+    </a-alert>
     <search-table
       :form-model="formModel"
       :form-items="formItems"
@@ -37,18 +40,6 @@
         <a-switch v-model="record.enabled" :loading="switchLoadingMap[record.id]" @change="handleToggleEnabled(record)" />
       </template>
 
-      <!-- 作用范围列 -->
-      <template #policy="{ record }">
-        <span v-if="record.policy_id === 0 || !record.policy_id">
-          <a-tag color="gray">全局</a-tag>
-        </span>
-        <span v-else>
-          <a-link @click="handleGoToPolicy(record.policy_id)">
-            {{ getPolicyName(record.policy_id) || `策略 #${record.policy_id}` }}
-          </a-link>
-        </span>
-      </template>
-
       <!-- 关键配置列 -->
       <template #config="{ record }">
         <span class="config-text">{{ getConfigSummary(record) }}</span>
@@ -91,7 +82,6 @@
       v-model:submitting="submitting"
       :is-edit="isEdit"
       :data="formData"
-      :policy-options="policyOptions"
       @success="fetchList"
     />
   </div>
@@ -107,15 +97,12 @@ import { PAGE_TITLE, DEFAULT_FORM_DATA } from './constants'
 import { getTableColumns } from './config/columns'
 import { useFormItems } from './config/formItems'
 import { getTypeColor, getTypeLabel, getConfigSummary, formatDateTime } from './utils'
-import { usePolicy, useTable } from './hooks'
+import { useTable } from './hooks'
 import type { SuppressionFormData } from './types'
 
 // 页面标题
 const pageTitle = PAGE_TITLE
 
-// 策略相关
-const { policyOptions, fetchPolicyOptions, getPolicyName } = usePolicy()
-
 // 表格相关
 const {
   loading,
@@ -132,11 +119,10 @@ const {
   handlePageSizeChange,
   handleToggleEnabled,
   handleDelete,
-  handleGoToPolicy,
 } = useTable()
 
 // 筛选表单项配置
-const formItems = useFormItems(policyOptions)
+const formItems = useFormItems()
 
 // 表格列配置
 const tableColumns = computed(() => getTableColumns())
@@ -173,7 +159,6 @@ const handleOpenEditModal = async (record: SuppressionRule) => {
 
 // 初始化
 onMounted(() => {
-  fetchPolicyOptions()
   fetchList()
 })
 </script>
@@ -189,6 +174,10 @@ export default {
   padding-top: 20px;
 }
 
+.scope-tip {
+  margin-bottom: 16px;
+}
+
 .config-text {
   font-size: 13px;
   color: var(--color-text-2);
diff --git a/src/views/ops/pages/alert/suppress/types.ts b/src/views/ops/pages/alert/suppress/types.ts
index a847b7b..2b90051 100644
--- a/src/views/ops/pages/alert/suppress/types.ts
+++ b/src/views/ops/pages/alert/suppress/types.ts
@@ -6,18 +6,9 @@ import type { SuppressionRule, SuppressionType } from '@/api/ops/suppression'
 export interface SearchFormModel {
   keyword: string
   type: string
-  policy_id: string
   enabled: string
 }
 
-/**
- * 策略选项
- */
-export interface PolicyOption {
-  id: number
-  name: string
-}
-
 /**
  * 分页配置
  */
diff --git a/src/views/ops/pages/alert/suppress/utils/index.ts b/src/views/ops/pages/alert/suppress/utils/index.ts
index 9c562b1..df503c2 100644
--- a/src/views/ops/pages/alert/suppress/utils/index.ts
+++ b/src/views/ops/pages/alert/suppress/utils/index.ts
@@ -62,24 +62,6 @@ export const formatDateTime = (dateStr?: string) => {
   }
 }
 
-/**
- * 校验 JSON 字段
- * @returns 错误信息，如果校验通过则返回 null
- */
-export const validateJsonFields = (formData: SuppressionRule, fields: string[]): string | null => {
-  for (const field of fields) {
-    const value = formData[field as keyof SuppressionRule]
-    if (value && typeof value === 'string' && value !== '{}' && value.trim() !== '') {
-      try {
-        JSON.parse(value)
-      } catch {
-        return `${field} 字段 JSON 格式不正确`
-      }
-    }
-  }
-  return null
-}
-
 /**
  * 构建完整更新数据，显式传递空值以支持清除旧配置
  */
@@ -91,7 +73,6 @@ export const buildUpdateData = (formData: SuppressionRule): SuppressionUpdatePar
     description: formData.description ?? '',
     enabled: formData.enabled ?? true,
     priority: formData.priority ?? 0,
-    policy_id: formData.policy_id ?? 0,
     dedup_window: formData.dedup_window ?? 0,
     dedup_keys: formData.dedup_keys ?? '',
     aggregate_window: formData.aggregate_window ?? 0,
@@ -118,7 +99,6 @@ export const buildCreateData = (formData: SuppressionRule): SuppressionCreatePar
 
   if (formData.description) createData.description = formData.description
   if (formData.priority) createData.priority = formData.priority
-  if (formData.policy_id !== undefined) createData.policy_id = formData.policy_id
   if (formData.dedup_window) createData.dedup_window = formData.dedup_window
   if (formData.dedup_keys) createData.dedup_keys = formData.dedup_keys
   if (formData.aggregate_window) createData.aggregate_window = formData.aggregate_window
diff --git a/src/views/ops/pages/alert/tackle/components/DetailDialog.vue b/src/views/ops/pages/alert/tackle/components/DetailDialog.vue
index e1cc804..0af5f2a 100644
--- a/src/views/ops/pages/alert/tackle/components/DetailDialog.vue
+++ b/src/views/ops/pages/alert/tackle/components/DetailDialog.vue
@@ -16,8 +16,12 @@
               {{ record.severity.name || record.severity.code }}
             </a-tag>
           </a-descriptions-item>
-          <a-descriptions-item label="策略ID">{{ record.policy_id }}</a-descriptions-item>
-          <a-descriptions-item label="规则ID">{{ record.rule_id }}</a-descriptions-item>
+          <a-descriptions-item label="告警策略">
+            {{ formatAlertReference(policySnapshot?.name, policySnapshot?.code, record.policy_id) }}
+          </a-descriptions-item>
+          <a-descriptions-item label="告警规则">
+            {{ formatAlertReference(ruleSnapshot?.name, ruleSnapshot?.code, record.rule_id) }}
+          </a-descriptions-item>
         </a-descriptions>
 
         <!-- 告警内容 -->
@@ -117,6 +121,7 @@
 import { ref, watch, computed } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { fetchAlertRecordDetail, fetchAlertProcessList } from '@/api/ops/alertRecord'
+import { formatAlertReference, parseAlertPolicySnapshot, parseAlertRuleSnapshot } from '@/utils/alertSnapshot'
 
 interface Props {
   visible: boolean
@@ -132,6 +137,8 @@ const emit = defineEmits<{
 const loading = ref(false)
 const record = ref<any>(null)
 const processRecords = ref<any[]>([])
+const policySnapshot = computed(() => parseAlertPolicySnapshot(record.value?.policy_snapshot))
+const ruleSnapshot = computed(() => parseAlertRuleSnapshot(record.value?.rule_snapshot))
 
 const labels = computed(() => {
   if (!record.value?.labels) return null
diff --git a/src/views/ops/pages/alert/tackle/index.vue b/src/views/ops/pages/alert/tackle/index.vue
index 78a1311..bc515cc 100644
--- a/src/views/ops/pages/alert/tackle/index.vue
+++ b/src/views/ops/pages/alert/tackle/index.vue
@@ -60,6 +60,7 @@
       </template>
 
       <template #status="{ record }">
+        <a-tag v-if="isExternalBusinessAlert(record)" color="arcoblue">外部业务</a-tag>
         <a-tag :color="getStatusColor(record.status)">
           {{ getStatusText(record.status) }}
         </a-tag>
@@ -126,6 +127,7 @@
       <a-card v-for="record in tableData" :key="record.id" class="alert-card" @click="handleRowClick(record, $event)">
         <div class="alert-card-title">
           <strong>{{ record.alert_name }}</strong>
+          <a-tag v-if="isExternalBusinessAlert(record)" color="arcoblue">外部业务</a-tag>
           <a-tag v-if="record.severity" :color="record.severity.color">{{ record.severity.name }}</a-tag>
         </div>
         <p>{{ record.summary || record.description || '暂无摘要' }}</p>
@@ -338,6 +340,7 @@ type ProcessAction = 'ack' | 'resolve' | 'silence' | 'comment' | 'assign'
 // - silenced/suppressed：只允许 comment
 const isActionDisabled = (record: any, action: ProcessAction) => {
   const status = record?.status as string | undefined
+  if (isExternalBusinessAlert(record) && !['ack', 'comment'].includes(action)) return true
   if (!status) return false
 
   const isResolved = status === 'resolved'
@@ -409,7 +412,7 @@ const handleSuccess = () => {
 }
 
 const objectName = (category: string) => ({
-  host: '服务器/主机', network: '网络设备', security: '安全设备', storage: '存储设备', database: '数据库', middleware: '中间件', business: '业务系统', room_device: '机房设备', unknown: '未分类',
+  host: '服务器/主机', pc: '办公PC', network: '网络设备', security: '安全设备', storage: '存储设备', database: '数据库', middleware: '中间件', business: '业务系统', room_device: '机房设备', unknown: '未分类',
 }[category] || category)
 
 const handleRefresh = () => {
@@ -442,6 +445,8 @@ const parsedLabels = (labels: string) => {
   }
 }
 
+const isExternalBusinessAlert = (record: any) => parsedLabels(record?.labels)?.alert_source === 'external_business'
+
 /** 单行展示，避免 a-space wrap + 多 tag 撑高整行 td（与其它告警列表页行高一致） */
 const formatLabelsLine = (labels: string) => {
   const obj = parsedLabels(labels)
diff --git a/src/views/ops/pages/alert/template/components/TemplateDetailDialog.vue b/src/views/ops/pages/alert/template/components/TemplateDetailDialog.vue
deleted file mode 100644
index 89891a1..0000000
--- a/src/views/ops/pages/alert/template/components/TemplateDetailDialog.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <a-modal v-model:visible="modalVisible" :title="title" :width="900" :footer="false" @cancel="handleClose">
-    <div v-if="loading" class="loading-container">
-      <a-spin />
-    </div>
-    <div v-else-if="detail">
-      <a-descriptions :column="2" bordered>
-        <a-descriptions-item label="模板 ID">
-          {{ detail.id }}
-        </a-descriptions-item>
-        <a-descriptions-item label="模板名称">
-          {{ detail.name }}
-        </a-descriptions-item>
-        <a-descriptions-item label="模板分类">
-          {{ getCategoryLabel(detail.category) }}
-        </a-descriptions-item>
-        <a-descriptions-item label="启用状态">
-          <a-tag :color="detail.enabled ? 'green' : 'red'">
-            {{ detail.enabled ? '已启用' : '已禁用' }}
-          </a-tag>
-        </a-descriptions-item>
-        <a-descriptions-item label="标签" :span="2">
-          <a-tag v-for="tag in (detail.tags || '').split(',').filter(Boolean)" :key="tag">
-            {{ tag }}
-          </a-tag>
-          <span v-if="!detail.tags">暂无标签</span>
-        </a-descriptions-item>
-        <a-descriptions-item label="描述" :span="2">
-          {{ detail.description || '暂无描述' }}
-        </a-descriptions-item>
-      </a-descriptions>
-
-      <!-- 规则列表 -->
-      <a-divider orientation="left">规则列表</a-divider>
-      <a-table v-if="detail.rules && detail.rules.length > 0" :data="detail.rules" :columns="ruleColumns" :pagination="false" stripe />
-      <a-empty v-else description="暂无规则" />
-
-      <!-- 通知渠道 -->
-      <a-divider orientation="left">通知渠道</a-divider>
-      <div v-if="detail.channels && detail.channels.length > 0">
-        <a-tag v-for="channel in detail.channels" :key="channel.channel_id" color="arcoblue">
-          {{ getChannelName(channel.channel_id) }}
-        </a-tag>
-      </div>
-      <a-empty v-else description="暂无通知渠道" />
-
-      <!-- 抑制规则 -->
-      <a-divider orientation="left">抑制规则</a-divider>
-      <div v-if="detail.suppression_rule_ids && detail.suppression_rule_ids.length > 0">
-        <a-tag v-for="id in detail.suppression_rule_ids" :key="id" color="orangered">
-          {{ getSuppressionName(id) }}
-        </a-tag>
-      </div>
-      <a-empty v-else description="暂无抑制规则" />
-    </div>
-    <a-empty v-else description="暂无数据" />
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, watch, computed } from 'vue'
-import { fetchTemplateDetail, TEMPLATE_CATEGORIES, type AlertTemplate } from '@/api/ops/alertTemplate'
-import type { NotificationChannel, SuppressionRule } from '@/api/ops/alertTemplate'
-
-const props = defineProps<{
-  visible: boolean
-  title: string
-  templateId?: number | null
-  channelOptions: NotificationChannel[]
-  suppressionOptions: SuppressionRule[]
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:visible', value: boolean): void
-}>()
-
-// 计算属性处理 v-model
-const modalVisible = computed({
-  get: () => props.visible,
-  set: (val) => emit('update:visible', val),
-})
-
-// 状态
-const loading = ref(false)
-const detail = ref<AlertTemplate | null>(null)
-
-// 规则表格列
-const ruleColumns = [
-  { title: '规则名称', dataIndex: 'name', width: 150 },
-  { title: '数据源', dataIndex: 'data_source', width: 100 },
-  { title: '指标', dataIndex: 'metric_name', width: 150 },
-  { title: '运算符', dataIndex: 'compare_op', width: 80 },
-  { title: '阈值', dataIndex: 'threshold', width: 80 },
-  { title: '持续时间', dataIndex: 'duration', width: 80 },
-  { title: '告警级别', dataIndex: 'severity_code', width: 100 },
-]
-
-// 解析 JSON 字符串字段
-const parseJsonField = (field: any): any[] => {
-  if (!field) return []
-  if (typeof field === 'string') {
-    try {
-      const parsed = JSON.parse(field)
-      return Array.isArray(parsed) ? parsed : []
-    } catch {
-      return []
-    }
-  }
-  return Array.isArray(field) ? field : []
-}
-
-// 监听visible变化，加载详情
-watch(
-  () => props.visible,
-  async (val) => {
-    if (val && props.templateId) {
-      loading.value = true
-      try {
-        const res: any = await fetchTemplateDetail(props.templateId)
-        if (res.code === 0) {
-          // 解析可能为 JSON 字符串的字段
-          const data = res.details
-          detail.value = {
-            ...data,
-            rules: parseJsonField(data.rules),
-            channels: parseJsonField(data.channels),
-            suppression_rule_ids: parseJsonField(data.suppression_rule_ids),
-          }
-        }
-      } catch (error) {
-        console.error('获取模板详情失败:', error)
-      } finally {
-        loading.value = false
-      }
-    } else {
-      detail.value = null
-    }
-  }
-)
-
-// 获取分类标签
-const getCategoryLabel = (value: string) => {
-  const item = TEMPLATE_CATEGORIES.find((c) => c.value === value)
-  return item?.label || value
-}
-
-// 获取渠道名称
-const getChannelName = (id: number) => {
-  const item = props.channelOptions.find((c) => c.id === id)
-  return item?.name || String(id)
-}
-
-// 获取抑制规则名称
-const getSuppressionName = (id: number) => {
-  const item = props.suppressionOptions.find((s) => s.id === id)
-  return item?.name || String(id)
-}
-
-// 关闭弹窗
-const handleClose = () => {
-  emit('update:visible', false)
-}
-</script>
-
-<script lang="ts">
-export default {
-  name: 'TemplateDetailDialog',
-}
-</script>
-
-<style scoped lang="less">
-.loading-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 200px;
-}
-</style>
diff --git a/src/views/ops/pages/alert/template/components/TemplateFormDialog.vue b/src/views/ops/pages/alert/template/components/TemplateFormDialog.vue
deleted file mode 100644
index 819b251..0000000
--- a/src/views/ops/pages/alert/template/components/TemplateFormDialog.vue
+++ /dev/null
@@ -1,589 +0,0 @@
-<template>
-  <a-modal
-    v-model:visible="modalVisible"
-    :title="title"
-    :width="1000"
-    :ok-loading="submitting"
-    @before-ok="handleSubmit"
-    @cancel="handleClose"
-  >
-    <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-      <!-- 基础信息区 -->
-      <a-divider orientation="left">基础信息</a-divider>
-      <a-row :gutter="16">
-        <a-col :span="8">
-          <a-form-item label="模板名称" field="name" required>
-            <a-input v-model="formData.name" placeholder="请输入模板名称" allow-clear />
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="模板分类" field="category" required>
-            <a-select v-model="formData.category" placeholder="请选择分类" @change="handleCategoryChange">
-              <a-option v-for="item in TEMPLATE_CATEGORIES" :key="item.value" :value="item.value">
-                {{ item.label }}
-              </a-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="是否启用" field="enabled">
-            <a-switch v-model="formData.enabled" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
-        <a-col :span="24">
-          <a-form-item label="标签" field="tagsList" required>
-            <a-input-tag v-model="formData.tagsList" placeholder="输入后按回车添加" allow-clear />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row :gutter="16">
-        <a-col :span="24">
-          <a-form-item label="描述" field="description">
-            <a-textarea
-              v-model="formData.description"
-              placeholder="请输入模板描述"
-              :max-length="500"
-              :auto-size="{ minRows: 2, maxRows: 4 }"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <!-- 规则配置区 -->
-      <a-divider orientation="left">
-        规则配置
-        <a-button type="text" size="small" @click="handleAddRule">
-          <template #icon><icon-plus /></template>
-          添加规则
-        </a-button>
-      </a-divider>
-
-      <RuleEditor v-model:rules="formData.rules" :severity-options="severityOptions" @remove="handleRemoveRule" />
-
-      <!-- 通知渠道区 -->
-      <a-divider orientation="left">通知渠道</a-divider>
-      <a-form-item label="选择通知渠道" field="selectedChannelIds" required>
-        <a-select
-          v-model="formData.selectedChannelIds"
-          placeholder="请选择通知渠道（可搜索）"
-          multiple
-          allow-search
-          :filter-option="false"
-          @search="handleChannelSearch"
-          @dropdown-visible-change="handleChannelDropdownChange"
-        >
-          <a-option v-for="item in channelOptions" :key="item.id" :value="item.id">
-            {{ item.name }}
-          </a-option>
-        </a-select>
-      </a-form-item>
-
-      <!-- 抑制规则区 -->
-      <a-divider orientation="left">抑制规则</a-divider>
-      <a-form-item label="选择抑制规则" field="suppression_rule_ids" required>
-        <a-select
-          v-model="formData.suppression_rule_ids"
-          placeholder="请选择抑制规则（可搜索）"
-          multiple
-          allow-search
-          :filter-option="false"
-          @search="handleSuppressionSearch"
-          @dropdown-visible-change="handleSuppressionDropdownChange"
-        >
-          <a-option v-for="item in suppressionOptions" :key="item.id" :value="item.id">
-            {{ item.name }}
-          </a-option>
-        </a-select>
-      </a-form-item>
-    </a-form>
-  </a-modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, watch, computed } from 'vue'
-import { Message } from '@arco-design/web-vue'
-import type { FormInstance } from '@arco-design/web-vue/es/form'
-import RuleEditor from './RuleEditor.vue'
-import {
-  createTemplate,
-  updateTemplate,
-  fetchChannelList,
-  fetchSuppressionList,
-  fetchMetricsMeta,
-  TEMPLATE_CATEGORIES,
-  type AlertTemplate,
-  type AlertRule,
-  type NotificationChannel,
-  type SuppressionRule,
-  type AlertSeverity,
-  type MetricMeta,
-} from '@/api/ops/alertTemplate'
-
-interface RuleItem extends AlertRule {
-  _metrics?: MetricMeta[]
-  _metricsLoading?: boolean
-}
-
-interface FormData {
-  name: string
-  category: string
-  description: string
-  enabled: boolean
-  tagsList: string[]
-  rules: RuleItem[]
-  selectedChannelIds: number[]
-  suppression_rule_ids: number[]
-}
-
-const props = defineProps<{
-  visible: boolean
-  title: string
-  isEdit: boolean
-  editData?: AlertTemplate | null
-  severityOptions: AlertSeverity[]
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:visible', value: boolean): void
-  (e: 'success'): void
-}>()
-
-// 计算属性处理 v-model
-const modalVisible = computed({
-  get: () => props.visible,
-  set: (val) => emit('update:visible', val),
-})
-
-// 状态
-const submitting = ref(false)
-const formRef = ref<FormInstance>()
-
-// 下拉选项
-const channelOptions = ref<NotificationChannel[]>([])
-const suppressionOptions = ref<SuppressionRule[]>([])
-
-// 表单数据
-const formData = ref<FormData>({
-  name: '',
-  category: '',
-  description: '',
-  enabled: true,
-  tagsList: [],
-  rules: [],
-  selectedChannelIds: [],
-  suppression_rule_ids: [],
-})
-
-// 表单验证规则
-const formRules = {
-  name: [
-    { required: true, message: '请输入模板名称' },
-    { minLength: 2, message: '模板名称至少2个字符' },
-    { maxLength: 100, message: '模板名称最多100个字符' },
-  ],
-  category: [{ required: true, message: '请选择模板分类' }],
-  tagsList: [{ required: true, message: '请添加标签' }],
-  selectedChannelIds: [{ required: true, message: '请选择通知渠道' }],
-  suppression_rule_ids: [{ required: true, message: '请选择抑制规则' }],
-}
-
-// 监听visible变化，初始化表单
-watch(
-  () => props.visible,
-  async (val) => {
-    if (val) {
-      loadChannelOptions()
-      loadSuppressionOptions()
-
-      if (props.isEdit && props.editData) {
-        // 编辑模式
-        const tagsList = (props.editData.tags || '').split(',').filter(Boolean)
-        const selectedChannelIds = (props.editData.channels || []).map((c) => c.channel_id)
-
-        // 初始化规则数据
-        const rules = (props.editData.rules || []).map((r) => ({
-          ...r,
-          _metrics: [],
-          _metricsLoading: false,
-        }))
-
-        formData.value = {
-          name: props.editData.name,
-          category: props.editData.category,
-          description: props.editData.description || '',
-          enabled: props.editData.enabled ?? true,
-          tagsList,
-          rules,
-          selectedChannelIds,
-          suppression_rule_ids: props.editData.suppression_rule_ids || [],
-        }
-
-        // 为已有规则加载指标数据
-        for (let i = 0; i < rules.length; i++) {
-          if (rules[i].data_source) {
-            await loadMetricsForRule(i)
-          }
-        }
-      } else {
-        // 新建模式
-        formData.value = {
-          name: '',
-          category: '',
-          description: '',
-          enabled: true,
-          tagsList: [],
-          rules: [],
-          selectedChannelIds: [],
-          suppression_rule_ids: [],
-        }
-      }
-    }
-  }
-)
-
-// 为规则加载指标数据
-const loadMetricsForRule = async (index: number) => {
-  const rule = formData.value.rules[index]
-  if (!rule.data_source || rule._metrics?.length) return
-
-  rule._metricsLoading = true
-  try {
-    const res: any = await fetchMetricsMeta({
-      data_source: rule.data_source,
-      limit: 500,
-    })
-    if (res.code === 0) {
-      rule._metrics = res.details?.metrics || []
-    }
-  } catch (error) {
-    console.error('加载指标失败:', error)
-  } finally {
-    rule._metricsLoading = false
-  }
-}
-
-// 加载通知渠道
-const loadChannelOptions = async () => {
-  try {
-    const res: any = await fetchChannelList({ enabled: true })
-    if (res.code === 0) {
-      channelOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('加载通知渠道失败:', error)
-  }
-}
-
-// 加载抑制规则
-const loadSuppressionOptions = async () => {
-  try {
-    const res: any = await fetchSuppressionList({ enabled: true })
-    if (res.code === 0) {
-      suppressionOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('加载抑制规则失败:', error)
-  }
-}
-
-// 通知渠道搜索
-const handleChannelSearch = async (keyword: string) => {
-  try {
-    const res: any = await fetchChannelList({ enabled: true, keyword })
-    if (res.code === 0) {
-      channelOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('搜索通知渠道失败:', error)
-  }
-}
-
-const handleChannelDropdownChange = (visible: boolean) => {
-  if (visible && channelOptions.value.length === 0) {
-    loadChannelOptions()
-  }
-}
-
-// 抑制规则搜索
-const handleSuppressionSearch = async (keyword: string) => {
-  try {
-    const res: any = await fetchSuppressionList({ enabled: true, keyword })
-    if (res.code === 0) {
-      suppressionOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('搜索抑制规则失败:', error)
-  }
-}
-
-const handleSuppressionDropdownChange = (visible: boolean) => {
-  if (visible && suppressionOptions.value.length === 0) {
-    loadSuppressionOptions()
-  }
-}
-
-// 分类变化时加载默认规则
-const handleCategoryChange = (category: string) => {
-  if (!props.isEdit && formData.value.rules.length === 0) {
-    const defaultRules = getDefaultRules(category)
-    formData.value.rules = defaultRules.map((r) => ({
-      ...r,
-      _enabled: true,
-      _metrics: [],
-      _metricsLoading: false,
-    }))
-  }
-}
-
-// 获取默认规则
-const getDefaultRules = (category: string): AlertRule[] => {
-  const defaultRulesMap: Record<string, AlertRule[]> = {
-    os: [
-      {
-        name: 'CPU使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'cpu_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '内存使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'memory_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '磁盘使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'disk_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 85,
-        duration: 600,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    server_hardware: [
-      {
-        name: 'CPU温度过高',
-        data_source: 'dc-hardware',
-        metric_name: 'server_temperature_cpu',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 75,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '风扇转速异常',
-        data_source: 'dc-hardware',
-        metric_name: 'fan_speed',
-        rule_type: 'static',
-        compare_op: '<=',
-        threshold: 800,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    network_device: [
-      {
-        name: '接口Down告警',
-        data_source: 'dc-network',
-        metric_name: 'interface_status',
-        rule_type: 'static',
-        compare_op: '==',
-        threshold: 'down',
-        duration: 60,
-        eval_interval: 30,
-        severity_code: 'critical',
-      },
-      {
-        name: '端口带宽利用率过高',
-        data_source: 'dc-network',
-        metric_name: 'interface_usage_percent',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    database: [
-      {
-        name: '数据库连接数使用率过高',
-        data_source: 'dc-database',
-        metric_name: 'db_conn_usage_percent',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '慢查询次数过多',
-        data_source: 'dc-database',
-        metric_name: 'slow_query_count',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 50,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    middleware: [
-      {
-        name: '请求错误率过高',
-        data_source: 'dc-middleware',
-        metric_name: 'error_rate',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 1,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '队列消息堆积',
-        data_source: 'dc-middleware',
-        metric_name: 'queue_depth',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 10000,
-        duration: 600,
-        eval_interval: 60,
-        severity_code: 'critical',
-      },
-    ],
-  }
-
-  return defaultRulesMap[category] || []
-}
-
-// 添加规则
-const handleAddRule = () => {
-  formData.value.rules.push({
-    name: '',
-    data_source: formData.value.category ? getDefaultDataSource(formData.value.category) : 'dc-host',
-    metric_name: '',
-    rule_type: 'static',
-    compare_op: '>=',
-    threshold: 0,
-    duration: 300,
-    eval_interval: 60,
-    severity_code: 'warning',
-    _metrics: [],
-    _metricsLoading: false,
-  })
-}
-
-// 获取默认数据源
-const getDefaultDataSource = (category: string): string => {
-  const map: Record<string, string> = {
-    os: 'dc-host',
-    server_hardware: 'dc-hardware',
-    network_device: 'dc-network',
-    database: 'dc-database',
-    middleware: 'dc-middleware',
-    virtualization: 'dc-virtualization',
-    power_env: 'dc-env',
-    safety_env: 'dc-env',
-  }
-  return map[category] || 'dc-host'
-}
-
-// 移除规则
-const handleRemoveRule = (index: number) => {
-  formData.value.rules.splice(index, 1)
-}
-
-// 提交表单
-const handleSubmit = async () => {
-  const valid = await formRef.value?.validate()
-  if (valid) {
-    return false // 校验失败，阻止弹窗关闭
-  }
-
-  submitting.value = true
-  try {
-    // 提取规则数据
-    const submitRules = formData.value.rules.map((r) => {
-      const { _metrics, _metricsLoading, ...rest } = r as any
-      if (rest.rule_type === 'dynamic' && ['==', '!='].includes(rest.compare_op)) {
-        rest.compare_op = '>'
-      }
-      return rest
-    })
-
-    const submitData: AlertTemplate = {
-      name: formData.value.name,
-      category: formData.value.category,
-      description: formData.value.description,
-      enabled: formData.value.enabled,
-      tags: formData.value.tagsList.join(','),
-      rules: submitRules,
-      channels: formData.value.selectedChannelIds.map((id) => ({ channel_id: id })),
-      suppression_rule_ids: formData.value.suppression_rule_ids,
-    }
-
-    if (props.isEdit && props.editData?.id) {
-      submitData.id = props.editData.id
-      const res: any = await updateTemplate(submitData)
-      if (res.code === 0) {
-        Message.success('模板更新成功')
-        emit('success')
-        return true // 成功，允许关闭弹窗
-      } else {
-        Message.error(res.msg || '更新失败')
-        return false
-      }
-    } else {
-      const res: any = await createTemplate(submitData)
-      if (res.code === 0) {
-        Message.success('模板创建成功')
-        emit('success')
-        return true // 成功，允许关闭弹窗
-      } else {
-        Message.error(res.msg || '创建失败')
-        return false
-      }
-    }
-  } catch (error: any) {
-    console.error('提交失败:', error)
-    Message.error(error.message || '操作失败')
-    return false
-  } finally {
-    submitting.value = false
-  }
-}
-
-// 关闭弹窗
-const handleClose = () => {
-  emit('update:visible', false)
-  formRef.value?.resetFields()
-}
-</script>
-
-<script lang="ts">
-export default {
-  name: 'TemplateFormDialog',
-}
-</script>
diff --git a/src/views/ops/pages/alert/template/edit/index.vue b/src/views/ops/pages/alert/template/edit/index.vue
deleted file mode 100644
index 46dde70..0000000
--- a/src/views/ops/pages/alert/template/edit/index.vue
+++ /dev/null
@@ -1,807 +0,0 @@
-<template>
-  <div class="template-edit-page">
-    <!-- 页面头部 -->
-    <div class="page-header">
-      <div class="header-left">
-        <a-button type="text" @click="handleBack">
-          <template #icon><icon-left /></template>
-          返回列表
-        </a-button>
-        <a-divider direction="vertical" />
-        <h2 class="page-title">{{ pageTitle }}</h2>
-      </div>
-      <div class="header-right">
-        <a-space>
-          <a-button @click="handleBack">取消</a-button>
-          <a-button type="primary" :loading="submitting" @click="handleSubmit">
-            {{ isEdit ? '保存' : '创建' }}
-          </a-button>
-        </a-space>
-      </div>
-    </div>
-
-    <!-- 表单内容 -->
-    <div class="page-content">
-      <a-spin :loading="loading" style="width: 100%">
-        <a-row :gutter="20">
-          <!-- 左侧：基础信息 -->
-          <a-col :xs="24" :sm="24" :md="10" :lg="8">
-            <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-              <a-card class="info-card" title="基础信息">
-                <a-form-item label="模板名称" field="name" required>
-                  <a-input v-model="formData.name" placeholder="请输入模板名称" allow-clear />
-                </a-form-item>
-
-                <a-form-item label="模板分类" field="category" required>
-                  <a-select v-model="formData.category" placeholder="请选择分类" @change="handleCategoryChange">
-                    <a-option v-for="item in TEMPLATE_CATEGORIES" :key="item.value" :value="item.value">
-                      {{ item.label }}
-                    </a-option>
-                  </a-select>
-                </a-form-item>
-
-                <a-form-item label="是否启用" field="enabled">
-                  <a-switch v-model="formData.enabled" />
-                </a-form-item>
-
-                <a-form-item label="标签" field="tagsList" required>
-                  <a-input-tag v-model="formData.tagsList" placeholder="输入后按回车添加" allow-clear />
-                </a-form-item>
-
-                <a-form-item label="描述" field="description">
-                  <a-textarea
-                    v-model="formData.description"
-                    placeholder="请输入模板描述"
-                    :max-length="500"
-                    :auto-size="{ minRows: 3, maxRows: 5 }"
-                    show-word-limit
-                  />
-                </a-form-item>
-              </a-card>
-
-              <!-- 通知渠道 -->
-              <a-card class="info-card" title="通知渠道">
-                <a-form-item label="选择通知渠道" field="selectedChannelIds" required>
-                  <a-select
-                    v-model="formData.selectedChannelIds"
-                    placeholder="请选择通知渠道"
-                    multiple
-                    allow-search
-                    :filter-option="false"
-                    @search="handleChannelSearch"
-                    @dropdown-visible-change="handleChannelDropdownChange"
-                  >
-                    <a-option v-for="item in channelOptions" :key="item.id" :value="item.id">
-                      {{ item.name }}
-                    </a-option>
-                  </a-select>
-                </a-form-item>
-              </a-card>
-
-              <!-- 抑制规则 -->
-              <a-card class="info-card" title="抑制规则">
-                <a-form-item label="选择抑制规则" field="suppression_rule_ids" required>
-                  <a-select
-                    v-model="formData.suppression_rule_ids"
-                    placeholder="请选择抑制规则"
-                    multiple
-                    allow-search
-                    :filter-option="false"
-                    @search="handleSuppressionSearch"
-                    @dropdown-visible-change="handleSuppressionDropdownChange"
-                  >
-                    <a-option v-for="item in suppressionOptions" :key="item.id" :value="item.id">
-                      {{ item.name }}
-                    </a-option>
-                  </a-select>
-                </a-form-item>
-              </a-card>
-            </a-form>
-          </a-col>
-
-          <!-- 右侧：规则配置 -->
-          <a-col :xs="24" :sm="24" :md="14" :lg="16">
-            <a-card class="rules-card">
-              <template #title>
-                <div class="rules-card-title">
-                  <span>规则配置</span>
-                  <a-badge :count="formData.rules.length" :dot-style="{ backgroundColor: '#165dff' }" />
-                </div>
-              </template>
-              <template #extra>
-                <a-button type="primary" size="small" @click="handleAddRule">
-                  <template #icon><icon-plus /></template>
-                  添加规则
-                </a-button>
-              </template>
-
-              <div class="rules-content">
-                <a-empty v-if="formData.rules.length === 0" description="暂无规则，请添加">
-                  <a-button type="primary" @click="handleAddRule">
-                    <template #icon><icon-plus /></template>
-                    添加第一条规则
-                  </a-button>
-                </a-empty>
-                <RuleEditor
-                  v-else
-                  ref="ruleEditorRef"
-                  v-model:rules="formData.rules"
-                  :severity-options="severityOptions"
-                  @remove="handleRemoveRule"
-                />
-              </div>
-            </a-card>
-          </a-col>
-        </a-row>
-      </a-spin>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { Message } from '@arco-design/web-vue'
-import type { FormInstance } from '@arco-design/web-vue/es/form'
-import RuleEditor from '../components/RuleEditor.vue'
-import {
-  createTemplate,
-  updateTemplate,
-  fetchTemplateDetail,
-  fetchChannelList,
-  fetchSuppressionList,
-  fetchSeverityOptions,
-  fetchMetricsMeta,
-  TEMPLATE_CATEGORIES,
-  type AlertTemplate,
-  type AlertRule,
-  type NotificationChannel,
-  type SuppressionRule,
-  type AlertSeverity,
-  type MetricMeta,
-} from '@/api/ops/alertTemplate'
-
-interface RuleItem extends AlertRule {
-  _metrics?: MetricMeta[]
-  _metricsLoading?: boolean
-}
-
-interface FormData {
-  name: string
-  category: string
-  description: string
-  enabled: boolean
-  tagsList: string[]
-  rules: RuleItem[]
-  selectedChannelIds: number[]
-  suppression_rule_ids: number[]
-}
-
-const route = useRoute()
-const router = useRouter()
-
-// 页面状态
-const isEdit = ref(false)
-const templateId = ref<number | null>(null)
-const pageTitle = ref('新建告警模板')
-const loading = ref(false)
-const submitting = ref(false)
-const formRef = ref<FormInstance>()
-const ruleEditorRef = ref<{ validate: () => Promise<any> } | null>(null)
-
-// 下拉选项
-const channelOptions = ref<NotificationChannel[]>([])
-const suppressionOptions = ref<SuppressionRule[]>([])
-const severityOptions = ref<AlertSeverity[]>([])
-
-// 表单数据
-const formData = ref<FormData>({
-  name: '',
-  category: '',
-  description: '',
-  enabled: true,
-  tagsList: [],
-  rules: [],
-  selectedChannelIds: [],
-  suppression_rule_ids: [],
-})
-
-// 表单验证规则
-const formRules = {
-  name: [
-    { required: true, message: '请输入模板名称' },
-    { minLength: 2, message: '模板名称至少2个字符' },
-    { maxLength: 100, message: '模板名称最多100个字符' },
-  ],
-  category: [{ required: true, message: '请选择模板分类' }],
-  tagsList: [{ required: true, type: 'array', message: '请添加标签' }],
-  selectedChannelIds: [{ required: true, type: 'array', message: '请选择通知渠道' }],
-  suppression_rule_ids: [{ required: true, type: 'array', message: '请选择抑制规则' }],
-}
-
-// 初始化页面
-const initPage = async () => {
-  // 加载下拉选项
-  await loadSeverityOptions()
-  loadChannelOptions()
-  loadSuppressionOptions()
-
-  // 判断是否为编辑模式
-  const id = route.query.id
-  if (id) {
-    isEdit.value = true
-    templateId.value = Number(id)
-    pageTitle.value = '编辑告警模板'
-    await loadTemplateDetail()
-  }
-}
-
-// 加载模板详情
-const loadTemplateDetail = async () => {
-  if (!templateId.value) return
-
-  loading.value = true
-  try {
-    const res: any = await fetchTemplateDetail(templateId.value)
-    if (res.code === 0) {
-      const details = res.details
-
-      // 解析 JSON 字符串字段
-      const rules = typeof details.rules === 'string' ? JSON.parse(details.rules) : details.rules || []
-      const channels = typeof details.channels === 'string' ? JSON.parse(details.channels) : details.channels || []
-      const suppressionIds =
-        typeof details.suppression_rule_ids === 'string' ? JSON.parse(details.suppression_rule_ids) : details.suppression_rule_ids || []
-
-      const tagsList = (details.tags || '').split(',').filter(Boolean)
-      const selectedChannelIds = (channels || []).map((c: any) => c.channel_id)
-
-      // 初始化规则数据
-      const rulesWithMetrics = rules.map((r: any) => ({
-        ...r,
-        _metrics: [],
-        _metricsLoading: false,
-      }))
-
-      formData.value = {
-        name: details.name,
-        category: details.category,
-        description: details.description || '',
-        enabled: details.enabled ?? true,
-        tagsList,
-        rules: rulesWithMetrics,
-        selectedChannelIds,
-        suppression_rule_ids: suppressionIds,
-      }
-
-      // 为已有规则加载指标数据
-      for (let i = 0; i < rulesWithMetrics.length; i++) {
-        if (rulesWithMetrics[i].data_source) {
-          await loadMetricsForRule(i)
-        }
-      }
-    } else {
-      Message.error(res.msg || '获取模板详情失败')
-      router.push('/alert/template')
-    }
-  } catch (error: any) {
-    console.error('获取模板详情失败:', error)
-    Message.error(error.message || '获取模板详情失败')
-    router.push('/alert/template')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 为规则加载指标数据
-const loadMetricsForRule = async (index: number) => {
-  const rule = formData.value.rules[index]
-  if (!rule.data_source || rule._metrics?.length) return
-
-  rule._metricsLoading = true
-  try {
-    const res: any = await fetchMetricsMeta({
-      data_source: rule.data_source,
-      limit: 500,
-    })
-    if (res.code === 0) {
-      rule._metrics = res.details?.metrics || []
-    }
-  } catch (error) {
-    console.error('加载指标失败:', error)
-  } finally {
-    rule._metricsLoading = false
-  }
-}
-
-// 加载告警级别
-const loadSeverityOptions = async () => {
-  try {
-    const res: any = await fetchSeverityOptions({ enabled: 'true' })
-    // 兼容：后端可能返回数组，也可能是 { code, details: { data } }
-    const list = Array.isArray(res?.details) ? res.details : res?.details?.data || res?.details?.list || res?.data || res
-    severityOptions.value = Array.isArray(list) ? list : []
-  } catch (error) {
-    console.error('加载告警级别失败:', error)
-  }
-}
-
-// 加载通知渠道
-const loadChannelOptions = async () => {
-  try {
-    const res: any = await fetchChannelList({ enabled: true })
-    if (res.code === 0) {
-      channelOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('加载通知渠道失败:', error)
-  }
-}
-
-// 加载抑制规则
-const loadSuppressionOptions = async () => {
-  try {
-    const res: any = await fetchSuppressionList({ enabled: true })
-    if (res.code === 0) {
-      suppressionOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('加载抑制规则失败:', error)
-  }
-}
-
-// 通知渠道搜索
-const handleChannelSearch = async (keyword: string) => {
-  try {
-    const res: any = await fetchChannelList({ enabled: true, keyword })
-    if (res.code === 0) {
-      channelOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('搜索通知渠道失败:', error)
-  }
-}
-
-const handleChannelDropdownChange = (visible: boolean) => {
-  if (visible && channelOptions.value.length === 0) {
-    loadChannelOptions()
-  }
-}
-
-// 抑制规则搜索
-const handleSuppressionSearch = async (keyword: string) => {
-  try {
-    const res: any = await fetchSuppressionList({ enabled: true, keyword })
-    if (res.code === 0) {
-      suppressionOptions.value = res.details?.data || res.details?.list || []
-    }
-  } catch (error) {
-    console.error('搜索抑制规则失败:', error)
-  }
-}
-
-const handleSuppressionDropdownChange = (visible: boolean) => {
-  if (visible && suppressionOptions.value.length === 0) {
-    loadSuppressionOptions()
-  }
-}
-
-// 分类变化时加载默认规则
-const handleCategoryChange = (category: string) => {
-  if (!isEdit.value && formData.value.rules.length === 0) {
-    const defaultRules = getDefaultRules(category)
-    formData.value.rules = defaultRules.map((r) => ({
-      ...r,
-      _enabled: true,
-      _metrics: [],
-      _metricsLoading: false,
-    }))
-  }
-}
-
-// 获取默认规则
-const getDefaultRules = (category: string): AlertRule[] => {
-  const defaultRulesMap: Record<string, AlertRule[]> = {
-    os: [
-      {
-        name: 'CPU使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'cpu_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '内存使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'memory_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '磁盘使用率过高',
-        data_source: 'dc-host',
-        metric_name: 'disk_usage',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 85,
-        duration: 600,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    server_hardware: [
-      {
-        name: 'CPU温度过高',
-        data_source: 'dc-hardware',
-        metric_name: 'server_temperature_cpu',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 75,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '风扇转速异常',
-        data_source: 'dc-hardware',
-        metric_name: 'fan_speed',
-        rule_type: 'static',
-        compare_op: '<=',
-        threshold: 800,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    network_device: [
-      {
-        name: '接口Down告警',
-        data_source: 'dc-network',
-        metric_name: 'interface_status',
-        rule_type: 'static',
-        compare_op: '==',
-        threshold: 'down',
-        duration: 60,
-        eval_interval: 30,
-        severity_code: 'critical',
-      },
-      {
-        name: '端口带宽利用率过高',
-        data_source: 'dc-network',
-        metric_name: 'interface_usage_percent',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    database: [
-      {
-        name: '数据库连接数使用率过高',
-        data_source: 'dc-database',
-        metric_name: 'db_conn_usage_percent',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 80,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '慢查询次数过多',
-        data_source: 'dc-database',
-        metric_name: 'slow_query_count',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 50,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-    ],
-    middleware: [
-      {
-        name: '请求错误率过高',
-        data_source: 'dc-middleware',
-        metric_name: 'error_rate',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 1,
-        duration: 300,
-        eval_interval: 60,
-        severity_code: 'warning',
-      },
-      {
-        name: '队列消息堆积',
-        data_source: 'dc-middleware',
-        metric_name: 'queue_depth',
-        rule_type: 'static',
-        compare_op: '>=',
-        threshold: 10000,
-        duration: 600,
-        eval_interval: 60,
-        severity_code: 'critical',
-      },
-    ],
-  }
-
-  return defaultRulesMap[category] || []
-}
-
-// 添加规则
-const handleAddRule = () => {
-  formData.value.rules.push({
-    name: '',
-    data_source: formData.value.category ? getDefaultDataSource(formData.value.category) : 'dc-host',
-    metric_name: '',
-    rule_type: 'static',
-    compare_op: '>=',
-    threshold: 0,
-    duration: 300,
-    eval_interval: 60,
-    severity_code: 'warning',
-    _metrics: [],
-    _metricsLoading: false,
-  })
-}
-
-// 获取默认数据源
-const getDefaultDataSource = (category: string): string => {
-  const map: Record<string, string> = {
-    os: 'dc-host',
-    server_hardware: 'dc-hardware',
-    network_device: 'dc-network',
-    database: 'dc-database',
-    middleware: 'dc-middleware',
-    virtualization: 'dc-virtualization',
-    power_env: 'dc-env',
-    safety_env: 'dc-env',
-  }
-  return map[category] || 'dc-host'
-}
-
-// 移除规则
-const handleRemoveRule = (index: number) => {
-  formData.value.rules.splice(index, 1)
-}
-
-// 校验规则字段
-const validateRules = (): { valid: boolean; message: string } => {
-  if (formData.value.rules.length === 0) {
-    return { valid: false, message: '请至少添加一条规则' }
-  }
-
-  for (let i = 0; i < formData.value.rules.length; i++) {
-    const rule = formData.value.rules[i]
-    const ruleNum = i + 1
-
-    if (!rule.name || rule.name.trim() === '') {
-      return { valid: false, message: `规则${ruleNum}: 请输入规则名称` }
-    }
-    if (!rule.data_source) {
-      return { valid: false, message: `规则${ruleNum}: 请选择数据源` }
-    }
-    if (!rule.metric_name) {
-      return { valid: false, message: `规则${ruleNum}: 请选择指标名称` }
-    }
-    if (!rule.rule_type) {
-      return { valid: false, message: `规则${ruleNum}: 请选择规则类型` }
-    }
-    if (!rule.compare_op) {
-      return { valid: false, message: `规则${ruleNum}: 请选择比较运算符` }
-    }
-    if (rule.threshold === undefined || rule.threshold === null || rule.threshold === '') {
-      return { valid: false, message: `规则${ruleNum}: 请输入阈值` }
-    }
-    if (rule.duration === undefined || rule.duration === null) {
-      return { valid: false, message: `规则${ruleNum}: 请输入持续时间` }
-    }
-    if (rule.eval_interval === undefined || rule.eval_interval === null) {
-      return { valid: false, message: `规则${ruleNum}: 请输入评估间隔` }
-    }
-    if (!rule.severity_code) {
-      return { valid: false, message: `规则${ruleNum}: 请选择告警级别` }
-    }
-  }
-
-  return { valid: true, message: '' }
-}
-
-// 提交表单
-const handleSubmit = async () => {
-  try {
-    // 校验基础表单
-    const valid = await formRef.value?.validate()
-    if (valid) {
-      Message.warning('请检查表单填写是否正确')
-      return
-    }
-
-    // 校验规则字段（使用 RuleEditor 的 validate 方法）
-    if (formData.value.rules.length === 0) {
-      Message.warning('请至少添加一条规则')
-      return
-    }
-
-    try {
-      await ruleEditorRef.value?.validate()
-    } catch (ruleErrors) {
-      Message.warning('请检查规则配置是否完整')
-      return
-    }
-
-    submitting.value = true
-
-    // 提取规则数据
-    const submitRules = formData.value.rules.map((r) => {
-      const { _metrics, _metricsLoading, ...rest } = r as any
-      if (rest.rule_type === 'dynamic' && ['==', '!='].includes(rest.compare_op)) {
-        rest.compare_op = '>'
-      }
-      return rest
-    })
-
-    const submitData: AlertTemplate = {
-      name: formData.value.name,
-      category: formData.value.category,
-      description: formData.value.description,
-      enabled: formData.value.enabled,
-      tags: formData.value.tagsList.join(','),
-      rules: submitRules,
-      channels: formData.value.selectedChannelIds.map((id) => ({ channel_id: id })),
-      suppression_rule_ids: formData.value.suppression_rule_ids,
-    }
-
-    if (isEdit.value && templateId.value) {
-      submitData.id = templateId.value
-      const res: any = await updateTemplate(submitData)
-      if (res.code === 0) {
-        Message.success('模板更新成功')
-        router.push('/alert/template')
-      } else {
-        Message.error(res.msg || '更新失败')
-      }
-    } else {
-      const res: any = await createTemplate(submitData)
-      if (res.code === 0) {
-        Message.success('模板创建成功')
-        router.push('/alert/template')
-      } else {
-        Message.error(res.msg || '创建失败')
-      }
-    }
-  } catch (error: any) {
-    console.error('提交失败:', error)
-    Message.error(error.message || '操作失败')
-  } finally {
-    submitting.value = false
-  }
-}
-
-// 返回列表
-const handleBack = () => {
-  router.push('/alert/template')
-}
-
-// 初始化
-onMounted(() => {
-  initPage()
-})
-</script>
-
-<script lang="ts">
-export default {
-  name: 'AlertTemplateEditPage',
-}
-</script>
-
-<style scoped lang="less">
-.template-edit-page {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--color-fill-2);
-}
-
-.page-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px 20px;
-  background-color: var(--color-bg-2);
-  border-bottom: 1px solid var(--color-border);
-  flex-shrink: 0;
-
-  .header-left {
-    display: flex;
-    align-items: center;
-
-    .page-title {
-      margin: 0;
-      font-size: 18px;
-      font-weight: 500;
-    }
-  }
-}
-
-.page-content {
-  flex: 1;
-  padding: 20px;
-  overflow: auto;
-}
-
-.info-card {
-  margin-bottom: 16px;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.rules-card {
-  height: 100%;
-  min-height: 500px;
-  display: flex;
-  flex-direction: column;
-
-  :deep(.arco-card-body) {
-    flex: 1;
-    overflow: auto;
-  }
-
-  .rules-card-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-  }
-
-  .rules-content {
-    height: 100%;
-  }
-}
-
-// 表单项样式优化
-:deep(.arco-form-item) {
-  margin-bottom: 16px;
-}
-
-:deep(.arco-card) {
-  .arco-card-header {
-    border-bottom: 1px solid var(--color-border);
-  }
-}
-
-// 响应式布局
-@media (max-width: 992px) {
-  .rules-card {
-    min-height: 400px;
-    margin-top: 16px;
-  }
-}
-
-@media (max-width: 768px) {
-  .page-header {
-    flex-direction: column;
-    gap: 12px;
-    align-items: flex-start;
-
-    .header-right {
-      width: 100%;
-      justify-content: flex-end;
-    }
-  }
-
-  .rules-card {
-    min-height: 300px;
-  }
-}
-</style>
diff --git a/src/views/ops/pages/alert/template/index.vue b/src/views/ops/pages/alert/template/index.vue
deleted file mode 100644
index 53f37b6..0000000
--- a/src/views/ops/pages/alert/template/index.vue
+++ /dev/null
@@ -1,390 +0,0 @@
-<template>
-  <div class="container">
-    <search-table
-      :form-model="formModel"
-      :form-items="formItems"
-      :data="tableData"
-      :columns="tableColumns"
-      :loading="loading"
-      :pagination="pagination"
-      :title="pageTitle"
-      @update:form-model="handleFormModelUpdate"
-      @search="handleSearch"
-      @reset="handleReset"
-      @refresh="handleRefresh"
-      @page-change="handlePageChange"
-      @page-size-change="handlePageSizeChange"
-    >
-      <!-- 工具栏左侧：新建按钮 -->
-      <template #toolbar-left>
-        <a-button type="primary" @click="handleCreate">
-          <template #icon><icon-plus /></template>
-          新建模板
-        </a-button>
-      </template>
-
-      <!-- 状态列 -->
-      <template #enabled="{ record }">
-        <a-tag :color="record.enabled ? 'green' : 'red'">
-          {{ record.enabled ? '已启用' : '已禁用' }}
-        </a-tag>
-      </template>
-
-      <!-- 分类列 -->
-      <template #category="{ record }">
-        {{ getCategoryLabel(record.category) }}
-      </template>
-
-      <!-- 规则数量列 -->
-      <template #rulesCount="{ record }">
-        <a-badge :count="getRulesCount(record.rules)" :dot-style="{ backgroundColor: '#165dff' }" />
-      </template>
-
-      <!-- 操作列 -->
-      <template #operations="{ record }">
-        <a-space>
-          <a-button type="text" size="small" @click="handleViewDetail(record)">查看</a-button>
-          <a-button type="text" size="small" @click="handleEdit(record)">编辑</a-button>
-          <a-button type="text" size="small" :status="record.enabled ? 'warning' : 'success'" @click="handleToggleEnabled(record)">
-            {{ record.enabled ? '禁用' : '启用' }}
-          </a-button>
-          <a-popconfirm content="确定要删除此模板吗？" type="warning" @ok="handleDelete(record)">
-            <a-button type="text" size="small" status="danger">删除</a-button>
-          </a-popconfirm>
-        </a-space>
-      </template>
-    </search-table>
-
-    <!-- 详情弹窗 -->
-    <TemplateDetailDialog
-      v-model:visible="detailModalVisible"
-      :title="detailModalTitle"
-      :template-id="detailTemplateId"
-      :channel-options="channelOptions"
-      :suppression-options="suppressionOptions"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import { Message } from '@arco-design/web-vue'
-import dayjs from 'dayjs'
-import SearchTable from '@/components/search-table/index.vue'
-import type { FormItem } from '@/components/search-form/types'
-import TemplateDetailDialog from './components/TemplateDetailDialog.vue'
-import {
-  fetchTemplateList,
-  updateTemplate,
-  deleteTemplate,
-  fetchChannelList,
-  fetchSuppressionList,
-  TEMPLATE_CATEGORIES,
-  type AlertTemplate,
-  type NotificationChannel,
-  type SuppressionRule,
-} from '@/api/ops/alertTemplate'
-
-const router = useRouter()
-
-// 页面标题
-const pageTitle = '告警模板管理'
-
-// 搜索表单模型
-const formModel = ref({
-  name: '',
-  category: '',
-  enabled: '',
-})
-
-// 表单项配置
-const formItems = computed<FormItem[]>(() => [
-  {
-    field: 'name',
-    label: '模板名称',
-    type: 'input',
-    span: 8,
-    placeholder: '请输入模板名称',
-  },
-  {
-    field: 'category',
-    label: '分类',
-    type: 'select',
-    span: 8,
-    placeholder: '请选择',
-    options: [{ value: '', label: '全部' }, ...TEMPLATE_CATEGORIES],
-  },
-  {
-    field: 'enabled',
-    label: '状态',
-    type: 'select',
-    span: 8,
-    placeholder: '请选择',
-    options: [
-      { value: '', label: '全部' },
-      { value: 'true', label: '已启用' },
-      { value: 'false', label: '已禁用' },
-    ],
-  },
-])
-
-// 状态
-const loading = ref(false)
-const tableData = ref<AlertTemplate[]>([])
-
-// 分页配置
-const pagination = reactive({
-  current: 1,
-  pageSize: 20,
-  total: 0,
-  showTotal: true,
-  showJumper: true,
-  showPageSize: true,
-})
-
-// 表格列配置
-const tableColumns = computed(() => [
-  {
-    title: 'ID',
-    dataIndex: 'id',
-    width: 80,
-  },
-  {
-    title: '模板名称',
-    dataIndex: 'name',
-    width: 200,
-    ellipsis: true,
-    tooltip: true,
-  },
-  {
-    title: '分类',
-    dataIndex: 'category',
-    width: 180,
-    slotName: 'category',
-  },
-  {
-    title: '规则数量',
-    dataIndex: 'rules',
-    width: 100,
-    slotName: 'rulesCount',
-  },
-  {
-    title: '状态',
-    dataIndex: 'enabled',
-    width: 100,
-    slotName: 'enabled',
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'created_at',
-    width: 180,
-    render: ({ record }: any) => {
-      return record.created_at ? dayjs(record.created_at).format('YYYY-MM-DD HH:mm:ss') : '-'
-    },
-  },
-  {
-    title: '操作',
-    dataIndex: 'operations',
-    width: 280,
-    slotName: 'operations',
-    fixed: 'right' as const,
-  },
-])
-
-// 详情弹窗
-const detailModalVisible = ref(false)
-const detailModalTitle = ref('模板详情')
-const detailTemplateId = ref<number | null>(null)
-
-// 下拉选项
-const channelOptions = ref<NotificationChannel[]>([])
-const suppressionOptions = ref<SuppressionRule[]>([])
-
-// 获取分类标签
-const getCategoryLabel = (value: string) => {
-  const item = TEMPLATE_CATEGORIES.find((c) => c.value === value)
-  return item?.label || value
-}
-
-// 获取规则数量（解析 JSON 字符串）
-const getRulesCount = (rules: any) => {
-  if (!rules) return 0
-  if (typeof rules === 'string') {
-    try {
-      const parsed = JSON.parse(rules)
-      return Array.isArray(parsed) ? parsed.length : 0
-    } catch {
-      return 0
-    }
-  }
-  return Array.isArray(rules) ? rules.length : 0
-}
-
-// 获取列表数据
-const fetchList = async () => {
-  loading.value = true
-  try {
-    const params: any = {
-      page: pagination.current,
-      page_size: pagination.pageSize,
-    }
-
-    if (formModel.value.name) {
-      params.name = formModel.value.name
-    }
-    if (formModel.value.category) {
-      params.category = formModel.value.category
-    }
-    if (formModel.value.enabled) {
-      params.enabled = formModel.value.enabled === 'true'
-    }
-
-    const res: any = await fetchTemplateList(params)
-
-    if (res.code === 0) {
-      tableData.value = res.details?.data || res.details?.list || []
-      pagination.total = res.details?.total || 0
-    } else {
-      Message.error(res.msg || '获取模板列表失败')
-    }
-  } catch (error: any) {
-    console.error('获取模板列表失败:', error)
-    Message.error(error.message || '获取模板列表失败')
-  } finally {
-    loading.value = false
-  }
-}
-
-// 加载下拉选项
-const loadOptions = async () => {
-  try {
-    // 加载通知渠道
-    const channelRes: any = await fetchChannelList({ enabled: true })
-    if (channelRes.code === 0) {
-      channelOptions.value = channelRes.details?.data || channelRes.details?.list || []
-    }
-
-    // 加载抑制规则
-    const suppressionRes: any = await fetchSuppressionList({ enabled: true })
-    if (suppressionRes.code === 0) {
-      suppressionOptions.value = suppressionRes.details?.data || suppressionRes.details?.list || []
-    }
-  } catch (error) {
-    console.error('加载选项失败:', error)
-  }
-}
-
-// 处理表单模型更新
-const handleFormModelUpdate = (value: any) => {
-  formModel.value = value
-}
-
-// 搜索
-const handleSearch = () => {
-  pagination.current = 1
-  fetchList()
-}
-
-// 重置
-const handleReset = () => {
-  formModel.value = {
-    name: '',
-    category: '',
-    enabled: '',
-  }
-  pagination.current = 1
-  fetchList()
-}
-
-// 刷新
-const handleRefresh = () => {
-  fetchList()
-}
-
-// 分页变化
-const handlePageChange = (current: number) => {
-  pagination.current = current
-  fetchList()
-}
-
-const handlePageSizeChange = (pageSize: number) => {
-  pagination.pageSize = pageSize
-  pagination.current = 1
-  fetchList()
-}
-
-// 新建模板
-const handleCreate = () => {
-  router.push('/alert/template/edit')
-}
-
-// 编辑模板
-const handleEdit = (record: AlertTemplate) => {
-  router.push({
-    path: '/alert/template/edit',
-    query: { id: record.id },
-  })
-}
-
-// 查看详情
-const handleViewDetail = (record: AlertTemplate) => {
-  detailModalTitle.value = `模板详情 - ${record.name}`
-  detailTemplateId.value = record.id || null
-  detailModalVisible.value = true
-}
-
-// 切换启用状态
-const handleToggleEnabled = async (record: AlertTemplate) => {
-  try {
-    const res: any = await updateTemplate({
-      id: record.id,
-      enabled: !record.enabled,
-    } as AlertTemplate)
-
-    if (res.code === 0) {
-      Message.success(record.enabled ? '禁用成功' : '启用成功')
-      fetchList()
-    } else {
-      Message.error(res.msg || '操作失败')
-    }
-  } catch (error: any) {
-    console.error('操作失败:', error)
-    Message.error(error.message || '操作失败')
-  }
-}
-
-// 删除模板
-const handleDelete = async (record: AlertTemplate) => {
-  try {
-    const res: any = await deleteTemplate(record.id!)
-    if (res.code === 0) {
-      Message.success('删除成功')
-      fetchList()
-    } else {
-      Message.error(res.msg || '删除失败')
-    }
-  } catch (error: any) {
-    console.error('删除失败:', error)
-    Message.error(error.message || '删除失败')
-  }
-}
-
-// 初始化
-onMounted(() => {
-  loadOptions()
-  fetchList()
-})
-</script>
-
-<script lang="ts">
-export default {
-  name: 'AlertTemplatePage',
-}
-</script>
-
-<style scoped lang="less">
-.container {
-  padding-top: 20px;
-}
-</style>
diff --git a/src/views/ops/pages/assets/device/components/DeviceDetailDialog.vue b/src/views/ops/pages/assets/device/components/DeviceDetailDialog.vue
index 39984e7..8b7e754 100644
--- a/src/views/ops/pages/assets/device/components/DeviceDetailDialog.vue
+++ b/src/views/ops/pages/assets/device/components/DeviceDetailDialog.vue
@@ -16,7 +16,7 @@
           {{ device?.model || '-' }}
         </a-descriptions-item>
         <a-descriptions-item label="生产厂商">
-          {{ device?.manufacturer || '-' }}
+          {{ device?.manufacturer?.name || '-' }}
         </a-descriptions-item>
         <a-descriptions-item label="序列号">
           {{ device?.serial_number || '-' }}
@@ -118,7 +118,7 @@ interface Device {
   asset_code?: string
   category?: { id: number; name: string; code: string }
   model?: string
-  manufacturer?: string
+  manufacturer?: { id: number; name: string; code: string }
   serial_number?: string
   source_address?: string
   purchase_date?: string
diff --git a/src/views/ops/pages/assets/device/form/index.vue b/src/views/ops/pages/assets/device/form/index.vue
index a0cd52b..d76d68e 100644
--- a/src/views/ops/pages/assets/device/form/index.vue
+++ b/src/views/ops/pages/assets/device/form/index.vue
@@ -39,7 +39,7 @@
               </a-col>
               <a-col :span="6">
                 <a-form-item label="资产分类" field="category_id">
-                  <a-select v-model="form.category_id" placeholder="请选择资产分类" allow-clear allow-search :loading="categoryLoading">
+                  <a-select v-model="form.category_id" placeholder="请选择资产分类" allow-clear allow-search :loading="categoryLoading" :disabled="isEdit">
                     <a-option v-for="item in categoryOptions" :key="item.id" :value="item.id" :label="item.name" />
                   </a-select>
                 </a-form-item>
diff --git a/src/views/ops/pages/assets/device/list/index.vue b/src/views/ops/pages/assets/device/list/index.vue
index c4ab7ba..160299a 100644
--- a/src/views/ops/pages/assets/device/list/index.vue
+++ b/src/views/ops/pages/assets/device/list/index.vue
@@ -34,8 +34,10 @@
 
       <template #projection_status="{ record }">
         <a-tooltip :content="record.projection_error || ''" :disabled="!record.projection_error">
-          <a-tag :color="record.projection_status === 'synced' ? 'green' : record.projection_status === 'failed' ? 'red' : 'orange'">
-            {{ record.projection_status === 'synced' ? '已同步' : record.projection_status === 'failed' ? '同步失败' : '待同步' }}
+          <a-tag
+            :color="record.lifecycle_state === 'deleting' ? 'orange' : record.projection_status === 'synced' ? 'green' : record.projection_status === 'failed' ? 'red' : 'orange'"
+          >
+            {{ record.lifecycle_state === 'deleting' ? '删除中' : record.projection_status === 'synced' ? '已同步' : record.projection_status === 'failed' ? '同步失败' : '待同步' }}
           </a-tag>
         </a-tooltip>
       </template>
@@ -57,12 +59,17 @@
 
       <!-- 操作 -->
       <template #actions="{ record }">
-        <a-button type="text" size="small" :disabled="record.projection_status !== 'synced'" @click="handleOverview(record)">
+        <a-button
+          type="text"
+          size="small"
+          :disabled="record.lifecycle_state === 'deleting' || record.projection_status !== 'synced'"
+          @click="handleOverview(record)"
+        >
           监控概览
         </a-button>
         <a-button type="text" size="small" @click="handleDetail(record)">详情</a-button>
-        <a-button type="text" size="small" @click="handleEdit(record)">编辑</a-button>
-        <a-button type="text" size="small" status="danger" @click="handleDelete(record)">删除</a-button>
+        <a-button type="text" size="small" :disabled="record.lifecycle_state === 'deleting'" @click="handleEdit(record)">编辑</a-button>
+        <a-button type="text" size="small" status="danger" :disabled="record.lifecycle_state === 'deleting'" @click="handleDelete(record)">删除</a-button>
       </template>
     </search-table>
 
@@ -79,7 +86,7 @@ import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
 import {
   fetchAssetList,
-  deleteAsset,
+  deleteDeviceAndWait,
   fetchAssetDetail,
   fetchCategoryOptions,
   fetchManufacturerOptions,
@@ -460,12 +467,16 @@ const handleDelete = async (record: any) => {
       title: '确认删除',
       content: `确认删除设备 ${record.asset_name} 吗？`,
       onOk: async () => {
-        const res = await deleteAsset(record.resource_uid)
-        if (res.code === 0) {
-          Message.success('删除成功')
-          fetchDevices()
-        } else {
-          Message.error(res.message || '删除失败')
+        try {
+          const result = await deleteDeviceAndWait(record.resource_uid)
+          if (result.status === 'deleted') {
+            Message.success('删除成功')
+          } else {
+            Message.info('设备正在删除，系统将自动完成清理')
+          }
+          await fetchDevices()
+        } catch (error: any) {
+          Message.error(error?.response?.data?.message || error?.message || '删除失败')
         }
       },
     })
diff --git a/src/views/ops/pages/assets/supplier/components/CollectionTemplateEditor.vue b/src/views/ops/pages/assets/supplier/components/CollectionTemplateEditor.vue
index 86f32be..a09af49 100644
--- a/src/views/ops/pages/assets/supplier/components/CollectionTemplateEditor.vue
+++ b/src/views/ops/pages/assets/supplier/components/CollectionTemplateEditor.vue
@@ -1,107 +1,179 @@
 <template>
-  <a-modal :visible="visible" title="厂商采集模板" width="1100px" :footer="false" unmount-on-close @cancel="close">
-    <a-alert type="info" class="mb-16">设备录入页不允许填写 OID。OID、索引发现、库存映射和固定只读查询统一在此按厂商维护；完成真实设备联调前，模板保持待验证状态。</a-alert>
-    <div class="toolbar"><a-space><a-select v-model="manufacturerCode" allow-clear placeholder="筛选厂商" style="width: 180px"><a-option v-for="item in manufacturers" :key="item.code" :value="item.code">{{ item.name }}</a-option></a-select><a-input v-model="keyword" allow-clear placeholder="模板名称或编码" @press-enter="loadData" /><a-button @click="loadData">查询</a-button><a-button @click="openImport">导入</a-button><a-button type="primary" @click="openCreate">新增模板</a-button></a-space></div>
+  <a-modal :visible="visible" title="厂商采集模板" width="1180px" :footer="false" @cancel="close">
+    <div class="toolbar">
+      <a-space>
+        <a-select v-model="manufacturerCode" allow-clear placeholder="筛选厂商" style="width: 180px">
+          <a-option v-for="item in manufacturers" :key="item.code" :value="item.code">{{ item.name }}</a-option>
+        </a-select>
+        <a-input v-model="keyword" allow-clear placeholder="模板名称或编码" @press-enter="loadData" />
+        <a-button @click="loadData">查询</a-button>
+        <a-button @click="openImport">导入</a-button>
+        <a-button type="primary" @click="openCreate">新增模板</a-button>
+      </a-space>
+    </div>
     <a-table row-key="id" :columns="columns" :data="rows" :loading="loading" :pagination="pagination" @page-change="onPageChange">
-      <template #enabled="{ record }"><a-tag :color="record.enabled ? 'green' : 'orange'">{{ record.enabled ? '已启用' : '未启用' }}</a-tag></template>
-      <template #adapter_verified="{ record }"><a-tag v-if="['network', 'security', 'storage'].includes(record.resource_category)" :color="record.adapter_verified ? 'green' : 'orange'">{{ record.adapter_verified ? '已联调验证' : '待真实设备联调' }}</a-tag><span v-else>不适用</span></template>
-      <template #actions="{ record }"><a-space><a-button type="text" size="small" @click="openEdit(record)">编辑</a-button><a-button type="text" size="small" @click="doExport(record)">导出</a-button><a-popconfirm content="确认删除该模板？" @ok="remove(record)"><a-button type="text" status="danger" size="small">删除</a-button></a-popconfirm></a-space></template>
+      <template #enabled="{ record }">
+        <a-tag :color="record.enabled ? 'green' : 'orange'">{{ record.enabled ? '已启用' : '未启用' }}</a-tag>
+      </template>
+      <template #adapter_verified="{ record }">
+        <a-tag
+          v-if="supportsAdapterVerification(record.resource_category, record.protocol)"
+          :color="record.adapter_verified ? 'green' : 'orange'"
+        >
+          {{ record.adapter_verified ? '已联调验证' : '待真实设备联调' }}
+        </a-tag>
+        <span v-else>不适用</span>
+      </template>
+      <template #actions="{ record }">
+        <a-space>
+          <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
+          <a-button type="text" size="small" @click="doExport(record)">导出</a-button>
+          <a-popconfirm content="确认删除该模板？" @ok="remove(record)">
+            <a-button type="text" status="danger" size="small">删除</a-button>
+          </a-popconfirm>
+        </a-space>
+      </template>
     </a-table>
 
-    <a-modal v-model:visible="formVisible" :title="editingId ? '编辑厂商采集模板' : '新增厂商采集模板'" width="820px" :ok-loading="saving" @ok="save">
-      <a-form :model="form" layout="vertical">
-        <a-row :gutter="16">
-          <a-col :span="12"><a-form-item label="稳定编码" required><a-input v-model="form.code" placeholder="如 H3C-SWITCH-SNMP" /></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="模板名称" required><a-input v-model="form.name" /></a-form-item></a-col>
-          <a-col :span="8"><a-form-item label="厂商" required><a-select v-model="form.manufacturer_code" allow-search><a-option value="GENERIC">通用</a-option><a-option v-for="item in manufacturers" :key="item.code" :value="item.code">{{ item.name }}</a-option></a-select></a-form-item></a-col>
-          <a-col :span="8"><a-form-item label="设备类型" required><a-select v-model="form.resource_category"><a-option value="host">服务器</a-option><a-option value="network">网络设备</a-option><a-option value="security">安全设备</a-option><a-option value="storage">存储设备</a-option><a-option value="room_device">机房设备</a-option><a-option value="database">数据库</a-option><a-option value="middleware">中间件</a-option></a-select></a-form-item></a-col>
-          <a-col :span="8"><a-form-item label="采集协议" required><a-select v-model="form.protocol"><a-option value="snmp">SNMP</a-option><a-option value="ssh">SSH</a-option><a-option value="redfish">Redfish</a-option><a-option value="ipmi">IPMI</a-option><a-option value="http_api">HTTP/API</a-option><a-option value="database">数据库</a-option><a-option value="middleware">中间件只读接口</a-option><a-option value="agent">Agent</a-option></a-select></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="型号匹配（JSON 数组）"><a-textarea v-model="form.model_matchers" :rows="2" placeholder='["S6520*","S5560*"]' /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="指标映射（JSON 数组）" :extra="metricMappingExtra"><a-textarea v-model="form.metric_mappings" :rows="5" :placeholder="metricMappingPlaceholder" /></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="索引发现（JSON 数组）"><a-textarea v-model="form.index_discoveries" :rows="4" placeholder='[{"type":"wireless_ap","identity_oid":"1.3.6.1...","name_oid":"1.3.6.1...","status_oid":"1.3.6.1...","attributes":{"mac":"1.3.6.1..."}}]' /></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="库存映射（JSON 数组）" extra="HTTP/API 用于把响应数组映射为 AP、存储部件等库存"><a-textarea v-model="form.inventory_mappings" :rows="4" :placeholder="inventoryMappingPlaceholder" /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="固定只读查询（JSON 数组）" extra="SNMP 使用指标映射和索引发现；SSH 只允许 show/display；设备 HTTP/API 只允许站内 GET 路径"><a-textarea v-model="form.read_only_queries" :rows="5" :placeholder="readOnlyQueryPlaceholder" /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="关联告警规则编码（JSON 数组）"><a-textarea v-model="form.alert_rule_codes" :rows="2" placeholder='["CPU_HIGH","DEVICE_OFFLINE"]' /></a-form-item></a-col>
-          <template v-if="isPhysicalDeviceTemplate">
-            <a-col :span="8"><a-form-item label="真实设备联调" extra="通用模板不能标记为已联调"><a-switch v-model="form.adapter_verified" :disabled="form.manufacturer_code === 'GENERIC'" /></a-form-item></a-col>
-            <a-col v-if="form.adapter_verified" :span="16"><a-form-item label="联调验证说明" required extra="填写真实设备型号、固件版本和联调日期；采集内容变更后必须重新联调"><a-textarea v-model="form.verification_note" :rows="3" /></a-form-item></a-col>
-          </template>
-          <a-col :span="18"><a-form-item label="说明"><a-input v-model="form.description" /></a-form-item></a-col>
-          <a-col :span="6"><a-form-item label="保存并启用"><a-switch v-model="form.enabled" /></a-form-item></a-col>
-        </a-row>
-      </a-form>
-    </a-modal>
+    <collection-template-form-modal
+      v-model:visible="formVisible"
+      :record="editingRecord"
+      :default-manufacturer-code="manufacturerCode"
+      :manufacturers="manufacturers"
+      @saved="loadData"
+    />
 
     <a-modal v-model:visible="importVisible" title="导入采集模板" width="700px" @ok="doImport">
-      <a-alert type="warning" class="mb-16">相同编码但内容不同时会直接提示冲突。本页面不会修改告警规则，请选择现有规则并更换模板编码后再导入。</a-alert>
+      <a-alert type="warning" class="mb-16">相同模板编码但内容不同时会直接提示冲突，请更换模板编码后再导入。</a-alert>
       <a-textarea v-model="importText" :rows="16" placeholder="粘贴导出的 JSON" />
     </a-modal>
   </a-modal>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { TableColumnData } from '@arco-design/web-vue'
 import { fetchManufacturerOptions } from '@/api/ops/asset'
-import { createCollectionTemplate, deleteCollectionTemplate, exportCollectionTemplate, fetchCollectionTemplates, importCollectionTemplate, updateCollectionTemplate, type CollectionTemplate, type CollectionTemplateInput } from '@/api/ops/collection'
+import {
+  deleteCollectionTemplate,
+  exportCollectionTemplate,
+  fetchCollectionTemplates,
+  importCollectionTemplate,
+  type CollectionTemplate,
+} from '@/api/ops/collection'
+import CollectionTemplateFormModal from './CollectionTemplateFormModal.vue'
 
 defineProps<{ visible: boolean }>()
 const emit = defineEmits<{ (event: 'update:visible', value: boolean): void }>()
 const manufacturers = ref<Array<{ id: number; code: string; name: string }>>([])
 const rows = ref<CollectionTemplate[]>([])
 const loading = ref(false)
-const saving = ref(false)
 const keyword = ref('')
 const manufacturerCode = ref('')
 const formVisible = ref(false)
 const importVisible = ref(false)
 const importText = ref('')
-const editingId = ref<number>()
+const editingRecord = ref<CollectionTemplate>()
 const pagination = reactive({ current: 1, pageSize: 10, total: 0 })
-const emptyForm = (): CollectionTemplateInput => ({ code: '', name: '', manufacturer_code: '', resource_category: 'network', protocol: 'snmp', model_matchers: '[]', metric_mappings: '[]', index_discoveries: '[]', inventory_mappings: '[]', read_only_queries: '[]', alert_rule_codes: '[]', description: '', adapter_verified: false, verification_note: '', enabled: false })
-const form = reactive<CollectionTemplateInput>(emptyForm())
-const isPhysicalDeviceTemplate = computed(() => ['network', 'security', 'storage'].includes(form.resource_category))
-const metricMappingExtra = computed(() => form.protocol === 'http_api' ? '使用 JSON Pointer 从固定 GET 响应中读取指标' : 'SNMP 的真实 OID 在此维护，指标编码必须以设备类型开头')
-const metricMappingPlaceholder = computed(() => form.protocol === 'http_api'
-  ? '[{"code":"storage.pool.used_percent","query_code":"pools","items_pointer":"/data/pools","value_pointer":"/usedPercent","unit":"percent","labels":{"pool":"/name"}}]'
-  : '[{"code":"network.cpu.usage_percent","oid":"1.3.6.1...","operation":"get","unit":"percent"}]')
-const inventoryMappingPlaceholder = computed(() => form.protocol === 'http_api'
-  ? '[{"type":"storage_pool","query_code":"pools","items_pointer":"/data/pools","identity_pointer":"/id","name_pointer":"/name","status_pointer":"/status","attributes":{"capacity_bytes":"/capacityBytes","used_bytes":"/usedBytes"}}]'
-  : '[]')
-const readOnlyQueryPlaceholder = computed(() => {
-  if (form.protocol === 'http_api') return '[{"code":"pools","operation":"http_get","path":"/api/v1/pools"}]'
-  if (form.protocol === 'ssh') return '[{"code":"system_version","operation":"ssh_show","command":"display version"},{"code":"running_config","operation":"ssh_show","command":"display current-configuration","purpose":"config_backup"}]'
-  return '[]'
-})
+const supportsAdapterVerification = (category: string, protocol: string) =>
+  ['network', 'security', 'storage'].includes(category) || (category === 'host' && ['redfish', 'ipmi'].includes(protocol))
 const columns: TableColumnData[] = [
-  { title: '编码', dataIndex: 'code' }, { title: '模板名称', dataIndex: 'name' }, { title: '厂商', dataIndex: 'manufacturer_code', width: 130 },
-  { title: '设备类型', dataIndex: 'resource_category', width: 100 }, { title: '协议', dataIndex: 'protocol', width: 100 }, { title: '版本', dataIndex: 'version', width: 80 },
-  { title: '联调状态', slotName: 'adapter_verified', width: 130 }, { title: '状态', slotName: 'enabled', width: 90 }, { title: '操作', slotName: 'actions', width: 190, fixed: 'right' },
+  { title: '编码', dataIndex: 'code' },
+  { title: '模板名称', dataIndex: 'name' },
+  { title: '厂商', dataIndex: 'manufacturer_code', width: 130 },
+  { title: '设备类型', dataIndex: 'resource_category', width: 100 },
+  { title: '协议', dataIndex: 'protocol', width: 100 },
+  { title: '版本', dataIndex: 'version', width: 80 },
+  { title: '联调状态', slotName: 'adapter_verified', width: 130 },
+  { title: '状态', slotName: 'enabled', width: 90 },
+  { title: '操作', slotName: 'actions', width: 190, fixed: 'right' },
 ]
 const close = () => emit('update:visible', false)
-const loadManufacturers = async () => { const res: any = await fetchManufacturerOptions(); manufacturers.value = res.details || [] }
-const loadData = async () => { loading.value = true; try { const res = await fetchCollectionTemplates({ page: pagination.current, size: pagination.pageSize, keyword: keyword.value || undefined, manufacturer_code: manufacturerCode.value || undefined }); rows.value = res.details?.data || []; pagination.total = res.details?.total || 0 } finally { loading.value = false } }
-const onPageChange = (page: number) => { pagination.current = page; loadData() }
-const openCreate = () => { editingId.value = undefined; Object.assign(form, emptyForm(), { manufacturer_code: manufacturerCode.value }); formVisible.value = true }
-const openEdit = (row: CollectionTemplate) => { editingId.value = row.id; Object.assign(form, { code: row.code, name: row.name, manufacturer_code: row.manufacturer_code, resource_category: row.resource_category, protocol: row.protocol, model_matchers: row.model_matchers, metric_mappings: row.metric_mappings, index_discoveries: row.index_discoveries, inventory_mappings: row.inventory_mappings, read_only_queries: row.read_only_queries, alert_rule_codes: row.alert_rule_codes, description: row.description || '', adapter_verified: row.adapter_verified, verification_note: row.verification_note || '', enabled: row.enabled }); formVisible.value = true }
-const ensureJsonArrays = () => ['model_matchers', 'metric_mappings', 'index_discoveries', 'inventory_mappings', 'read_only_queries', 'alert_rule_codes'].every((field) => { try { return Array.isArray(JSON.parse(String((form as any)[field]))) } catch { return false } })
-const save = async () => { if (!form.code.trim() || !form.name.trim() || !form.manufacturer_code) { Message.warning('请完整填写模板基本信息'); return }; if (!ensureJsonArrays()) { Message.warning('模板各 JSON 配置必须是数组'); return }; if (form.adapter_verified && !form.verification_note?.trim()) { Message.warning('请填写真实设备联调验证说明'); return }; saving.value = true; try { const res: any = editingId.value ? await updateCollectionTemplate(editingId.value, form) : await createCollectionTemplate(form); if (res.code !== 0) { Message.error(res.message || '保存失败'); return }; Message.success(form.enabled ? '已保存并启用' : '已保存'); formVisible.value = false; await loadData() } finally { saving.value = false } }
-const remove = async (row: CollectionTemplate) => { const res: any = await deleteCollectionTemplate(row.id); if (res.code === 0) { Message.success('已删除'); await loadData() } else Message.error(res.message || '删除失败') }
-const doExport = async (row: CollectionTemplate) => { const res: any = await exportCollectionTemplate(row.id); if (res.code !== 0) { Message.error(res.message || '导出失败'); return }; await navigator.clipboard.writeText(JSON.stringify(res.details, null, 2)); Message.success('模板 JSON 已复制到剪贴板') }
-const openImport = () => { importText.value = ''; importVisible.value = true }
-const doImport = async () => { let payload: Record<string, unknown>; try { const parsed = JSON.parse(importText.value); if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') throw new Error('模板必须是 JSON 对象'); payload = parsed } catch { Message.warning('请输入合法的模板 JSON 对象'); return }; const res: any = await importCollectionTemplate(payload); if (res.code !== 0) { Message.error(res.message || '导入失败'); return }; Message.success('导入成功'); importVisible.value = false; await loadData() }
-watch(manufacturerCode, loadData)
-watch(() => [form.resource_category, form.manufacturer_code], () => {
-  if (!isPhysicalDeviceTemplate.value || form.manufacturer_code === 'GENERIC') {
-    form.adapter_verified = false
-    form.verification_note = ''
+const loadManufacturers = async () => {
+  const res: any = await fetchManufacturerOptions()
+  manufacturers.value = res.details || []
+}
+const loadData = async () => {
+  loading.value = true
+  try {
+    const res = await fetchCollectionTemplates({
+      page: pagination.current,
+      size: pagination.pageSize,
+      keyword: keyword.value || undefined,
+      manufacturer_code: manufacturerCode.value || undefined,
+    })
+    rows.value = res.details?.data || []
+    pagination.total = res.details?.total || 0
+  } finally {
+    loading.value = false
   }
+}
+const onPageChange = (page: number) => {
+  pagination.current = page
+  loadData()
+}
+const openCreate = () => {
+  editingRecord.value = undefined
+  formVisible.value = true
+}
+const openEdit = (row: CollectionTemplate) => {
+  editingRecord.value = row
+  formVisible.value = true
+}
+const remove = async (row: CollectionTemplate) => {
+  const res: any = await deleteCollectionTemplate(row.id)
+  if (res.code === 0) {
+    Message.success('已删除')
+    await loadData()
+  } else Message.error(res.message || '删除失败')
+}
+const doExport = async (row: CollectionTemplate) => {
+  const res: any = await exportCollectionTemplate(row.id)
+  if (res.code !== 0) {
+    Message.error(res.message || '导出失败')
+    return
+  }
+  await navigator.clipboard.writeText(JSON.stringify(res.details, null, 2))
+  Message.success('模板 JSON 已复制到剪贴板')
+}
+const openImport = () => {
+  importText.value = ''
+  importVisible.value = true
+}
+const doImport = async () => {
+  let payload: Record<string, unknown>
+  try {
+    const parsed = JSON.parse(importText.value)
+    if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object') throw new Error('模板必须是 JSON 对象')
+    payload = parsed
+  } catch {
+    Message.warning('请输入合法的模板 JSON 对象')
+    return
+  }
+  const res: any = await importCollectionTemplate(payload)
+  if (res.code !== 0) {
+    Message.error(res.message || '导入失败')
+    return
+  }
+  Message.success('导入成功')
+  importVisible.value = false
+  await loadData()
+}
+watch(manufacturerCode, loadData)
+onMounted(async () => {
+  await loadManufacturers()
+  await loadData()
 })
-onMounted(async () => { await loadManufacturers(); await loadData() })
 </script>
 
 <style scoped lang="less">
-.mb-16 { margin-bottom: 16px; }
-.toolbar { display: flex; justify-content: flex-end; margin-bottom: 16px; }
+.mb-16 {
+  margin-bottom: 16px;
+}
+.toolbar {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 16px;
+}
 </style>
diff --git a/src/views/ops/pages/assets/supplier/components/CollectionTemplateFormModal.vue b/src/views/ops/pages/assets/supplier/components/CollectionTemplateFormModal.vue
new file mode 100644
index 0000000..e9a8a49
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/CollectionTemplateFormModal.vue
@@ -0,0 +1,471 @@
+<template>
+  <a-modal
+    :visible="visible"
+    :title="record ? '编辑厂商采集模板' : '新增厂商采集模板'"
+    width="820px"
+    :body-style="{ maxHeight: '72vh', overflowY: 'auto' }"
+    :ok-loading="saving"
+    unmount-on-close
+    @ok="save"
+    @cancel="close"
+  >
+    <a-form :model="draft" layout="vertical">
+      <div class="section-heading">基本信息</div>
+      <a-row :gutter="16">
+        <a-col :span="12">
+          <a-form-item label="稳定编码" required><a-input v-model="draft.code" placeholder="如 H3C-SWITCH-SNMP" /></a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="模板名称" required><a-input v-model="draft.name" /></a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="厂商" required>
+            <a-select v-model="draft.manufacturer_code" allow-search>
+              <a-option value="GENERIC">通用</a-option>
+              <a-option v-for="item in visibleManufacturers" :key="item.code" :value="item.code">{{ item.name }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="设备类型" required>
+            <a-select v-model="draft.resource_category">
+              <a-option value="host">服务器</a-option>
+              <a-option value="network">网络设备</a-option>
+              <a-option value="security">安全设备</a-option>
+              <a-option value="storage">存储设备</a-option>
+              <a-option value="room_device">机房设备</a-option>
+              <a-option value="pc">PC 终端</a-option>
+              <a-option value="database">数据库</a-option>
+              <a-option value="middleware">中间件</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="采集协议" required>
+            <a-select :model-value="draft.protocol" @change="changeProtocol">
+              <a-option value="snmp">SNMP</a-option>
+              <a-option value="ssh">SSH</a-option>
+              <a-option value="redfish">Redfish</a-option>
+              <a-option value="ipmi">IPMI</a-option>
+              <a-option value="http_api">HTTP/API</a-option>
+              <a-option value="database">数据库</a-option>
+              <a-option value="middleware">中间件只读接口</a-option>
+              <a-option value="agent">Agent</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+
+      <model-matcher-editor v-model="draft.modelMatchers" :resource-category="draft.resource_category" :protocol="draft.protocol" />
+
+      <div class="config-mode-row">
+        <div>
+          <div class="field-label">配置方式</div>
+          <div class="field-help">表单适合日常维护，JSON 专家模式用于批量调整；两种方式编辑的是同一份配置。</div>
+        </div>
+        <a-radio-group :model-value="configMode" type="button" @change="changeConfigMode">
+          <a-radio value="form">表单化配置</a-radio>
+          <a-radio value="json">JSON 专家模式</a-radio>
+        </a-radio-group>
+      </div>
+
+      <div class="section-heading technical-heading">{{ protocolName }}配置</div>
+      <template v-if="configMode === 'form'">
+        <snmp-template-form
+          v-if="draft.protocol === 'snmp'"
+          v-model:metric-mappings="snmpMetricMappings"
+          v-model:index-discoveries="snmpIndexDiscoveries"
+          :metric-definitions="metricDefinitions"
+          :loading="metricLoading"
+          :resource-category="draft.resource_category"
+          :catalog-error="catalogError"
+        />
+        <http-api-template-form
+          v-else-if="draft.protocol === 'http_api'"
+          v-model:metric-mappings="httpMetricMappings"
+          v-model:inventory-mappings="httpInventoryMappings"
+          v-model:read-only-queries="httpReadOnlyQueries"
+          :metric-definitions="metricDefinitions"
+          :loading="metricLoading"
+          :resource-category="draft.resource_category"
+          :catalog-error="catalogError"
+        />
+        <read-only-query-template-form v-else-if="draft.protocol === 'ssh'" v-model="readOnlyQueries" kind="ssh" />
+        <read-only-query-template-form v-else-if="draft.protocol === 'database'" v-model="readOnlyQueries" kind="database" />
+        <middleware-metric-form
+          v-else-if="draft.protocol === 'middleware'"
+          v-model="middlewareMetricMappings"
+          :metric-definitions="metricDefinitions"
+          :loading="metricLoading"
+          :catalog-error="catalogError"
+        />
+        <a-alert v-else-if="draft.protocol === 'redfish' || draft.protocol === 'ipmi'" type="info">
+          {{ protocolName }} 使用平台固定的只读标准适配器。模板只维护厂商和已验证型号，不允许自定义查询、OID 或字段映射。
+        </a-alert>
+        <a-alert v-else type="info">Agent 使用平台固定的 host_snapshot 只读快照，不提供自定义执行内容。</a-alert>
+      </template>
+      <collection-template-json-editor
+        v-else
+        :model-value="jsonDraft"
+        :protocol="draft.protocol"
+        :errors="jsonErrors"
+        @update:model-value="updateJsonDraft"
+        @clear-error="clearJsonError"
+      />
+
+      <template v-if="supportsAdapterVerification">
+        <div class="section-heading status-heading">联调状态登记</div>
+        <a-row :gutter="16">
+          <a-col :span="8">
+            <a-form-item label="已完成真实设备联调" extra="仅登记线下联调结果，不会在此连接设备">
+              <a-switch v-model="draft.adapter_verified" :disabled="draft.manufacturer_code === 'GENERIC'" />
+            </a-form-item>
+          </a-col>
+          <a-col v-if="draft.adapter_verified" :span="16">
+            <a-form-item label="联调验证说明" required extra="采集内容变更后需重新确认联调状态">
+              <a-textarea v-model="draft.verification_note" :rows="3" placeholder="填写真实设备型号、固件版本和联调日期" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </template>
+
+      <div class="section-heading">其他信息</div>
+      <a-row :gutter="16">
+        <a-col :span="18">
+          <a-form-item label="说明"><a-input v-model="draft.description" /></a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="保存并启用"><a-switch v-model="draft.enabled" /></a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import { Message, Modal } from '@arco-design/web-vue'
+import type { CollectionTemplate } from '@/api/ops/collection'
+import { createCollectionTemplate, updateCollectionTemplate } from '@/api/ops/collection'
+import { fetchControlMetricDefinitionOptions, type ControlMetricDefinition } from '@/api/ops/dcControl'
+import CollectionTemplateJsonEditor from './collection-template/CollectionTemplateJsonEditor.vue'
+import HttpApiTemplateForm from './collection-template/HttpApiTemplateForm.vue'
+import MiddlewareMetricForm from './collection-template/MiddlewareMetricForm.vue'
+import ModelMatcherEditor from './collection-template/ModelMatcherEditor.vue'
+import ReadOnlyQueryTemplateForm from './collection-template/ReadOnlyQueryTemplateForm.vue'
+import SnmpTemplateForm from './collection-template/SnmpTemplateForm.vue'
+import {
+  createEmptyCollectionTemplateDraft,
+  createEmptyTechnicalConfig,
+  decodeCollectionTemplate,
+  encodeCollectionTemplateInput,
+  isTechnicalConfigEmpty,
+  technicalConfigFromJson,
+  technicalConfigToJson,
+} from './collection-template/codec'
+import type {
+  CollectionTemplateConfigMode,
+  CollectionTemplateDraft,
+  CollectionTemplateJsonDraft,
+  CollectionTemplateProtocol,
+  DatabaseReadOnlyQuery,
+  HttpInventoryMapping,
+  HttpMetricMapping,
+  HttpReadOnlyQuery,
+  ManufacturerOption,
+  MiddlewareMetricMapping,
+  SnmpIndexDiscovery,
+  SnmpMetricMapping,
+  SshReadOnlyQuery,
+} from './collection-template/types'
+import { validateCollectionTemplateDraft } from './collection-template/validation'
+
+const props = defineProps<{
+  visible: boolean
+  record?: CollectionTemplate
+  defaultManufacturerCode?: string
+  manufacturers: ManufacturerOption[]
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:visible', value: boolean): void
+  (event: 'saved'): void
+}>()
+
+const saving = ref(false)
+const configMode = ref<CollectionTemplateConfigMode>('form')
+const metricDefinitions = ref<ControlMetricDefinition[]>([])
+const metricLoading = ref(false)
+const catalogError = ref('')
+const draft = reactive<CollectionTemplateDraft>(createEmptyCollectionTemplateDraft())
+const jsonDraft = reactive<CollectionTemplateJsonDraft>({
+  metricMappings: '[]',
+  indexDiscoveries: '[]',
+  inventoryMappings: '[]',
+  readOnlyQueries: '[]',
+})
+const jsonErrors = reactive<Partial<Record<keyof CollectionTemplateJsonDraft, string>>>({})
+
+const visibleManufacturers = computed(() => props.manufacturers.filter((item) => item.code !== 'GENERIC'))
+const supportsAdapterVerification = computed(
+  () =>
+    ['network', 'security', 'storage'].includes(draft.resource_category) ||
+    (draft.resource_category === 'host' && ['redfish', 'ipmi'].includes(draft.protocol))
+)
+const protocolName = computed(() => {
+  const names: Record<CollectionTemplateProtocol, string> = {
+    snmp: 'SNMP',
+    ssh: 'SSH',
+    redfish: 'Redfish',
+    ipmi: 'IPMI',
+    http_api: 'HTTP/API',
+    database: '数据库',
+    middleware: '中间件',
+    agent: 'Agent',
+  }
+  return names[draft.protocol]
+})
+
+const snmpMetricMappings = computed<SnmpMetricMapping[]>({
+  get: () => draft.technicalConfig.metricMappings as SnmpMetricMapping[],
+  set: (value) => {
+    draft.technicalConfig.metricMappings = value
+  },
+})
+const snmpIndexDiscoveries = computed<SnmpIndexDiscovery[]>({
+  get: () => draft.technicalConfig.indexDiscoveries,
+  set: (value) => {
+    draft.technicalConfig.indexDiscoveries = value
+  },
+})
+const httpMetricMappings = computed<HttpMetricMapping[]>({
+  get: () => draft.technicalConfig.metricMappings as HttpMetricMapping[],
+  set: (value) => {
+    draft.technicalConfig.metricMappings = value
+  },
+})
+const httpInventoryMappings = computed<HttpInventoryMapping[]>({
+  get: () => draft.technicalConfig.inventoryMappings,
+  set: (value) => {
+    draft.technicalConfig.inventoryMappings = value
+  },
+})
+const httpReadOnlyQueries = computed<HttpReadOnlyQuery[]>({
+  get: () => draft.technicalConfig.readOnlyQueries as HttpReadOnlyQuery[],
+  set: (value) => {
+    draft.technicalConfig.readOnlyQueries = value
+  },
+})
+const readOnlyQueries = computed<Array<SshReadOnlyQuery | DatabaseReadOnlyQuery>>({
+  get: () => draft.technicalConfig.readOnlyQueries as Array<SshReadOnlyQuery | DatabaseReadOnlyQuery>,
+  set: (value) => {
+    draft.technicalConfig.readOnlyQueries = value
+  },
+})
+const middlewareMetricMappings = computed<MiddlewareMetricMapping[]>({
+  get: () => draft.technicalConfig.metricMappings as MiddlewareMetricMapping[],
+  set: (value) => {
+    draft.technicalConfig.metricMappings = value
+  },
+})
+
+const clearJsonErrors = () => {
+  jsonErrors.metricMappings = undefined
+  jsonErrors.indexDiscoveries = undefined
+  jsonErrors.inventoryMappings = undefined
+  jsonErrors.readOnlyQueries = undefined
+}
+
+const close = () => emit('update:visible', false)
+
+const initialize = () => {
+  try {
+    const initialDraft = props.record
+      ? decodeCollectionTemplate(props.record)
+      : createEmptyCollectionTemplateDraft(props.defaultManufacturerCode || '')
+    Object.assign(draft, initialDraft)
+    configMode.value = 'form'
+    Object.assign(jsonDraft, technicalConfigToJson(draft.technicalConfig, draft.protocol))
+    clearJsonErrors()
+  } catch (error) {
+    Message.error(error instanceof Error ? error.message : '模板配置解析失败')
+    close()
+  }
+}
+
+const needsMetricCatalog = () =>
+  draft.protocol === 'middleware' ||
+  (['snmp', 'http_api'].includes(draft.protocol) && ['network', 'security', 'storage'].includes(draft.resource_category))
+
+let metricRequestSequence = 0
+const loadMetricDefinitions = async () => {
+  const sequence = ++metricRequestSequence
+  metricDefinitions.value = []
+  catalogError.value = ''
+  if (!props.visible || !needsMetricCatalog()) return
+  metricLoading.value = true
+  try {
+    const response = await fetchControlMetricDefinitionOptions({ resource_category: draft.resource_category })
+    if (sequence !== metricRequestSequence) return
+    if (response.code !== undefined && response.code !== 0) throw new Error(response.message || '标准指标目录加载失败')
+    metricDefinitions.value = response.details?.list || []
+  } catch (error) {
+    if (sequence !== metricRequestSequence) return
+    catalogError.value = error instanceof Error ? error.message : '标准指标目录加载失败'
+  } finally {
+    if (sequence === metricRequestSequence) metricLoading.value = false
+  }
+}
+
+const resolveJsonErrorField = (message: string): keyof CollectionTemplateJsonDraft => {
+  if (message.startsWith('索引发现')) return 'indexDiscoveries'
+  if (message.startsWith('库存映射')) return 'inventoryMappings'
+  if (message.startsWith('固定只读查询')) return 'readOnlyQueries'
+  return 'metricMappings'
+}
+
+const syncJsonIntoTechnicalConfig = () => {
+  clearJsonErrors()
+  try {
+    draft.technicalConfig = technicalConfigFromJson(jsonDraft, draft.protocol)
+    return true
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'JSON 配置解析失败'
+    jsonErrors[resolveJsonErrorField(message)] = message
+    Message.warning(message)
+    return false
+  }
+}
+
+const changeConfigMode = (value: string | number | boolean) => {
+  const nextMode = String(value) as CollectionTemplateConfigMode
+  if (nextMode === configMode.value) return
+  if (nextMode === 'json') {
+    Object.assign(jsonDraft, technicalConfigToJson(draft.technicalConfig, draft.protocol))
+    clearJsonErrors()
+    configMode.value = 'json'
+    return
+  }
+  if (syncJsonIntoTechnicalConfig()) configMode.value = 'form'
+}
+
+const applyProtocol = (protocol: CollectionTemplateProtocol) => {
+  draft.protocol = protocol
+  draft.technicalConfig = createEmptyTechnicalConfig(protocol)
+  configMode.value = 'form'
+  Object.assign(jsonDraft, technicalConfigToJson(draft.technicalConfig, protocol))
+  clearJsonErrors()
+}
+
+const changeProtocol = (value: string | number | boolean) => {
+  const protocol = String(value) as CollectionTemplateProtocol
+  if (protocol === draft.protocol) return
+  if (configMode.value === 'json' && !syncJsonIntoTechnicalConfig()) return
+  if (isTechnicalConfigEmpty(draft.technicalConfig) || ['redfish', 'ipmi', 'agent'].includes(draft.protocol)) {
+    applyProtocol(protocol)
+    return
+  }
+  Modal.warning({
+    title: '切换采集协议',
+    content: '切换协议会清空当前协议配置，适用型号和基本信息会保留。',
+    hideCancel: false,
+    onOk: () => applyProtocol(protocol),
+  })
+}
+
+const updateJsonDraft = (value: CollectionTemplateJsonDraft) => Object.assign(jsonDraft, value)
+const clearJsonError = (field: keyof CollectionTemplateJsonDraft) => {
+  jsonErrors[field] = undefined
+}
+
+const save = async () => {
+  if (configMode.value === 'json' && !syncJsonIntoTechnicalConfig()) return
+  try {
+    validateCollectionTemplateDraft(draft)
+  } catch (error) {
+    Message.warning(error instanceof Error ? error.message : '请检查模板配置')
+    return
+  }
+  saving.value = true
+  try {
+    const payload = encodeCollectionTemplateInput(draft)
+    const response = props.record ? await updateCollectionTemplate(props.record.id, payload) : await createCollectionTemplate(payload)
+    if (response.code !== 0) {
+      Message.error(response.message || '保存失败')
+      return
+    }
+    Message.success(draft.enabled ? '已保存并启用' : '已保存')
+    emit('update:visible', false)
+    emit('saved')
+  } finally {
+    saving.value = false
+  }
+}
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) initialize()
+  }
+)
+watch(
+  () => [draft.resource_category, draft.protocol, props.visible],
+  () => loadMetricDefinitions()
+)
+watch(
+  () => [draft.resource_category, draft.protocol, draft.manufacturer_code],
+  () => {
+    if (!supportsAdapterVerification.value || draft.manufacturer_code === 'GENERIC') {
+      draft.adapter_verified = false
+      draft.verification_note = ''
+    }
+  }
+)
+</script>
+
+<style scoped lang="less">
+.section-heading {
+  display: flex;
+  margin: 2px 0 14px;
+  color: var(--color-text-1);
+  font-size: 15px;
+  font-weight: 500;
+  align-items: center;
+  gap: 10px;
+}
+
+.section-heading::after {
+  height: 1px;
+  background: var(--color-border-2);
+  content: '';
+  flex: 1;
+}
+
+.technical-heading,
+.status-heading {
+  margin-top: 22px;
+}
+
+.config-mode-row {
+  display: flex;
+  padding: 12px 14px;
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+  background: var(--color-fill-1);
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+}
+
+.field-label {
+  color: var(--color-text-1);
+  font-size: 14px;
+}
+
+.field-help {
+  margin-top: 4px;
+  color: var(--color-text-3);
+  font-size: 12px;
+  line-height: 18px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/CollectionTemplateJsonEditor.vue b/src/views/ops/pages/assets/supplier/components/collection-template/CollectionTemplateJsonEditor.vue
new file mode 100644
index 0000000..093c365
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/CollectionTemplateJsonEditor.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="json-editor">
+    <a-alert type="warning" class="mode-alert">专家模式直接编辑协议配置。切回表单或保存时会统一校验，适用型号仍在上方表单中维护。</a-alert>
+    <div v-for="field in visibleFields" :key="field" class="json-field">
+      <div class="field-header">
+        <div>
+          <div class="field-label">{{ fieldMeta[field].label }}</div>
+          <div class="field-help">{{ fieldMeta[field].help }}</div>
+        </div>
+        <a-button size="mini" @click="format(field)">格式化 JSON</a-button>
+      </div>
+      <a-textarea
+        :model-value="modelValue[field]"
+        :rows="field === 'metricMappings' ? 10 : 7"
+        :class="{ 'has-error': fieldError(field) }"
+        @update:model-value="update(field, $event)"
+      />
+      <div v-if="fieldError(field)" class="error-text">{{ fieldError(field) }}</div>
+    </div>
+    <a-empty v-if="visibleFields.length === 0" description="当前协议使用平台固定适配器，没有可编辑的 JSON 配置" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive } from 'vue'
+import { jsonFieldsForProtocol } from './codec'
+import type { CollectionTemplateJsonDraft } from './types'
+
+const props = defineProps<{
+  modelValue: CollectionTemplateJsonDraft
+  protocol: string
+  errors: Partial<Record<keyof CollectionTemplateJsonDraft, string>>
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:modelValue', value: CollectionTemplateJsonDraft): void
+  (event: 'clear-error', field: keyof CollectionTemplateJsonDraft): void
+}>()
+
+const localErrors = reactive<Partial<Record<keyof CollectionTemplateJsonDraft, string>>>({})
+const visibleFields = computed(() => jsonFieldsForProtocol(props.protocol))
+const fieldMeta: Record<keyof CollectionTemplateJsonDraft, { label: string; help: string }> = {
+  metricMappings: { label: '指标映射', help: '当前协议的指标来源、标准指标及转换规则对象数组。' },
+  indexDiscoveries: { label: '索引发现', help: 'SNMP 表索引对应的库存对象和属性 OID 对象数组。' },
+  inventoryMappings: { label: '库存映射', help: 'HTTP/API 响应数组到库存对象的 JSON Pointer 映射。' },
+  readOnlyQueries: { label: '固定只读查询', help: '当前协议允许执行的固定只读查询对象数组。' },
+}
+
+const fieldError = (field: keyof CollectionTemplateJsonDraft) => props.errors[field] || localErrors[field]
+
+const update = (field: keyof CollectionTemplateJsonDraft, value: string) => {
+  localErrors[field] = undefined
+  emit('clear-error', field)
+  emit('update:modelValue', { ...props.modelValue, [field]: value })
+}
+
+const format = (field: keyof CollectionTemplateJsonDraft) => {
+  try {
+    const parsed: unknown = JSON.parse(props.modelValue[field])
+    if (!Array.isArray(parsed)) throw new Error('必须是 JSON 数组')
+    if (parsed.some((item) => !item || Array.isArray(item) || typeof item !== 'object')) throw new Error('数组中的每一项必须是对象')
+    update(field, JSON.stringify(parsed, null, 2))
+  } catch (error) {
+    localErrors[field] = error instanceof Error ? error.message : 'JSON 格式错误'
+  }
+}
+</script>
+
+<style scoped lang="less">
+.mode-alert,
+.json-field {
+  margin-bottom: 16px;
+}
+
+.field-header {
+  display: flex;
+  margin-bottom: 8px;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.field-label {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.field-help {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.has-error :deep(textarea) {
+  border-color: rgb(var(--danger-6));
+}
+
+.error-text {
+  margin-top: 5px;
+  color: rgb(var(--danger-6));
+  font-size: 12px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/HttpApiTemplateForm.vue b/src/views/ops/pages/assets/supplier/components/collection-template/HttpApiTemplateForm.vue
new file mode 100644
index 0000000..f79c536
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/HttpApiTemplateForm.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="protocol-form">
+    <section class="config-section">
+      <div class="section-header">
+        <div>
+          <div class="section-title">固定 GET 查询</div>
+          <div class="section-help">只允许访问当前设备地址下的站内路径，认证信息仍由统一凭证提供。</div>
+        </div>
+        <a-button type="primary" size="small" @click="addQuery">添加查询</a-button>
+      </div>
+      <a-empty v-if="readOnlyQueries.length === 0" description="至少添加一条固定 GET 查询" />
+      <a-card v-for="(row, index) in readOnlyQueries" :key="index" class="config-card" size="small">
+        <template #title>查询 {{ index + 1 }}</template>
+        <template #extra><a-button type="text" status="danger" @click="removeQuery(index)">删除</a-button></template>
+        <a-row :gutter="12">
+          <a-col :span="8">
+            <a-form-item label="稳定编码" required>
+              <a-input :model-value="row.code" placeholder="如 pools" @update:model-value="updateQuery(index, { code: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="5">
+            <a-form-item label="请求方式"><a-input model-value="GET" disabled /></a-form-item>
+          </a-col>
+          <a-col :span="11">
+            <a-form-item label="站内路径" required>
+              <a-input :model-value="row.path" placeholder="如 /api/v1/pools" @update:model-value="updateQuery(index, { path: $event })" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-card>
+    </section>
+
+    <section class="config-section">
+      <div class="section-header">
+        <div>
+          <div class="section-title">指标映射</div>
+          <div class="section-help">从查询返回的 JSON 中读取平台标准指标。</div>
+        </div>
+        <a-button size="small" :disabled="Boolean(catalogError)" @click="addMetric">添加指标</a-button>
+      </div>
+      <a-alert v-if="catalogError" type="error" class="section-alert">{{ catalogError }}</a-alert>
+      <a-empty v-if="metricMappings.length === 0" description="暂未配置指标映射" />
+      <a-card v-for="(row, index) in metricMappings" :key="index" class="config-card" size="small">
+        <template #title>指标 {{ index + 1 }}</template>
+        <template #extra><a-button type="text" status="danger" @click="removeMetric(index)">删除</a-button></template>
+        <a-row :gutter="12">
+          <a-col :span="12">
+            <a-form-item label="标准指标" required>
+              <a-select :model-value="row.code" allow-search :loading="loading" @update:model-value="selectMetric(index, $event)">
+                <a-option v-for="metric in metricDefinitions" :key="metric.metric_code" :value="metric.metric_code">
+                  {{ metric.metric_name }}（{{ metric.metric_code }}{{ metric.unit ? `，${metric.unit}` : '' }}）
+                </a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="查询编码" required>
+              <a-select :model-value="row.query_code" allow-search @update:model-value="updateMetric(index, { query_code: $event })">
+                <a-option v-for="code in queryCodes" :key="code" :value="code">{{ code }}</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="对象数组路径">
+              <a-input
+                :model-value="row.items_pointer"
+                placeholder="如 /data/items"
+                @update:model-value="updateMetric(index, { items_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="数值路径" required>
+              <a-input
+                :model-value="row.value_pointer"
+                placeholder="如 /usedPercent"
+                @update:model-value="updateMetric(index, { value_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
+            <a-form-item label="单位">
+              <a-input :model-value="row.unit" @update:model-value="updateMetric(index, { unit: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
+            <a-form-item label="必采">
+              <a-switch :model-value="row.required" @update:model-value="updateMetric(index, { required: Boolean($event) })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="缩放系数">
+              <a-input-number :model-value="row.scale" placeholder="默认 1" @update:model-value="updateMetric(index, { scale: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="偏移量">
+              <a-input-number
+                :model-value="row.offset"
+                placeholder="默认 0"
+                @update:model-value="updateMetric(index, { offset: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="标签路径">
+              <key-value-editor
+                :model-value="row.labels"
+                item-label="标签"
+                key-placeholder="标签名"
+                value-placeholder="JSON Pointer"
+                @update:model-value="updateMetric(index, { labels: $event })"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-card>
+    </section>
+
+    <section class="config-section">
+      <div class="section-header">
+        <div>
+          <div class="section-title">库存映射</div>
+          <div class="section-help">把响应数组映射为 AP、接口、存储部件等库存对象。</div>
+        </div>
+        <a-button size="small" @click="addInventory">添加库存</a-button>
+      </div>
+      <a-empty v-if="inventoryMappings.length === 0" description="暂未配置库存映射" />
+      <a-card v-for="(row, index) in inventoryMappings" :key="index" class="config-card" size="small">
+        <template #title>库存 {{ index + 1 }}</template>
+        <template #extra><a-button type="text" status="danger" @click="removeInventory(index)">删除</a-button></template>
+        <a-row :gutter="12">
+          <a-col :span="8">
+            <a-form-item label="对象类型" required>
+              <a-select
+                v-if="resourceCategory !== 'storage'"
+                :model-value="row.type"
+                @update:model-value="updateInventory(index, { type: $event })"
+              >
+                <a-option v-for="option in inventoryTypeOptions" :key="option.value" :value="option.value">{{ option.label }}</a-option>
+              </a-select>
+              <a-input
+                v-else
+                :model-value="row.type"
+                placeholder="如 storage_pool"
+                @update:model-value="updateInventory(index, { type: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="查询编码" required>
+              <a-select :model-value="row.query_code" @update:model-value="updateInventory(index, { query_code: $event })">
+                <a-option v-for="code in queryCodes" :key="code" :value="code">{{ code }}</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="对象数组路径">
+              <a-input
+                :model-value="row.items_pointer"
+                placeholder="如 /data/pools"
+                @update:model-value="updateInventory(index, { items_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="唯一 ID 路径" required>
+              <a-input
+                :model-value="row.identity_pointer"
+                placeholder="如 /id"
+                @update:model-value="updateInventory(index, { identity_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="名称路径">
+              <a-input
+                :model-value="row.name_pointer"
+                placeholder="如 /name"
+                @update:model-value="updateInventory(index, { name_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="状态路径">
+              <a-input
+                :model-value="row.status_pointer"
+                placeholder="如 /status"
+                @update:model-value="updateInventory(index, { status_pointer: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
+            <a-form-item label="必采">
+              <a-switch :model-value="row.required" @update:model-value="updateInventory(index, { required: Boolean($event) })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="属性路径">
+              <key-value-editor
+                :model-value="row.attributes"
+                item-label="属性"
+                key-placeholder="属性名"
+                value-placeholder="JSON Pointer"
+                @update:model-value="updateInventory(index, { attributes: $event })"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-card>
+    </section>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import type { ControlMetricDefinition } from '@/api/ops/dcControl'
+import KeyValueEditor from './KeyValueEditor.vue'
+import type { HttpInventoryMapping, HttpMetricMapping, HttpReadOnlyQuery } from './types'
+
+const props = defineProps<{
+  metricMappings: HttpMetricMapping[]
+  inventoryMappings: HttpInventoryMapping[]
+  readOnlyQueries: HttpReadOnlyQuery[]
+  metricDefinitions: ControlMetricDefinition[]
+  loading: boolean
+  resourceCategory: string
+  catalogError?: string
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:metricMappings', value: HttpMetricMapping[]): void
+  (event: 'update:inventoryMappings', value: HttpInventoryMapping[]): void
+  (event: 'update:readOnlyQueries', value: HttpReadOnlyQuery[]): void
+}>()
+
+const queryCodes = computed(() => props.readOnlyQueries.map((item) => item.code.trim()).filter(Boolean))
+const inventoryTypeOptions = computed(() => [
+  { value: props.resourceCategory, label: '设备自身' },
+  { value: 'wireless_ap', label: '无线 AP' },
+  { value: 'network_interface', label: '网络接口' },
+])
+
+const addQuery = () => emit('update:readOnlyQueries', [...props.readOnlyQueries, { code: '', operation: 'http_get', path: '' }])
+const updateQuery = (index: number, patch: Partial<HttpReadOnlyQuery>) => {
+  emit(
+    'update:readOnlyQueries',
+    props.readOnlyQueries.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch, operation: 'http_get' } : item))
+  )
+}
+const removeQuery = (index: number) => {
+  const code = props.readOnlyQueries[index].code.trim()
+  const metricReference = props.metricMappings.findIndex((item) => item.query_code === code)
+  const inventoryReference = props.inventoryMappings.findIndex((item) => item.query_code === code)
+  if (code && (metricReference >= 0 || inventoryReference >= 0)) {
+    const reference = metricReference >= 0 ? `指标 ${metricReference + 1}` : `库存 ${inventoryReference + 1}`
+    Message.warning(`查询 ${code} 仍被${reference}引用，请先调整引用`)
+    return
+  }
+  emit(
+    'update:readOnlyQueries',
+    props.readOnlyQueries.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+
+const addMetric = () =>
+  emit('update:metricMappings', [
+    ...props.metricMappings,
+    { code: '', query_code: queryCodes.value[0] || '', items_pointer: '', value_pointer: '', unit: '', required: false, labels: {} },
+  ])
+const updateMetric = (index: number, patch: Partial<HttpMetricMapping>) => {
+  emit(
+    'update:metricMappings',
+    props.metricMappings.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch } : item))
+  )
+}
+const selectMetric = (index: number, code: string) => {
+  const metric = props.metricDefinitions.find((item) => item.metric_code === code)
+  const patch: Partial<HttpMetricMapping> = { code }
+  if (!props.metricMappings[index].unit && metric?.unit) patch.unit = metric.unit
+  updateMetric(index, patch)
+}
+const removeMetric = (index: number) => {
+  emit(
+    'update:metricMappings',
+    props.metricMappings.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+
+const addInventory = () =>
+  emit('update:inventoryMappings', [
+    ...props.inventoryMappings,
+    {
+      type: props.resourceCategory === 'storage' ? 'storage_' : props.resourceCategory,
+      query_code: queryCodes.value[0] || '',
+      items_pointer: '',
+      identity_pointer: '',
+      name_pointer: '',
+      status_pointer: '',
+      attributes: {},
+      required: false,
+    },
+  ])
+const updateInventory = (index: number, patch: Partial<HttpInventoryMapping>) => {
+  emit(
+    'update:inventoryMappings',
+    props.inventoryMappings.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch } : item))
+  )
+}
+const removeInventory = (index: number) => {
+  emit(
+    'update:inventoryMappings',
+    props.inventoryMappings.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+</script>
+
+<style scoped lang="less">
+.config-section + .config-section {
+  margin-top: 20px;
+  padding-top: 18px;
+  border-top: 1px solid var(--color-border-2);
+}
+
+.section-header {
+  display: flex;
+  margin-bottom: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-title {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.section-help {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.section-alert,
+.config-card {
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/KeyValueEditor.vue b/src/views/ops/pages/assets/supplier/components/collection-template/KeyValueEditor.vue
new file mode 100644
index 0000000..56b252c
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/KeyValueEditor.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="key-value-editor">
+    <div v-for="([key, value], index) in entries" :key="`${key}-${index}`" class="key-value-row">
+      <a-input :model-value="key" :placeholder="keyPlaceholder" @update:model-value="updateKey(index, $event)" />
+      <a-input :model-value="value" :placeholder="valuePlaceholder" @update:model-value="updateValue(index, $event)" />
+      <a-button type="text" status="danger" @click="remove(index)">删除</a-button>
+    </div>
+    <a-button size="small" @click="add">添加{{ itemLabel }}</a-button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Message } from '@arco-design/web-vue'
+import { computed } from 'vue'
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: Record<string, string>
+    itemLabel?: string
+    keyPlaceholder?: string
+    valuePlaceholder?: string
+  }>(),
+  {
+    itemLabel: '映射',
+    keyPlaceholder: '字段名',
+    valuePlaceholder: '字段值',
+  }
+)
+
+const emit = defineEmits<{ (event: 'update:modelValue', value: Record<string, string>): void }>()
+const entries = computed(() => Object.entries(props.modelValue))
+
+const emitEntries = (rows: Array<[string, string]>) => emit('update:modelValue', Object.fromEntries(rows))
+
+const updateKey = (index: number, value: string) => {
+  const rows = [...entries.value] as Array<[string, string]>
+  if (rows.some(([key], itemIndex) => itemIndex !== index && key === value)) {
+    Message.warning(`字段名 ${value} 已存在`)
+    return
+  }
+  rows[index] = [value, rows[index][1]]
+  emitEntries(rows)
+}
+
+const updateValue = (index: number, value: string) => {
+  const rows = [...entries.value] as Array<[string, string]>
+  rows[index] = [rows[index][0], value]
+  emitEntries(rows)
+}
+
+const add = () => {
+  const used = new Set(Object.keys(props.modelValue))
+  let index = used.size + 1
+  let key = `field_${index}`
+  while (used.has(key)) {
+    index += 1
+    key = `field_${index}`
+  }
+  emit('update:modelValue', { ...props.modelValue, [key]: '' })
+}
+
+const remove = (index: number) => {
+  emitEntries(entries.value.filter((_, itemIndex) => itemIndex !== index))
+}
+</script>
+
+<style scoped lang="less">
+.key-value-editor {
+  width: 100%;
+}
+
+.key-value-row {
+  display: grid;
+  margin-bottom: 8px;
+  grid-template-columns: minmax(130px, 0.8fr) minmax(180px, 1.5fr) 54px;
+  gap: 8px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/MiddlewareMetricForm.vue b/src/views/ops/pages/assets/supplier/components/collection-template/MiddlewareMetricForm.vue
new file mode 100644
index 0000000..0dcdde7
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/MiddlewareMetricForm.vue
@@ -0,0 +1,109 @@
+<template>
+  <section class="config-section">
+    <div class="section-header">
+      <div>
+        <div class="section-title">指标映射</div>
+        <div class="section-help">把 Prometheus 指标名或 JSON/Jolokia 字段路径映射到平台标准指标。</div>
+      </div>
+      <a-button type="primary" size="small" :disabled="Boolean(catalogError)" @click="add">添加指标</a-button>
+    </div>
+    <a-alert v-if="catalogError" type="error" class="section-alert">{{ catalogError }}</a-alert>
+    <a-empty v-if="modelValue.length === 0" description="暂未配置指标映射" />
+    <a-card v-for="(row, index) in modelValue" :key="index" class="config-card" size="small">
+      <template #title>指标 {{ index + 1 }}</template>
+      <template #extra><a-button type="text" status="danger" @click="remove(index)">删除</a-button></template>
+      <a-row :gutter="12">
+        <a-col :span="12">
+          <a-form-item label="来源字段" required>
+            <a-input
+              :model-value="row.source"
+              placeholder="Prometheus 指标名或响应字段路径"
+              @update:model-value="update(index, { source: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="标准指标" required>
+            <a-select :model-value="row.code" allow-search :loading="loading" @update:model-value="selectMetric(index, $event)">
+              <a-option v-for="metric in metricDefinitions" :key="metric.metric_code" :value="metric.metric_code">
+                {{ metric.metric_name }}（{{ metric.metric_code }}{{ metric.unit ? `，${metric.unit}` : '' }}）
+              </a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="单位"><a-input :model-value="row.unit" @update:model-value="update(index, { unit: $event })" /></a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="分组">
+            <a-input
+              :model-value="row.group"
+              placeholder="如 jvm、thread、connectivity"
+              @update:model-value="update(index, { group: $event })"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-card>
+  </section>
+</template>
+
+<script setup lang="ts">
+import type { ControlMetricDefinition } from '@/api/ops/dcControl'
+import type { MiddlewareMetricMapping } from './types'
+
+const props = defineProps<{
+  modelValue: MiddlewareMetricMapping[]
+  metricDefinitions: ControlMetricDefinition[]
+  loading: boolean
+  catalogError?: string
+}>()
+
+const emit = defineEmits<{ (event: 'update:modelValue', value: MiddlewareMetricMapping[]): void }>()
+
+const add = () => emit('update:modelValue', [...props.modelValue, { source: '', code: '', unit: '', group: '' }])
+const update = (index: number, patch: Partial<MiddlewareMetricMapping>) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch } : item))
+  )
+}
+const selectMetric = (index: number, code: string) => {
+  const metric = props.metricDefinitions.find((item) => item.metric_code === code)
+  const patch: Partial<MiddlewareMetricMapping> = { code }
+  if (!props.modelValue[index].unit && metric?.unit) patch.unit = metric.unit
+  update(index, patch)
+}
+const remove = (index: number) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+</script>
+
+<style scoped lang="less">
+.section-header {
+  display: flex;
+  margin-bottom: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-title {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.section-help {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.section-alert,
+.config-card {
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/ModelMatcherEditor.vue b/src/views/ops/pages/assets/supplier/components/collection-template/ModelMatcherEditor.vue
new file mode 100644
index 0000000..46635b3
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/ModelMatcherEditor.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="matcher-editor">
+    <div class="field-label">{{ fieldLabel }}</div>
+    <div class="matcher-list">
+      <a-tag v-for="(item, index) in modelValue" :key="`${item}-${index}`" closable @close="remove(index)">
+        {{ item }}
+      </a-tag>
+      <span v-if="modelValue.length === 0" class="empty-text">暂未填写</span>
+    </div>
+    <a-input-search
+      v-model="pendingValue"
+      :button-text="`添加${fieldLabel}`"
+      :placeholder="placeholder"
+      search-button
+      @search="add"
+      @press-enter="add"
+    />
+    <div class="field-help">{{ helpText }}</div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+
+const props = defineProps<{
+  modelValue: string[]
+  resourceCategory: string
+  protocol: string
+}>()
+
+const emit = defineEmits<{ (event: 'update:modelValue', value: string[]): void }>()
+
+const pendingValue = ref('')
+const fieldLabel = computed(() => (props.protocol === 'middleware' ? '适用版本' : '适用型号'))
+const placeholder = computed(() => (props.protocol === 'middleware' ? '如 10.1、8.5.5' : '如 S5130S-54S-EI-G1 或 S5130*'))
+const helpText = computed(() => {
+  if (props.protocol === 'middleware') return '用于登记已经适配的版本前缀；不填写表示当前没有已验证版本。'
+  if (['network', 'security', 'storage', 'host'].includes(props.resourceCategory)) {
+    return '支持精确型号和 * 通配符；不填写表示适用于当前厂商和设备类型的全部型号。'
+  }
+  return '可填写产品型号或版本前缀；不填写表示不限制。'
+})
+
+const add = () => {
+  const value = pendingValue.value.trim()
+  if (!value || props.modelValue.includes(value)) return
+  emit('update:modelValue', [...props.modelValue, value])
+  pendingValue.value = ''
+}
+
+const remove = (index: number) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+</script>
+
+<style scoped lang="less">
+.matcher-editor {
+  margin-bottom: 18px;
+}
+
+.field-label {
+  margin-bottom: 8px;
+  color: var(--color-text-2);
+  font-size: 14px;
+}
+
+.matcher-list {
+  display: flex;
+  min-height: 30px;
+  margin-bottom: 8px;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.empty-text,
+.field-help {
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.field-help {
+  margin-top: 6px;
+  line-height: 20px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/ReadOnlyQueryTemplateForm.vue b/src/views/ops/pages/assets/supplier/components/collection-template/ReadOnlyQueryTemplateForm.vue
new file mode 100644
index 0000000..450b2a2
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/ReadOnlyQueryTemplateForm.vue
@@ -0,0 +1,154 @@
+<template>
+  <section class="config-section">
+    <div class="section-header">
+      <div>
+        <div class="section-title">{{ kind === 'ssh' ? '固定只读命令' : '固定只读查询' }}</div>
+        <div class="section-help">
+          {{ kind === 'ssh' ? '仅允许 show 或 display 开头的查询命令。' : '仅允许单条 SELECT/WITH 查询，不允许修改数据库。' }}
+        </div>
+      </div>
+      <a-button type="primary" size="small" @click="add">添加{{ kind === 'ssh' ? '命令' : '查询' }}</a-button>
+    </div>
+    <a-empty v-if="modelValue.length === 0" :description="`至少添加一条${kind === 'ssh' ? '只读命令' : '只读查询'}`" />
+    <a-card v-for="(row, index) in modelValue" :key="index" class="config-card" size="small">
+      <template #title>{{ kind === 'ssh' ? '命令' : '查询' }} {{ index + 1 }}</template>
+      <template #extra><a-button type="text" status="danger" @click="remove(index)">删除</a-button></template>
+      <a-row v-if="kind === 'ssh'" :gutter="12">
+        <a-col :span="8">
+          <a-form-item label="稳定编码" required>
+            <a-input
+              :model-value="asSsh(row).code"
+              placeholder="如 system_version"
+              @update:model-value="updateSsh(index, { code: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="11">
+          <a-form-item label="只读命令" required>
+            <a-input
+              :model-value="asSsh(row).command"
+              placeholder="如 display version"
+              @update:model-value="updateSsh(index, { command: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="5">
+          <a-form-item label="用途">
+            <a-select :model-value="asSsh(row).purpose" @update:model-value="updateSsh(index, { purpose: $event })">
+              <a-option value="">普通查询</a-option>
+              <a-option value="config_backup">配置备份</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-else :gutter="12">
+        <a-col :span="8">
+          <a-form-item label="稳定编码" required>
+            <a-input
+              :model-value="asDatabase(row).code"
+              placeholder="如 active_sessions"
+              @update:model-value="updateDatabase(index, { code: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="数值列" required>
+            <a-input
+              :model-value="asDatabase(row).value_column"
+              placeholder="如 value"
+              @update:model-value="updateDatabase(index, { value_column: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="单位">
+            <a-input
+              :model-value="asDatabase(row).unit"
+              placeholder="如 count"
+              @update:model-value="updateDatabase(index, { unit: $event })"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="SELECT/WITH 查询" required>
+            <a-textarea
+              :model-value="asDatabase(row).query"
+              :rows="4"
+              placeholder="SELECT count(*) AS value FROM ..."
+              @update:model-value="updateDatabase(index, { query: $event })"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-card>
+  </section>
+</template>
+
+<script setup lang="ts">
+import type { DatabaseReadOnlyQuery, SshReadOnlyQuery } from './types'
+
+type ReadOnlyQueryKind = 'ssh' | 'database'
+type ReadOnlyQuery = SshReadOnlyQuery | DatabaseReadOnlyQuery
+
+const props = defineProps<{ modelValue: ReadOnlyQuery[]; kind: ReadOnlyQueryKind }>()
+const emit = defineEmits<{ (event: 'update:modelValue', value: ReadOnlyQuery[]): void }>()
+
+const asSsh = (row: ReadOnlyQuery) => row as SshReadOnlyQuery
+const asDatabase = (row: ReadOnlyQuery) => row as DatabaseReadOnlyQuery
+
+const add = () => {
+  const row: ReadOnlyQuery =
+    props.kind === 'ssh'
+      ? { code: '', operation: 'ssh_show', command: '', purpose: '' }
+      : { code: '', operation: 'sql_select', query: '', value_column: '', unit: '' }
+  emit('update:modelValue', [...props.modelValue, row])
+}
+
+const updateSsh = (index: number, patch: Partial<SshReadOnlyQuery>) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.map((item, itemIndex) => (itemIndex === index ? { ...asSsh(item), ...patch, operation: 'ssh_show' as const } : item))
+  )
+}
+
+const updateDatabase = (index: number, patch: Partial<DatabaseReadOnlyQuery>) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.map((item, itemIndex) =>
+      itemIndex === index ? { ...asDatabase(item), ...patch, operation: 'sql_select' as const } : item
+    )
+  )
+}
+
+const remove = (index: number) => {
+  emit(
+    'update:modelValue',
+    props.modelValue.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+</script>
+
+<style scoped lang="less">
+.section-header {
+  display: flex;
+  margin-bottom: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-title {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.section-help {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.config-card {
+  margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/SnmpTemplateForm.vue b/src/views/ops/pages/assets/supplier/components/collection-template/SnmpTemplateForm.vue
new file mode 100644
index 0000000..e23daed
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/SnmpTemplateForm.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="protocol-form">
+    <section class="config-section">
+      <div class="section-header">
+        <div>
+          <div class="section-title">指标映射</div>
+          <div class="section-help">将厂商 MIB 的 OID 映射到平台标准指标。</div>
+        </div>
+        <a-button type="primary" size="small" :disabled="Boolean(catalogError)" @click="addMetric">添加指标</a-button>
+      </div>
+      <a-alert v-if="catalogError" type="error" class="section-alert">{{ catalogError }}</a-alert>
+      <a-empty v-if="metricMappings.length === 0" description="暂未配置指标映射" />
+      <a-card v-for="(row, index) in metricMappings" :key="index" class="config-card" size="small">
+        <template #title>指标 {{ index + 1 }}</template>
+        <template #extra><a-button type="text" status="danger" @click="removeMetric(index)">删除</a-button></template>
+        <a-row :gutter="12">
+          <a-col :span="12">
+            <a-form-item label="标准指标" required>
+              <a-select
+                :model-value="row.code"
+                allow-search
+                :loading="loading"
+                placeholder="请选择标准指标"
+                @update:model-value="selectMetric(index, $event)"
+              >
+                <a-option v-for="metric in metricDefinitions" :key="metric.metric_code" :value="metric.metric_code">
+                  {{ metric.metric_name }}（{{ metric.metric_code }}{{ metric.unit ? `，${metric.unit}` : '' }}）
+                </a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="OID" required>
+              <a-input :model-value="row.oid" placeholder="如 .1.3.6.1.4.1..." @update:model-value="updateMetric(index, { oid: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="读取方式" required>
+              <a-select :model-value="row.operation" @update:model-value="updateMetric(index, { operation: $event })">
+                <a-option value="get">GET</a-option>
+                <a-option value="walk">WALK</a-option>
+                <a-option value="getnext">GETNEXT</a-option>
+                <a-option value="getbulk">GETBULK</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="单位">
+              <a-input :model-value="row.unit" @update:model-value="updateMetric(index, { unit: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="分组">
+              <a-input :model-value="row.group" placeholder="如 entity" @update:model-value="updateMetric(index, { group: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="是否必采">
+              <a-switch :model-value="row.required" @update:model-value="updateMetric(index, { required: Boolean($event) })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="缩放系数">
+              <a-input-number :model-value="row.scale" placeholder="默认 1" @update:model-value="updateMetric(index, { scale: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6">
+            <a-form-item label="偏移量">
+              <a-input-number
+                :model-value="row.offset"
+                placeholder="默认 0"
+                @update:model-value="updateMetric(index, { offset: $event })"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-collapse :default-active-key="[]" class="advanced-collapse">
+          <a-collapse-item key="labels" header="固定标签">
+            <key-value-editor
+              :model-value="row.labels"
+              item-label="标签"
+              key-placeholder="标签名"
+              value-placeholder="固定标签值"
+              @update:model-value="updateMetric(index, { labels: $event })"
+            />
+          </a-collapse-item>
+          <a-collapse-item key="label_oids" header="动态标签 OID（仅表遍历）">
+            <key-value-editor
+              :model-value="row.label_oids"
+              item-label="动态标签"
+              key-placeholder="标签名"
+              value-placeholder="同索引标签 OID"
+              @update:model-value="updateMetric(index, { label_oids: $event })"
+            />
+          </a-collapse-item>
+        </a-collapse>
+      </a-card>
+    </section>
+
+    <section class="config-section">
+      <div class="section-header">
+        <div>
+          <div class="section-title">索引发现</div>
+          <div class="section-help">按同一索引发现 AP、接口、磁盘、节点等库存对象。</div>
+        </div>
+        <a-button size="small" @click="addDiscovery">添加发现规则</a-button>
+      </div>
+      <a-empty v-if="indexDiscoveries.length === 0" description="暂未配置索引发现" />
+      <a-card v-for="(row, index) in indexDiscoveries" :key="index" class="config-card" size="small">
+        <template #title>发现规则 {{ index + 1 }}</template>
+        <template #extra><a-button type="text" status="danger" @click="removeDiscovery(index)">删除</a-button></template>
+        <a-row :gutter="12">
+          <a-col :span="8">
+            <a-form-item label="对象类型" required>
+              <a-select
+                v-if="resourceCategory !== 'storage'"
+                :model-value="row.type"
+                allow-search
+                @update:model-value="updateDiscovery(index, { type: $event })"
+              >
+                <a-option v-for="option in inventoryTypeOptions" :key="option.value" :value="option.value">{{ option.label }}</a-option>
+              </a-select>
+              <a-input
+                v-else
+                :model-value="row.type"
+                placeholder="如 storage_disk"
+                @update:model-value="updateDiscovery(index, { type: $event })"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="16">
+            <a-form-item label="唯一标识 OID" required>
+              <a-input :model-value="row.identity_oid" @update:model-value="updateDiscovery(index, { identity_oid: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="10">
+            <a-form-item label="名称 OID">
+              <a-input :model-value="row.name_oid" @update:model-value="updateDiscovery(index, { name_oid: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="10">
+            <a-form-item label="状态 OID">
+              <a-input :model-value="row.status_oid" @update:model-value="updateDiscovery(index, { status_oid: $event })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
+            <a-form-item label="是否必采">
+              <a-switch :model-value="row.required" @update:model-value="updateDiscovery(index, { required: Boolean($event) })" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="属性映射">
+              <key-value-editor
+                :model-value="row.attributes"
+                item-label="属性"
+                key-placeholder="属性名"
+                value-placeholder="属性 OID"
+                @update:model-value="updateDiscovery(index, { attributes: $event })"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-card>
+    </section>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { ControlMetricDefinition } from '@/api/ops/dcControl'
+import KeyValueEditor from './KeyValueEditor.vue'
+import type { SnmpIndexDiscovery, SnmpMetricMapping } from './types'
+
+const props = defineProps<{
+  metricMappings: SnmpMetricMapping[]
+  indexDiscoveries: SnmpIndexDiscovery[]
+  metricDefinitions: ControlMetricDefinition[]
+  loading: boolean
+  resourceCategory: string
+  catalogError?: string
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:metricMappings', value: SnmpMetricMapping[]): void
+  (event: 'update:indexDiscoveries', value: SnmpIndexDiscovery[]): void
+}>()
+
+const inventoryTypeOptions = computed(() => [
+  { value: props.resourceCategory, label: '设备自身' },
+  { value: 'wireless_ap', label: '无线 AP' },
+  { value: 'network_interface', label: '网络接口' },
+])
+
+const addMetric = () => {
+  emit('update:metricMappings', [
+    ...props.metricMappings,
+    { code: '', oid: '', operation: 'get', unit: '', group: '', required: false, labels: {}, label_oids: {} },
+  ])
+}
+
+const updateMetric = (index: number, patch: Partial<SnmpMetricMapping>) => {
+  emit(
+    'update:metricMappings',
+    props.metricMappings.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch } : item))
+  )
+}
+
+const selectMetric = (index: number, code: string) => {
+  const metric = props.metricDefinitions.find((item) => item.metric_code === code)
+  const patch: Partial<SnmpMetricMapping> = { code }
+  if (!props.metricMappings[index].unit && metric?.unit) patch.unit = metric.unit
+  updateMetric(index, patch)
+}
+
+const removeMetric = (index: number) => {
+  emit(
+    'update:metricMappings',
+    props.metricMappings.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+
+const addDiscovery = () => {
+  emit('update:indexDiscoveries', [
+    ...props.indexDiscoveries,
+    {
+      type: props.resourceCategory === 'storage' ? 'storage_' : props.resourceCategory,
+      identity_oid: '',
+      name_oid: '',
+      status_oid: '',
+      attributes: {},
+      required: false,
+    },
+  ])
+}
+
+const updateDiscovery = (index: number, patch: Partial<SnmpIndexDiscovery>) => {
+  emit(
+    'update:indexDiscoveries',
+    props.indexDiscoveries.map((item, itemIndex) => (itemIndex === index ? { ...item, ...patch } : item))
+  )
+}
+
+const removeDiscovery = (index: number) => {
+  emit(
+    'update:indexDiscoveries',
+    props.indexDiscoveries.filter((_, itemIndex) => itemIndex !== index)
+  )
+}
+</script>
+
+<style scoped lang="less">
+.config-section + .config-section {
+  margin-top: 20px;
+  padding-top: 18px;
+  border-top: 1px solid var(--color-border-2);
+}
+
+.section-header {
+  display: flex;
+  margin-bottom: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-title {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.section-help {
+  margin-top: 3px;
+  color: var(--color-text-3);
+  font-size: 12px;
+}
+
+.section-alert,
+.config-card {
+  margin-bottom: 12px;
+}
+
+.advanced-collapse {
+  margin-top: 4px;
+}
+</style>
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/codec.ts b/src/views/ops/pages/assets/supplier/components/collection-template/codec.ts
new file mode 100644
index 0000000..1bcac51
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/codec.ts
@@ -0,0 +1,389 @@
+import type { CollectionTemplate, CollectionTemplateInput } from '@/api/ops/collection'
+import type {
+  AgentReadOnlyQuery,
+  CollectionTemplateDraft,
+  CollectionTemplateJsonDraft,
+  CollectionTemplateProtocol,
+  CollectionTemplateTechnicalConfig,
+  DatabaseReadOnlyQuery,
+  HttpInventoryMapping,
+  HttpMetricMapping,
+  HttpReadOnlyQuery,
+  MiddlewareMetricMapping,
+  SnmpIndexDiscovery,
+  SnmpMetricMapping,
+  SshReadOnlyQuery,
+  TemplateMetricMapping,
+  TemplateReadOnlyQuery,
+} from './types'
+
+const PROTOCOLS: CollectionTemplateProtocol[] = ['snmp', 'ssh', 'redfish', 'ipmi', 'http_api', 'database', 'middleware', 'agent']
+
+const assertProtocol = (protocol: string): CollectionTemplateProtocol => {
+  if (!PROTOCOLS.includes(protocol as CollectionTemplateProtocol)) {
+    throw new Error(`不支持的采集协议：${protocol}`)
+  }
+  return protocol as CollectionTemplateProtocol
+}
+
+const parseArray = (raw: string, fieldLabel: string): unknown[] => {
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(raw)
+  } catch {
+    throw new Error(`${fieldLabel}不是合法的 JSON`)
+  }
+  if (!Array.isArray(parsed)) throw new Error(`${fieldLabel}必须是 JSON 数组`)
+  return parsed
+}
+
+const parseObjectArray = (raw: string, fieldLabel: string): Record<string, unknown>[] =>
+  parseArray(raw, fieldLabel).map((item, index) => {
+    if (!item || Array.isArray(item) || typeof item !== 'object') {
+      throw new Error(`${fieldLabel}第 ${index + 1} 项必须是 JSON 对象`)
+    }
+    return item as Record<string, unknown>
+  })
+
+const parseStringArray = (raw: string, fieldLabel: string): string[] =>
+  parseArray(raw, fieldLabel).map((item, index) => {
+    if (typeof item !== 'string') throw new Error(`${fieldLabel}第 ${index + 1} 项必须是字符串`)
+    return item
+  })
+
+const stringRecord = (value: unknown, fieldLabel: string): Record<string, string> => {
+  if (value === undefined) return {}
+  if (!value || Array.isArray(value) || typeof value !== 'object') throw new Error(`${fieldLabel}必须是 JSON 对象`)
+  return Object.fromEntries(
+    Object.entries(value).map(([key, item]) => {
+      if (typeof item !== 'string') throw new Error(`${fieldLabel}.${key} 必须是字符串`)
+      return [key, item]
+    })
+  )
+}
+
+const numberRecord = (value: unknown, fieldLabel: string): Record<string, number> | undefined => {
+  if (value === undefined) return undefined
+  if (!value || Array.isArray(value) || typeof value !== 'object') throw new Error(`${fieldLabel}必须是 JSON 对象`)
+  return Object.fromEntries(
+    Object.entries(value).map(([key, item]) => {
+      if (typeof item !== 'number') throw new Error(`${fieldLabel}.${key} 必须是数字`)
+      return [key, item]
+    })
+  )
+}
+
+const optionalNumber = (value: unknown, fieldLabel: string): number | undefined => {
+  if (value === undefined) return undefined
+  if (typeof value !== 'number' || !Number.isFinite(value)) throw new Error(`${fieldLabel}必须是数字`)
+  return value
+}
+
+const optionalBoolean = (value: unknown, fieldLabel: string): boolean => {
+  if (value === undefined) return false
+  if (typeof value !== 'boolean') throw new Error(`${fieldLabel}必须是布尔值`)
+  return value
+}
+
+const fixedOperation = <T extends string>(value: unknown, expected: T, fieldLabel: string): T => {
+  if (value !== expected) throw new Error(`${fieldLabel}必须是 ${expected}`)
+  return expected
+}
+
+const assertEmpty = (rows: unknown[], fieldLabel: string) => {
+  if (rows.length > 0) throw new Error(`${fieldLabel}在当前协议下必须为空`)
+}
+
+const normalizeSnmpMetricMappings = (rows: Record<string, unknown>[]): SnmpMetricMapping[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    oid: String(row.oid ?? ''),
+    operation: (row.operation ? String(row.operation) : 'get') as SnmpMetricMapping['operation'],
+    unit: String(row.unit ?? ''),
+    group: String(row.group ?? ''),
+    scale: optionalNumber(row.scale, `指标映射第 ${index + 1} 项 scale`),
+    offset: optionalNumber(row.offset, `指标映射第 ${index + 1} 项 offset`),
+    required: optionalBoolean(row.required, `指标映射第 ${index + 1} 项 required`),
+    labels: stringRecord(row.labels, `指标映射第 ${index + 1} 项 labels`),
+    label_oids: stringRecord(row.label_oids, `指标映射第 ${index + 1} 项 label_oids`),
+    enum: numberRecord(row.enum, `指标映射第 ${index + 1} 项 enum`),
+  }))
+
+const normalizeSnmpIndexDiscoveries = (rows: Record<string, unknown>[]): SnmpIndexDiscovery[] =>
+  rows.map((row, index) => ({
+    ...row,
+    type: String(row.type ?? ''),
+    identity_oid: String(row.identity_oid ?? ''),
+    name_oid: String(row.name_oid ?? ''),
+    status_oid: String(row.status_oid ?? ''),
+    attributes: stringRecord(row.attributes, `索引发现第 ${index + 1} 项 attributes`),
+    required: optionalBoolean(row.required, `索引发现第 ${index + 1} 项 required`),
+  }))
+
+const normalizeHttpQueries = (rows: Record<string, unknown>[]): HttpReadOnlyQuery[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    operation: fixedOperation(row.operation, 'http_get', `固定只读查询第 ${index + 1} 项 operation`),
+    path: String(row.path ?? ''),
+  }))
+
+const normalizeHttpMetricMappings = (rows: Record<string, unknown>[]): HttpMetricMapping[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    query_code: String(row.query_code ?? ''),
+    items_pointer: String(row.items_pointer ?? ''),
+    value_pointer: String(row.value_pointer ?? ''),
+    unit: String(row.unit ?? ''),
+    scale: optionalNumber(row.scale, `指标映射第 ${index + 1} 项 scale`),
+    offset: optionalNumber(row.offset, `指标映射第 ${index + 1} 项 offset`),
+    labels: stringRecord(row.labels, `指标映射第 ${index + 1} 项 labels`),
+    required: optionalBoolean(row.required, `指标映射第 ${index + 1} 项 required`),
+  }))
+
+const normalizeHttpInventoryMappings = (rows: Record<string, unknown>[]): HttpInventoryMapping[] =>
+  rows.map((row, index) => ({
+    ...row,
+    type: String(row.type ?? ''),
+    query_code: String(row.query_code ?? ''),
+    items_pointer: String(row.items_pointer ?? ''),
+    identity_pointer: String(row.identity_pointer ?? ''),
+    name_pointer: String(row.name_pointer ?? ''),
+    status_pointer: String(row.status_pointer ?? ''),
+    attributes: stringRecord(row.attributes, `库存映射第 ${index + 1} 项 attributes`),
+    required: optionalBoolean(row.required, `库存映射第 ${index + 1} 项 required`),
+  }))
+
+const normalizeSshQueries = (rows: Record<string, unknown>[]): SshReadOnlyQuery[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    operation: fixedOperation(row.operation, 'ssh_show', `固定只读查询第 ${index + 1} 项 operation`),
+    command: String(row.command ?? ''),
+    purpose: String(row.purpose ?? '') as SshReadOnlyQuery['purpose'],
+  }))
+
+const normalizeDatabaseQueries = (rows: Record<string, unknown>[]): DatabaseReadOnlyQuery[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    operation: fixedOperation(row.operation, 'sql_select', `固定只读查询第 ${index + 1} 项 operation`),
+    query: String(row.query ?? ''),
+    value_column: String(row.value_column ?? ''),
+    unit: String(row.unit ?? ''),
+  }))
+
+const normalizeMiddlewareMappings = (rows: Record<string, unknown>[]): MiddlewareMetricMapping[] =>
+  rows.map((row) => ({
+    ...row,
+    source: String(row.source ?? ''),
+    code: String(row.code ?? ''),
+    unit: String(row.unit ?? ''),
+    group: String(row.group ?? ''),
+  }))
+
+const normalizeAgentQueries = (rows: Record<string, unknown>[]): AgentReadOnlyQuery[] =>
+  rows.map((row, index) => ({
+    ...row,
+    code: String(row.code ?? ''),
+    operation: fixedOperation(row.operation, 'agent_read', `固定只读查询第 ${index + 1} 项 operation`),
+  }))
+
+const normalizeTechnicalConfig = (
+  protocol: CollectionTemplateProtocol,
+  metricMappings: Record<string, unknown>[],
+  indexDiscoveries: Record<string, unknown>[],
+  inventoryMappings: Record<string, unknown>[],
+  readOnlyQueries: Record<string, unknown>[]
+): CollectionTemplateTechnicalConfig => {
+  switch (protocol) {
+    case 'snmp':
+      assertEmpty(inventoryMappings, '库存映射')
+      assertEmpty(readOnlyQueries, '固定只读查询')
+      return {
+        metricMappings: normalizeSnmpMetricMappings(metricMappings),
+        indexDiscoveries: normalizeSnmpIndexDiscoveries(indexDiscoveries),
+        inventoryMappings: [],
+        readOnlyQueries: [],
+      }
+    case 'http_api':
+      assertEmpty(indexDiscoveries, '索引发现')
+      return {
+        metricMappings: normalizeHttpMetricMappings(metricMappings),
+        indexDiscoveries: [],
+        inventoryMappings: normalizeHttpInventoryMappings(inventoryMappings),
+        readOnlyQueries: normalizeHttpQueries(readOnlyQueries),
+      }
+    case 'ssh':
+      assertEmpty(metricMappings, '指标映射')
+      assertEmpty(indexDiscoveries, '索引发现')
+      assertEmpty(inventoryMappings, '库存映射')
+      return { metricMappings: [], indexDiscoveries: [], inventoryMappings: [], readOnlyQueries: normalizeSshQueries(readOnlyQueries) }
+    case 'database':
+      assertEmpty(metricMappings, '指标映射')
+      assertEmpty(indexDiscoveries, '索引发现')
+      assertEmpty(inventoryMappings, '库存映射')
+      return {
+        metricMappings: [],
+        indexDiscoveries: [],
+        inventoryMappings: [],
+        readOnlyQueries: normalizeDatabaseQueries(readOnlyQueries),
+      }
+    case 'middleware':
+      assertEmpty(indexDiscoveries, '索引发现')
+      assertEmpty(inventoryMappings, '库存映射')
+      assertEmpty(readOnlyQueries, '固定只读查询')
+      return {
+        metricMappings: normalizeMiddlewareMappings(metricMappings),
+        indexDiscoveries: [],
+        inventoryMappings: [],
+        readOnlyQueries: [],
+      }
+    case 'agent':
+      assertEmpty(metricMappings, '指标映射')
+      assertEmpty(indexDiscoveries, '索引发现')
+      assertEmpty(inventoryMappings, '库存映射')
+      return {
+        metricMappings: [],
+        indexDiscoveries: [],
+        inventoryMappings: [],
+        readOnlyQueries: normalizeAgentQueries(readOnlyQueries),
+      }
+    case 'redfish':
+    case 'ipmi':
+      assertEmpty(metricMappings, '指标映射')
+      assertEmpty(indexDiscoveries, '索引发现')
+      assertEmpty(inventoryMappings, '库存映射')
+      assertEmpty(readOnlyQueries, '固定只读查询')
+      return createEmptyTechnicalConfig(protocol)
+    default:
+      throw new Error(`不支持的采集协议：${protocol}`)
+  }
+}
+
+export const createEmptyTechnicalConfig = (protocol: string): CollectionTemplateTechnicalConfig => {
+  switch (assertProtocol(protocol)) {
+    case 'snmp':
+    case 'ssh':
+    case 'redfish':
+    case 'ipmi':
+    case 'http_api':
+    case 'database':
+    case 'middleware':
+      return { metricMappings: [], indexDiscoveries: [], inventoryMappings: [], readOnlyQueries: [] }
+    case 'agent':
+      return {
+        metricMappings: [],
+        indexDiscoveries: [],
+        inventoryMappings: [],
+        readOnlyQueries: [{ code: 'host_snapshot', operation: 'agent_read' }],
+      }
+  }
+}
+
+export const createEmptyCollectionTemplateDraft = (manufacturerCode = ''): CollectionTemplateDraft => ({
+  code: '',
+  name: '',
+  manufacturer_code: manufacturerCode,
+  resource_category: 'network',
+  protocol: 'snmp',
+  modelMatchers: [],
+  technicalConfig: createEmptyTechnicalConfig('snmp'),
+  description: '',
+  adapter_verified: false,
+  verification_note: '',
+  enabled: false,
+})
+
+export const decodeCollectionTemplate = (record: CollectionTemplate): CollectionTemplateDraft => {
+  const protocol = assertProtocol(record.protocol)
+  const modelMatchers = parseStringArray(record.model_matchers, '适用型号')
+  const metricMappings = parseObjectArray(record.metric_mappings, '指标映射')
+  const indexDiscoveries = parseObjectArray(record.index_discoveries, '索引发现')
+  const inventoryMappings = parseObjectArray(record.inventory_mappings, '库存映射')
+  const readOnlyQueries = parseObjectArray(record.read_only_queries, '固定只读查询')
+  return {
+    code: record.code,
+    name: record.name,
+    manufacturer_code: record.manufacturer_code,
+    resource_category: record.resource_category,
+    protocol,
+    modelMatchers,
+    technicalConfig: normalizeTechnicalConfig(protocol, metricMappings, indexDiscoveries, inventoryMappings, readOnlyQueries),
+    description: record.description || '',
+    adapter_verified: record.adapter_verified,
+    verification_note: record.verification_note || '',
+    enabled: record.enabled,
+  }
+}
+
+export const encodeCollectionTemplateInput = (draft: CollectionTemplateDraft): CollectionTemplateInput => ({
+  code: draft.code.trim(),
+  name: draft.name.trim(),
+  manufacturer_code: draft.manufacturer_code,
+  resource_category: draft.resource_category,
+  protocol: draft.protocol,
+  model_matchers: JSON.stringify(draft.modelMatchers.map((item) => item.trim())),
+  metric_mappings: JSON.stringify(draft.technicalConfig.metricMappings),
+  index_discoveries: JSON.stringify(draft.technicalConfig.indexDiscoveries),
+  inventory_mappings: JSON.stringify(draft.technicalConfig.inventoryMappings),
+  read_only_queries: JSON.stringify(draft.technicalConfig.readOnlyQueries),
+  description: draft.description?.trim() || '',
+  adapter_verified: draft.adapter_verified,
+  verification_note: draft.adapter_verified ? draft.verification_note?.trim() || '' : '',
+  enabled: draft.enabled,
+})
+
+export const jsonFieldsForProtocol = (protocol: string): Array<keyof CollectionTemplateJsonDraft> => {
+  switch (assertProtocol(protocol)) {
+    case 'snmp':
+      return ['metricMappings', 'indexDiscoveries']
+    case 'http_api':
+      return ['readOnlyQueries', 'metricMappings', 'inventoryMappings']
+    case 'ssh':
+    case 'database':
+      return ['readOnlyQueries']
+    case 'middleware':
+      return ['metricMappings']
+    case 'redfish':
+    case 'ipmi':
+    case 'agent':
+      return []
+  }
+}
+
+export const technicalConfigToJson = (config: CollectionTemplateTechnicalConfig, protocol: string): CollectionTemplateJsonDraft => {
+  assertProtocol(protocol)
+  return {
+    metricMappings: JSON.stringify(config.metricMappings, null, 2),
+    indexDiscoveries: JSON.stringify(config.indexDiscoveries, null, 2),
+    inventoryMappings: JSON.stringify(config.inventoryMappings, null, 2),
+    readOnlyQueries: JSON.stringify(config.readOnlyQueries, null, 2),
+  }
+}
+
+export const technicalConfigFromJson = (jsonDraft: CollectionTemplateJsonDraft, protocol: string): CollectionTemplateTechnicalConfig => {
+  const resolvedProtocol = assertProtocol(protocol)
+  if (['redfish', 'ipmi', 'agent'].includes(resolvedProtocol)) return createEmptyTechnicalConfig(resolvedProtocol)
+  const visibleFields = new Set(jsonFieldsForProtocol(resolvedProtocol))
+  const metricMappings = visibleFields.has('metricMappings') ? parseObjectArray(jsonDraft.metricMappings, '指标映射') : []
+  const indexDiscoveries = visibleFields.has('indexDiscoveries') ? parseObjectArray(jsonDraft.indexDiscoveries, '索引发现') : []
+  const inventoryMappings = visibleFields.has('inventoryMappings') ? parseObjectArray(jsonDraft.inventoryMappings, '库存映射') : []
+  const readOnlyQueries = visibleFields.has('readOnlyQueries') ? parseObjectArray(jsonDraft.readOnlyQueries, '固定只读查询') : []
+  return normalizeTechnicalConfig(resolvedProtocol, metricMappings, indexDiscoveries, inventoryMappings, readOnlyQueries)
+}
+
+export const isTechnicalConfigEmpty = (config: CollectionTemplateTechnicalConfig): boolean =>
+  config.metricMappings.length === 0 &&
+  config.indexDiscoveries.length === 0 &&
+  config.inventoryMappings.length === 0 &&
+  config.readOnlyQueries.length === 0
+
+export const asSnmpMetricMappings = (rows: TemplateMetricMapping[]): SnmpMetricMapping[] => rows as SnmpMetricMapping[]
+export const asHttpMetricMappings = (rows: TemplateMetricMapping[]): HttpMetricMapping[] => rows as HttpMetricMapping[]
+export const asMiddlewareMetricMappings = (rows: TemplateMetricMapping[]): MiddlewareMetricMapping[] => rows as MiddlewareMetricMapping[]
+export const asHttpQueries = (rows: TemplateReadOnlyQuery[]): HttpReadOnlyQuery[] => rows as HttpReadOnlyQuery[]
+export const asSshQueries = (rows: TemplateReadOnlyQuery[]): SshReadOnlyQuery[] => rows as SshReadOnlyQuery[]
+export const asDatabaseQueries = (rows: TemplateReadOnlyQuery[]): DatabaseReadOnlyQuery[] => rows as DatabaseReadOnlyQuery[]
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/types.ts b/src/views/ops/pages/assets/supplier/components/collection-template/types.ts
new file mode 100644
index 0000000..286e0f3
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/types.ts
@@ -0,0 +1,116 @@
+import type { CollectionTemplateInput } from '@/api/ops/collection'
+
+export type CollectionTemplateConfigMode = 'form' | 'json'
+
+export type CollectionTemplateProtocol = 'snmp' | 'ssh' | 'redfish' | 'ipmi' | 'http_api' | 'database' | 'middleware' | 'agent'
+
+export interface SnmpMetricMapping {
+  code: string
+  oid: string
+  operation: 'get' | 'walk' | 'getnext' | 'getbulk'
+  unit: string
+  group: string
+  scale?: number
+  offset?: number
+  required: boolean
+  labels: Record<string, string>
+  label_oids: Record<string, string>
+  enum?: Record<string, number>
+}
+
+export interface SnmpIndexDiscovery {
+  type: string
+  identity_oid: string
+  name_oid?: string
+  status_oid?: string
+  attributes: Record<string, string>
+  required: boolean
+}
+
+export interface HttpReadOnlyQuery {
+  code: string
+  operation: 'http_get'
+  path: string
+}
+
+export interface HttpMetricMapping {
+  code: string
+  query_code: string
+  items_pointer?: string
+  value_pointer: string
+  unit: string
+  scale?: number
+  offset?: number
+  labels: Record<string, string>
+  required: boolean
+}
+
+export interface HttpInventoryMapping {
+  type: string
+  query_code: string
+  items_pointer?: string
+  identity_pointer: string
+  name_pointer?: string
+  status_pointer?: string
+  attributes: Record<string, string>
+  required: boolean
+}
+
+export interface SshReadOnlyQuery {
+  code: string
+  operation: 'ssh_show'
+  command: string
+  purpose?: '' | 'config_backup'
+}
+
+export interface DatabaseReadOnlyQuery {
+  code: string
+  operation: 'sql_select'
+  query: string
+  value_column: string
+  unit: string
+}
+
+export interface MiddlewareMetricMapping {
+  source: string
+  code: string
+  unit: string
+  group: string
+}
+
+export interface AgentReadOnlyQuery {
+  code: string
+  operation: 'agent_read'
+}
+
+export type TemplateMetricMapping = SnmpMetricMapping | HttpMetricMapping | MiddlewareMetricMapping
+export type TemplateReadOnlyQuery = HttpReadOnlyQuery | SshReadOnlyQuery | DatabaseReadOnlyQuery | AgentReadOnlyQuery
+
+export interface CollectionTemplateTechnicalConfig {
+  metricMappings: TemplateMetricMapping[]
+  indexDiscoveries: SnmpIndexDiscovery[]
+  inventoryMappings: HttpInventoryMapping[]
+  readOnlyQueries: TemplateReadOnlyQuery[]
+}
+
+export interface CollectionTemplateDraft extends Omit<
+  CollectionTemplateInput,
+  'model_matchers' | 'metric_mappings' | 'index_discoveries' | 'inventory_mappings' | 'read_only_queries' | 'protocol'
+> {
+  protocol: CollectionTemplateProtocol
+  modelMatchers: string[]
+  technicalConfig: CollectionTemplateTechnicalConfig
+}
+
+export interface CollectionTemplateJsonDraft {
+  metricMappings: string
+  indexDiscoveries: string
+  inventoryMappings: string
+  readOnlyQueries: string
+}
+
+export interface ManufacturerOption {
+  id: number
+  code: string
+  name: string
+}
diff --git a/src/views/ops/pages/assets/supplier/components/collection-template/validation.ts b/src/views/ops/pages/assets/supplier/components/collection-template/validation.ts
new file mode 100644
index 0000000..bec1632
--- /dev/null
+++ b/src/views/ops/pages/assets/supplier/components/collection-template/validation.ts
@@ -0,0 +1,230 @@
+import type {
+  CollectionTemplateDraft,
+  DatabaseReadOnlyQuery,
+  HttpInventoryMapping,
+  HttpMetricMapping,
+  HttpReadOnlyQuery,
+  MiddlewareMetricMapping,
+  SnmpIndexDiscovery,
+  SnmpMetricMapping,
+  SshReadOnlyQuery,
+} from './types'
+
+const numericOidPattern = /^\.?[0-9]+(?:\.[0-9]+)+$/
+
+const requireText = (value: string | undefined, message: string) => {
+  if (!value?.trim()) throw new Error(message)
+}
+
+const requireUniqueCodes = (codes: string[], label: string) => {
+  const normalized = codes.map((item) => item.trim())
+  const duplicated = normalized.find((item, index) => item && normalized.indexOf(item) !== index)
+  if (duplicated) throw new Error(`${label}编码 ${duplicated} 重复`)
+}
+
+const validateRecord = (
+  value: Record<string, string>,
+  label: string,
+  validateValue: (value: string) => boolean = (item) => Boolean(item.trim())
+) => {
+  for (const [key, item] of Object.entries(value)) {
+    if (!key.trim() || key.length > 64 || !validateValue(item)) throw new Error(`${label}包含无效的“${key || '空字段名'}”`)
+  }
+}
+
+const validateInventoryType = (category: string, value: string) => {
+  const itemType = value.trim().toLowerCase()
+  if (itemType === category) return true
+  if (category === 'network' || category === 'security') {
+    return ['wireless_ap', 'access_point', 'ap', 'network_interface', 'interface'].includes(itemType)
+  }
+  return category === 'storage' && /^storage_[a-z0-9_]+$/.test(itemType) && itemType.length <= 50
+}
+
+const validateSnmp = (draft: CollectionTemplateDraft) => {
+  const metrics = draft.technicalConfig.metricMappings as SnmpMetricMapping[]
+  const discoveries = draft.technicalConfig.indexDiscoveries
+  if (metrics.length > 256) throw new Error('单个 SNMP 模板指标映射不能超过 256 项')
+  if (discoveries.length > 32) throw new Error('单个 SNMP 模板索引发现不能超过 32 项')
+  requireUniqueCodes(
+    metrics.map((item) => item.code),
+    '指标映射'
+  )
+  metrics.forEach((row, index) => {
+    const position = `指标映射第 ${index + 1} 项`
+    if (!row.code.startsWith(`${draft.resource_category}.`) || row.code.length > 128) {
+      throw new Error(`${position}必须选择 ${draft.resource_category} 类标准指标`)
+    }
+    if (!numericOidPattern.test(row.oid.trim())) throw new Error(`${position}的 OID 无效`)
+    if (!['get', 'walk', 'getnext', 'getbulk'].includes(row.operation)) throw new Error(`${position}的读取方式无效`)
+    validateRecord(row.labels, `${position}固定标签`)
+    validateRecord(row.label_oids, `${position}动态标签`, (value) => numericOidPattern.test(value.trim()))
+    if (['get'].includes(row.operation) && Object.keys(row.label_oids).length > 0) {
+      throw new Error(`${position}使用动态标签时读取方式必须是表遍历`)
+    }
+  })
+  discoveries.forEach((row: SnmpIndexDiscovery, index) => {
+    const position = `索引发现第 ${index + 1} 项`
+    if (!validateInventoryType(draft.resource_category, row.type)) throw new Error(`${position}的对象类型无效`)
+    if (!numericOidPattern.test(row.identity_oid.trim())) throw new Error(`${position}的唯一标识 OID 无效`)
+    if (row.name_oid?.trim() && !numericOidPattern.test(row.name_oid.trim())) throw new Error(`${position}的名称 OID 无效`)
+    if (row.status_oid?.trim() && !numericOidPattern.test(row.status_oid.trim())) throw new Error(`${position}的状态 OID 无效`)
+    validateRecord(row.attributes, `${position}属性`, (value) => numericOidPattern.test(value.trim()))
+  })
+}
+
+const isJsonPointer = (value: string | undefined, allowEmpty: boolean) => {
+  const pointer = value?.trim() || ''
+  return allowEmpty ? !pointer || pointer.startsWith('/') : pointer.startsWith('/')
+}
+
+const validateHttp = (draft: CollectionTemplateDraft) => {
+  const queries = draft.technicalConfig.readOnlyQueries as HttpReadOnlyQuery[]
+  const metrics = draft.technicalConfig.metricMappings as HttpMetricMapping[]
+  const inventory = draft.technicalConfig.inventoryMappings as HttpInventoryMapping[]
+  if (queries.length < 1 || queries.length > 32) throw new Error('HTTP/API 模板必须配置 1 到 32 条固定 GET 查询')
+  if (metrics.length > 256) throw new Error('HTTP/API 指标映射不能超过 256 项')
+  if (inventory.length > 32) throw new Error('HTTP/API 库存映射不能超过 32 项')
+  if (metrics.length === 0 && inventory.length === 0) throw new Error('HTTP/API 模板必须至少配置一项指标或库存映射')
+  requireUniqueCodes(
+    queries.map((item) => item.code),
+    '固定查询'
+  )
+  requireUniqueCodes(
+    metrics.map((item) => item.code),
+    '指标映射'
+  )
+  const queryCodes = new Set(queries.map((item) => item.code.trim()))
+  queries.forEach((row, index) => {
+    requireText(row.code, `固定查询第 ${index + 1} 项缺少稳定编码`)
+    const path = row.path.trim()
+    if (!path.startsWith('/') || path.startsWith('//') || path.includes('#')) throw new Error(`固定查询 ${row.code} 必须使用站内绝对路径`)
+  })
+  metrics.forEach((row, index) => {
+    const position = `指标映射第 ${index + 1} 项`
+    if (!row.code.startsWith(`${draft.resource_category}.`) || row.code.length > 128) {
+      throw new Error(`${position}必须选择 ${draft.resource_category} 类标准指标`)
+    }
+    if (!queryCodes.has(row.query_code.trim())) throw new Error(`${position}引用的查询编码不存在`)
+    if (!isJsonPointer(row.items_pointer, true)) throw new Error(`${position}的对象数组路径必须以 / 开头`)
+    if (!isJsonPointer(row.value_pointer, false)) throw new Error(`${position}的数值路径必须以 / 开头`)
+    validateRecord(row.labels, `${position}标签`, (value) => isJsonPointer(value, true))
+  })
+  inventory.forEach((row, index) => {
+    const position = `库存映射第 ${index + 1} 项`
+    if (!validateInventoryType(draft.resource_category, row.type)) throw new Error(`${position}的对象类型无效`)
+    if (!queryCodes.has(row.query_code.trim())) throw new Error(`${position}引用的查询编码不存在`)
+    if (!isJsonPointer(row.items_pointer, true)) throw new Error(`${position}的对象数组路径必须以 / 开头`)
+    if (!isJsonPointer(row.identity_pointer, false)) throw new Error(`${position}的唯一 ID 路径必须以 / 开头`)
+    if (!isJsonPointer(row.name_pointer, true)) throw new Error(`${position}的名称路径必须以 / 开头`)
+    if (!isJsonPointer(row.status_pointer, true)) throw new Error(`${position}的状态路径必须以 / 开头`)
+    validateRecord(row.attributes, `${position}属性`, (value) => isJsonPointer(value, true))
+  })
+}
+
+const validateSsh = (draft: CollectionTemplateDraft) => {
+  const queries = draft.technicalConfig.readOnlyQueries as SshReadOnlyQuery[]
+  if (queries.length < 1 || queries.length > 32) throw new Error('SSH 模板必须配置 1 到 32 条固定只读命令')
+  requireUniqueCodes(
+    queries.map((item) => item.code),
+    '固定查询'
+  )
+  queries.forEach((row, index) => {
+    requireText(row.code, `固定命令第 ${index + 1} 项缺少稳定编码`)
+    const command = row.command.trim().toLowerCase()
+    if (!command.startsWith('show ') && !command.startsWith('display ')) throw new Error(`固定命令 ${row.code} 只允许 show 或 display 查询`)
+    if (/[\r\n;|&`$]/.test(command)) throw new Error(`固定命令 ${row.code} 不能包含换行或命令拼接字符`)
+    if (row.purpose && row.purpose !== 'config_backup') throw new Error(`固定命令 ${row.code} 的用途无效`)
+  })
+}
+
+const validateDatabase = (draft: CollectionTemplateDraft) => {
+  const queries = draft.technicalConfig.readOnlyQueries as DatabaseReadOnlyQuery[]
+  requireUniqueCodes(
+    queries.map((item) => item.code),
+    '数据库查询'
+  )
+  queries.forEach((row, index) => {
+    requireText(row.code, `数据库查询第 ${index + 1} 项缺少稳定编码`)
+    requireText(row.value_column, `数据库查询 ${row.code} 缺少数值列`)
+    const query = row.query.trim()
+    if (!/^(select|with)\b/i.test(query)) throw new Error(`数据库查询 ${row.code} 只允许 SELECT/WITH`)
+    if (query.includes(';') || query.includes('--') || query.includes('/*') || query.includes('*/')) {
+      throw new Error(`数据库查询 ${row.code} 不允许分号或注释`)
+    }
+  })
+}
+
+const validateMiddleware = (draft: CollectionTemplateDraft) => {
+  const metrics = draft.technicalConfig.metricMappings as MiddlewareMetricMapping[]
+  requireUniqueCodes(
+    metrics.map((item) => item.code),
+    '指标映射'
+  )
+  metrics.forEach((row, index) => {
+    requireText(row.source, `指标映射第 ${index + 1} 项缺少来源字段`)
+    requireText(row.code, `指标映射第 ${index + 1} 项缺少标准指标`)
+  })
+}
+
+export const validateCollectionTemplateDraft = (draft: CollectionTemplateDraft) => {
+  requireText(draft.code, '请填写稳定编码')
+  requireText(draft.name, '请填写模板名称')
+  requireText(draft.manufacturer_code, '请选择厂商')
+  requireText(draft.resource_category, '请选择设备类型')
+  const matchers = draft.modelMatchers.map((item) => item.trim())
+  if (matchers.some((item) => !item || item.length > 120)) throw new Error('适用型号不能为空且不能超过 120 个字符')
+  if (new Set(matchers).size !== matchers.length) throw new Error('适用型号不能重复')
+
+  const physicalCategory = ['network', 'security', 'storage'].includes(draft.resource_category)
+  if (physicalCategory && !['snmp', 'ssh', 'http_api'].includes(draft.protocol)) {
+    throw new Error('网络、安全和存储设备只允许 SNMP、SSH 或 HTTP/API 协议')
+  }
+  if (['redfish', 'ipmi'].includes(draft.protocol) && draft.resource_category !== 'host') {
+    throw new Error('Redfish/IPMI 协议仅适用于服务器')
+  }
+
+  switch (draft.protocol) {
+    case 'snmp':
+      validateSnmp(draft)
+      break
+    case 'http_api':
+      validateHttp(draft)
+      break
+    case 'ssh':
+      validateSsh(draft)
+      break
+    case 'database':
+      validateDatabase(draft)
+      break
+    case 'middleware':
+      validateMiddleware(draft)
+      break
+    case 'redfish':
+    case 'ipmi':
+      if (
+        draft.technicalConfig.metricMappings.length ||
+        draft.technicalConfig.indexDiscoveries.length ||
+        draft.technicalConfig.inventoryMappings.length ||
+        draft.technicalConfig.readOnlyQueries.length
+      ) {
+        throw new Error('Redfish/IPMI 使用平台固定适配器，不能配置自定义查询或映射')
+      }
+      break
+    case 'agent': {
+      const queries = draft.technicalConfig.readOnlyQueries
+      if (queries.length !== 1 || queries[0].operation !== 'agent_read' || queries[0].code !== 'host_snapshot') {
+        throw new Error('Agent 模板必须使用平台固定的 host_snapshot 只读快照')
+      }
+      break
+    }
+    default:
+      throw new Error(`不支持的采集协议：${draft.protocol}`)
+  }
+
+  if (draft.adapter_verified) {
+    if (draft.manufacturer_code === 'GENERIC') throw new Error('通用模板不能标记为已完成真实设备联调')
+    if (matchers.length === 0) throw new Error('标记真实设备联调前必须填写已验证的设备型号')
+    requireText(draft.verification_note, '请填写真实设备型号、固件版本和联调日期')
+  }
+}
diff --git a/src/views/ops/pages/big-screen/index.vue b/src/views/ops/pages/big-screen/index.vue
index fd6a2a6..be32981 100644
--- a/src/views/ops/pages/big-screen/index.vue
+++ b/src/views/ops/pages/big-screen/index.vue
@@ -430,7 +430,7 @@ const handlePublish = async (screen: BigScreen) => {
     Message.warning('请先绑定 GoView 项目 ID')
     return
   }
-  await publishBigScreen({ screen_id: screen.id, publish_type: 1, change_log: 'OPS 大屏管理发布' })
+  await publishBigScreen({ screen_id: screen.id, publish_type: 1, change_log: '数据大屏管理发布' })
   Message.success('发布成功')
   loadScreens()
 }
diff --git a/src/views/ops/pages/business-system/components/BusinessAlertCredentialDialog.vue b/src/views/ops/pages/business-system/components/BusinessAlertCredentialDialog.vue
new file mode 100644
index 0000000..c5a3a29
--- /dev/null
+++ b/src/views/ops/pages/business-system/components/BusinessAlertCredentialDialog.vue
@@ -0,0 +1,146 @@
+<template>
+  <a-modal v-model:visible="modalVisible" title="外部告警接入凭证" :width="680" :footer="false">
+    <a-spin :loading="loading" class="credential-loading">
+      <a-descriptions v-if="status" :column="1" bordered>
+        <a-descriptions-item label="业务系统">{{ record?.name || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="业务系统编码">
+          <a-typography-text copyable>{{ record?.code || '-' }}</a-typography-text>
+        </a-descriptions-item>
+        <a-descriptions-item label="凭证状态">
+          <a-tag :color="status.configured ? 'green' : 'gray'">{{ status.configured ? '已配置' : '未配置' }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="配置时间">{{ formatTime(status.configured_at) }}</a-descriptions-item>
+      </a-descriptions>
+
+      <a-alert v-if="status && !status.can_manage" type="info" class="credential-tip">
+        业务系统负责人只能查看配置状态，访问凭证明文由超级管理员管理。
+      </a-alert>
+
+      <template v-if="status?.can_manage">
+        <a-space class="credential-actions">
+          <a-popconfirm
+            :content="status.configured ? '重新生成后，原凭证立即失效，确认继续？' : '确认生成外部告警访问凭证？'"
+            @ok="generateCredential"
+          >
+            <a-button type="primary" :loading="submitting">{{ status.configured ? '重新生成' : '生成凭证' }}</a-button>
+          </a-popconfirm>
+          <a-button v-if="status.configured" :loading="submitting" @click="revealCredential">查看明文</a-button>
+        </a-space>
+
+        <a-alert v-if="accessToken" type="warning" class="credential-tip">
+          访问凭证用于 Bearer Token 鉴权，请仅交付给当前业务系统。重新生成后原凭证立即失效。
+        </a-alert>
+        <a-typography-paragraph v-if="accessToken" copyable class="credential-token">
+          {{ accessToken }}
+        </a-typography-paragraph>
+      </template>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import {
+  fetchBusinessAlertCredentialStatus,
+  generateBusinessAlertCredential,
+  revealBusinessAlertCredential,
+  type BusinessAlertCredentialStatus,
+  type BusinessSystemItem,
+} from '@/api/ops/businessSystem'
+
+const props = defineProps<{
+  visible: boolean
+  record?: BusinessSystemItem
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:visible', value: boolean): void
+}>()
+
+const modalVisible = computed({
+  get: () => props.visible,
+  set: (value: boolean) => emit('update:visible', value),
+})
+const loading = ref(false)
+const submitting = ref(false)
+const status = ref<BusinessAlertCredentialStatus | null>(null)
+const accessToken = ref('')
+
+const formatTime = (value?: string) => (value ? new Date(value).toLocaleString() : '-')
+
+const loadStatus = async () => {
+  if (!props.record) return
+  loading.value = true
+  accessToken.value = ''
+  try {
+    const response = await fetchBusinessAlertCredentialStatus(props.record.id)
+    status.value = response.details || null
+  } catch (error: any) {
+    status.value = null
+    Message.error(error?.message || '获取外部告警凭证状态失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+const generateCredential = async () => {
+  if (!props.record) return
+  submitting.value = true
+  try {
+    const response = await generateBusinessAlertCredential(props.record.id)
+    accessToken.value = response.details?.access_token || ''
+    await loadStatus()
+    accessToken.value = response.details?.access_token || ''
+    Message.success('访问凭证已生成')
+  } catch (error: any) {
+    Message.error(error?.message || '生成访问凭证失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+const revealCredential = async () => {
+  if (!props.record) return
+  submitting.value = true
+  try {
+    const response = await revealBusinessAlertCredential(props.record.id)
+    accessToken.value = response.details?.access_token || ''
+  } catch (error: any) {
+    Message.error(error?.message || '查看访问凭证失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) loadStatus()
+    else {
+      status.value = null
+      accessToken.value = ''
+    }
+  }
+)
+</script>
+
+<style scoped lang="less">
+.credential-loading {
+  display: block;
+  min-height: 160px;
+}
+
+.credential-actions,
+.credential-tip {
+  margin-top: 16px;
+}
+
+.credential-token {
+  margin-top: 12px;
+  padding: 12px;
+  overflow-wrap: anywhere;
+  background: var(--color-fill-2);
+  border-radius: 4px;
+}
+</style>
diff --git a/src/views/ops/pages/business-system/components/BusinessSystemFormDialog.vue b/src/views/ops/pages/business-system/components/BusinessSystemFormDialog.vue
new file mode 100644
index 0000000..945cc7a
--- /dev/null
+++ b/src/views/ops/pages/business-system/components/BusinessSystemFormDialog.vue
@@ -0,0 +1,173 @@
+<template>
+  <a-modal v-model:visible="modalVisible" :title="record ? '编辑业务系统' : '新增业务系统'" :width="680" @before-ok="submit">
+    <a-form ref="formRef" :model="form" layout="vertical">
+      <a-row :gutter="16">
+        <a-col :xs="24" :md="12">
+          <a-form-item field="code" label="系统编码" :rules="[{ required: true, message: '请输入系统编码' }]">
+            <a-input v-model="form.code" :disabled="Boolean(record)" :max-length="64" placeholder="请输入稳定的业务系统编码" />
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="name" label="系统名称" :rules="[{ required: true, message: '请输入系统名称' }]">
+            <a-input v-model="form.name" :max-length="128" placeholder="请输入业务系统名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="system_type" label="系统分类" :rules="[{ required: true, message: '请输入系统分类' }]">
+            <a-input v-model="form.system_type" :max-length="64" placeholder="如核心业务、管理支撑" />
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="protection_level" label="等保级别" :rules="[{ required: true, message: '请选择等保级别' }]">
+            <a-select v-model="form.protection_level" placeholder="请选择等保级别" :loading="optionLoading">
+              <a-option v-for="item in protectionLevelOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="network_type" label="网络类型" :rules="[{ required: true, message: '请选择网络类型' }]">
+            <a-select v-model="form.network_type" placeholder="请选择网络类型" :loading="optionLoading">
+              <a-option v-for="item in networkTypeOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="status" label="状态" :rules="[{ required: true, message: '请选择状态' }]">
+            <a-radio-group v-model="form.status">
+              <a-radio value="active">启用</a-radio>
+              <a-radio value="disabled">停用</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="owner_user_id" label="责任人">
+            <a-select v-model="form.owner_user_id" allow-clear allow-search placeholder="请选择系统用户" :loading="optionLoading">
+              <a-option v-for="item in users" :key="item.id" :value="item.id">{{ item.name }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="12">
+          <a-form-item field="department_id" label="所属部门">
+            <a-select v-model="form.department_id" allow-clear allow-search placeholder="请选择所属部门" :loading="optionLoading">
+              <a-option v-for="item in departments" :key="item.id" :value="item.id">{{ item.name }}</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-form-item field="description" label="描述">
+        <a-textarea v-model="form.description" :max-length="1000" show-word-limit :auto-size="{ minRows: 3, maxRows: 6 }" />
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import {
+  createBusinessSystem,
+  updateBusinessSystem,
+  type BusinessSystemInput,
+  type BusinessSystemItem,
+} from '@/api/ops/businessSystem'
+import { fetchDepartmentList, fetchUserList, type DepartmentItem, type UserItem } from '@/api/ops/rbac2'
+import { fetchDictionaryOptions } from '@/api/ops/systemSettings'
+
+const props = defineProps<{
+  visible: boolean
+  record?: BusinessSystemItem
+}>()
+
+const emit = defineEmits<{
+  (event: 'update:visible', value: boolean): void
+  (event: 'saved'): void
+}>()
+
+const modalVisible = computed({
+  get: () => props.visible,
+  set: (value: boolean) => emit('update:visible', value),
+})
+const formRef = ref()
+const optionLoading = ref(false)
+const protectionLevelOptions = ref<Array<{ label: string; value: string }>>([])
+const networkTypeOptions = ref<Array<{ label: string; value: string }>>([])
+const users = ref<UserItem[]>([])
+const departments = ref<DepartmentItem[]>([])
+
+const blankForm = (): BusinessSystemInput => ({
+  code: '',
+  name: '',
+  system_type: '',
+  protection_level: 'ungraded',
+  network_type: 'intranet',
+  owner_user_id: undefined,
+  department_id: undefined,
+  description: '',
+  status: 'active',
+})
+const form = reactive<BusinessSystemInput>(blankForm())
+
+const responseRows = <T,>(payload: T[] | { data?: T[] } | undefined): T[] => {
+  if (Array.isArray(payload)) return payload
+  return payload?.data || []
+}
+
+const loadOptions = async () => {
+  optionLoading.value = true
+  try {
+    const [protectionLevels, networkTypes, userResponse, departmentResponse]: any[] = await Promise.all([
+      fetchDictionaryOptions('business.protection_level'),
+      fetchDictionaryOptions('business.network_type'),
+      fetchUserList({ page: 1, size: 100, status: 1 }),
+      fetchDepartmentList({ page: 1, size: 1000 }),
+    ])
+    protectionLevelOptions.value = protectionLevels
+    networkTypeOptions.value = networkTypes
+    users.value = responseRows<UserItem>(userResponse?.details)
+    departments.value = responseRows<DepartmentItem>(departmentResponse?.details)
+  } catch (error) {
+    console.error('加载业务系统选项失败:', error)
+    Message.error('加载业务系统选项失败')
+  } finally {
+    optionLoading.value = false
+  }
+}
+
+watch(
+  () => props.visible,
+  async (visible) => {
+    if (!visible) return
+    Object.assign(form, blankForm(), props.record || {})
+    await loadOptions()
+  }
+)
+
+const submit = async () => {
+  if (await formRef.value?.validate()) return false
+  const payload: BusinessSystemInput = {
+    code: form.code.trim(),
+    name: form.name.trim(),
+    system_type: form.system_type.trim(),
+    protection_level: form.protection_level,
+    network_type: form.network_type,
+    owner_user_id: form.owner_user_id,
+    department_id: form.department_id,
+    description: form.description.trim(),
+    status: form.status,
+  }
+  try {
+    if (props.record) {
+      const { code: _code, ...updatePayload } = payload
+      await updateBusinessSystem(props.record.id, updatePayload)
+    }
+    else await createBusinessSystem(payload)
+    Message.success(props.record ? '业务系统已更新' : '业务系统已创建')
+    emit('saved')
+    return true
+  } catch (error) {
+    console.error('保存业务系统失败:', error)
+    Message.error('保存业务系统失败')
+    return false
+  }
+}
+</script>
diff --git a/src/views/ops/pages/business-system/components/HTTPCheckPanel.vue b/src/views/ops/pages/business-system/components/HTTPCheckPanel.vue
index 62512de..c27e31d 100644
--- a/src/views/ops/pages/business-system/components/HTTPCheckPanel.vue
+++ b/src/views/ops/pages/business-system/components/HTTPCheckPanel.vue
@@ -82,7 +82,12 @@
           <a-col :span="4"><a-form-item label="启用"><a-switch v-model="form.enabled" /></a-form-item></a-col>
         </a-row>
 
-        <a-divider orientation="left">检测步骤</a-divider>
+        <a-divider orientation="left">
+          <a-space>
+            <span>检测步骤</span>
+            <a-button type="outline" size="mini" @click="openWSDLImporter">从 WSDL 生成 SOAP 步骤</a-button>
+          </a-space>
+        </a-divider>
         <a-alert type="warning" class="panel-alert">
           路径必须是同一基础地址下的相对路径。可在路径、请求头和只读 POST 正文中使用前一步提取的变量，例如 ${token}；凭证字段使用 ${credential.token}。
         </a-alert>
@@ -124,6 +129,8 @@
                   <a-option value="body_contains">正文包含</a-option>
                   <a-option value="json_exists">JSON 字段存在</a-option>
                   <a-option value="json_equals">JSON 字段等于</a-option>
+                  <a-option value="xml_exists">XML 节点存在</a-option>
+                  <a-option value="xml_equals">XML 节点等于</a-option>
                 </a-select>
                 <a-input v-model="assertion.expression" :disabled="!assertionNeedsExpression(assertion.kind)" :placeholder="assertionExpressionPlaceholder(assertion.kind)" />
                 <a-input v-model="assertion.expected" :disabled="assertion.kind === 'json_exists'" :placeholder="assertionExpectedPlaceholder(assertion.kind)" />
@@ -134,8 +141,8 @@
             <a-tab-pane key="extracts" :title="`变量提取（${step.extracts.length}）`">
               <div v-for="(extract, index) in step.extracts" :key="extract.key" class="dynamic-row three-column">
                 <a-input v-model="extract.variable" placeholder="变量名，如 token" />
-                <a-select v-model="extract.source"><a-option value="json">JSON 字段</a-option><a-option value="header">响应头</a-option><a-option value="cookie">Cookie</a-option></a-select>
-                <a-input v-model="extract.expression" :placeholder="extract.source === 'json' ? '字段路径，如 data.token' : '响应头或 Cookie 名称'" />
+                <a-select v-model="extract.source"><a-option value="json">JSON 字段</a-option><a-option value="xml">XML 节点</a-option><a-option value="header">响应头</a-option><a-option value="cookie">Cookie</a-option></a-select>
+                <a-input v-model="extract.expression" :placeholder="extractExpressionPlaceholder(extract.source)" />
                 <a-button type="text" status="danger" @click="step.extracts.splice(index, 1)">删除</a-button>
               </div>
               <a-button type="outline" size="small" @click="addExtract(step)">新增变量提取</a-button>
@@ -146,6 +153,27 @@
       </a-form>
     </a-modal>
 
+    <a-modal v-model:visible="wsdlVisible" title="从 WSDL 生成 SOAP 查询步骤" :width="820" :footer="false">
+      <a-alert type="info" class="panel-alert">
+        请粘贴甲方提供的 WSDL 内容。系统只在当前页面解析接口定义，不保存 WSDL；选择方法后生成一个普通只读 POST 步骤，仍需核对请求参数并确认该方法只执行查询。
+      </a-alert>
+      <a-textarea v-model="wsdlXML" :auto-size="{ minRows: 8, maxRows: 16 }" placeholder="粘贴完整 WSDL XML" />
+      <a-space style="margin: 12px 0">
+        <a-button type="primary" @click="parseWSDL">解析 WSDL</a-button>
+        <span v-if="wsdlOperations.length">已识别 {{ wsdlOperations.length }} 个方法</span>
+      </a-space>
+      <a-table v-if="wsdlOperations.length" row-key="key" :data="wsdlOperations" :pagination="false" :scroll="{ y: 300 }">
+        <template #columns>
+          <a-table-column title="接口方法" data-index="name" />
+          <a-table-column title="SOAP 版本" data-index="soapVersion" :width="110" />
+          <a-table-column title="服务地址" data-index="address" ellipsis tooltip />
+          <a-table-column title="操作" :width="100">
+            <template #cell="{ record }"><a-button type="text" @click="applyWSDLOperation(record)">生成步骤</a-button></template>
+          </a-table-column>
+        </template>
+      </a-table>
+    </a-modal>
+
     <a-modal v-model:visible="historyVisible" :title="`${historyCheck?.name || ''} - 检测记录`" :width="980" :footer="false">
       <a-table row-key="id" :data="runs" :loading="historyLoading" :pagination="false" :scroll="{ x: 900 }">
         <template #columns>
@@ -224,6 +252,14 @@ interface EditorStep {
   extracts: KeyedExtract[]
 }
 interface EditorForm extends Omit<BusinessHTTPCheckInput, 'steps'> { steps: EditorStep[] }
+interface WSDLOperation {
+  key: string
+  name: string
+  soapAction: string
+  soapVersion: '1.1' | '1.2'
+  address: string
+  targetNamespace: string
+}
 
 const props = defineProps<{ businessSystemId: number; disabled?: boolean }>()
 const router = useRouter()
@@ -241,6 +277,9 @@ const runs = ref<BusinessHTTPCheckRun[]>([])
 const runDetailVisible = ref(false)
 const selectedRun = ref<BusinessHTTPCheckRun>()
 const selectedStepResults = ref<BusinessHTTPCheckStepResult[]>([])
+const wsdlVisible = ref(false)
+const wsdlXML = ref('')
+const wsdlOperations = ref<WSDLOperation[]>([])
 let keySeed = 0
 
 const nextKey = () => ++keySeed
@@ -309,12 +348,104 @@ const removeStep = (index: number) => form.steps.splice(index, 1)
 const addHeader = (step: EditorStep) => step.headers.push({ key: nextKey(), name: '', value: '' })
 const addAssertion = (step: EditorStep) => step.assertions.push({ key: nextKey(), kind: 'status', expression: '', expected: '200-299' })
 const addExtract = (step: EditorStep) => step.extracts.push({ key: nextKey(), variable: '', source: 'json', expression: '' })
-const assertionNeedsExpression = (kind: string) => ['header_equals', 'json_exists', 'json_equals'].includes(kind)
-const assertionExpressionPlaceholder = (kind: string) => kind === 'header_equals' ? '响应头名称' : kind.startsWith('json_') ? 'JSON 字段路径' : '此项无需填写'
+const assertionNeedsExpression = (kind: string) => ['header_equals', 'json_exists', 'json_equals', 'xml_exists', 'xml_equals'].includes(kind)
+const assertionNeedsExpected = (kind: string) => kind !== 'json_exists' && kind !== 'xml_exists'
+const assertionExpressionPlaceholder = (kind: string) => kind === 'header_equals' ? '响应头名称' : kind.startsWith('json_') ? 'JSON 字段路径' : kind.startsWith('xml_') ? 'XML 路径，如 Envelope/Body/result/code' : '此项无需填写'
 const assertionExpectedPlaceholder = (kind: string) => ({
   status: '如 200 或 200-299', max_response_time_ms: '最大毫秒数', header_equals: '期望值',
   body_contains: '必须包含的文本', json_equals: '期望值', json_exists: '只检查存在',
+  xml_equals: '期望值', xml_exists: '只检查存在',
 }[kind] || '期望值')
+const extractExpressionPlaceholder = (source: string) => source === 'json'
+  ? '字段路径，如 data.token'
+  : source === 'xml'
+    ? 'XML 路径，如 Envelope/Body/result/token'
+    : '响应头或 Cookie 名称'
+
+const openWSDLImporter = () => {
+  wsdlXML.value = ''
+  wsdlOperations.value = []
+  wsdlVisible.value = true
+}
+
+const localElements = (root: ParentNode, localName: string) => Array.from(root.querySelectorAll('*')).filter((item) => item.localName === localName)
+
+const parseWSDL = () => {
+  const document = new DOMParser().parseFromString(wsdlXML.value, 'application/xml')
+  if (!wsdlXML.value.trim() || document.querySelector('parsererror')) {
+    Message.warning('WSDL 不是有效的 XML')
+    return
+  }
+  const definitions = document.documentElement
+  if (definitions.localName !== 'definitions') {
+    Message.warning('未找到 WSDL definitions 根节点')
+    return
+  }
+  const targetNamespace = definitions.getAttribute('targetNamespace') || ''
+  const addresses = localElements(document, 'address')
+    .map((item) => item.getAttribute('location') || '')
+    .filter(Boolean)
+  const address = addresses[0] || form.base_url
+  const operations: WSDLOperation[] = []
+  for (const operation of localElements(document, 'operation')) {
+    if (operation.parentElement?.localName !== 'binding') continue
+    const name = operation.getAttribute('name') || ''
+    if (!/^[A-Za-z_][A-Za-z0-9_.-]*$/.test(name)) continue
+    const soapOperation = Array.from(operation.children).find((item) => item.localName === 'operation')
+    const namespace = soapOperation?.namespaceURI || ''
+    const soapVersion: '1.1' | '1.2' = namespace.includes('soap12') ? '1.2' : '1.1'
+    operations.push({
+      key: `${name}:${operations.length}`,
+      name,
+      soapAction: soapOperation?.getAttribute('soapAction') || '',
+      soapVersion,
+      address,
+      targetNamespace,
+    })
+  }
+  wsdlOperations.value = operations
+  if (!operations.length) Message.warning('WSDL 中未识别到 SOAP binding 方法')
+}
+
+const applyWSDLOperation = (operation: WSDLOperation) => {
+  let target: URL
+  let base: URL
+  try {
+    base = new URL(form.base_url)
+    target = new URL(operation.address || form.base_url, base)
+  } catch {
+    Message.warning('请先填写有效的基础地址，并核对 WSDL 服务地址')
+    return
+  }
+  if (target.origin !== base.origin) {
+    Message.warning('WSDL 服务地址与检测基础地址不同，请调整基础地址后再生成')
+    return
+  }
+  const rawCode = operation.name.replace(/[^A-Za-z0-9_-]/g, '_')
+  const code = /^[A-Za-z]/.test(rawCode) ? rawCode.slice(0, 64) : `soap_${rawCode}`.slice(0, 64)
+  const namespace = operation.soapVersion === '1.2'
+    ? 'http://www.w3.org/2003/05/soap-envelope'
+    : 'http://schemas.xmlsoap.org/soap/envelope/'
+  const headers: KeyedHeader[] = [{
+    key: nextKey(),
+    name: 'Content-Type',
+    value: operation.soapVersion === '1.2' ? 'application/soap+xml; charset=utf-8' : 'text/xml; charset=utf-8',
+  }]
+  if (operation.soapAction && operation.soapVersion === '1.1') {
+    headers.push({ key: nextKey(), name: 'SOAPAction', value: operation.soapAction })
+  }
+  form.steps.push({
+    key: nextKey(), code, name: operation.name, method: 'POST',
+    path: `${target.pathname}${target.search}` || '/',
+    body: `<?xml version="1.0" encoding="UTF-8"?>\n<soapenv:Envelope xmlns:soapenv="${namespace}" xmlns:tns="${operation.targetNamespace}">\n  <soapenv:Header/>\n  <soapenv:Body>\n    <tns:${operation.name}>\n      <!-- 按 WSDL 填写只读查询参数 -->\n    </tns:${operation.name}>\n  </soapenv:Body>\n</soapenv:Envelope>`,
+    read_only_confirmed: false,
+    headers,
+    extracts: [],
+    assertions: [{ key: nextKey(), kind: 'status', expression: '', expected: '200-299' }],
+  })
+  wsdlVisible.value = false
+  Message.success(`已生成 ${operation.name} 步骤，请填写查询参数并确认只读`)
+}
 
 const validateForm = () => {
   if (!form.name.trim() || !form.base_url.trim() || !form.collector_node_id) return '请完整填写检测名称、基础地址和采集节点'
@@ -328,7 +459,7 @@ const validateForm = () => {
     if (step.method === 'POST' && !step.read_only_confirmed) return `步骤 ${index + 1} 的 POST 尚未确认只读`
     if (step.headers.some((item) => !item.name.trim())) return `步骤 ${index + 1} 存在未填写名称的请求头`
     if (step.headers.some((item) => item.name.trim().toLowerCase() === 'traceparent')) return `步骤 ${index + 1} 的 traceparent 由系统自动生成，不能手动配置`
-    if (step.assertions.some((item) => !item.kind || (assertionNeedsExpression(item.kind) && !item.expression?.trim()) || (item.kind !== 'json_exists' && !item.expected?.trim()))) return `步骤 ${index + 1} 的结果断言不完整`
+    if (step.assertions.some((item) => !item.kind || (assertionNeedsExpression(item.kind) && !item.expression?.trim()) || (assertionNeedsExpected(item.kind) && !item.expected?.trim()))) return `步骤 ${index + 1} 的结果断言不完整`
     if (step.extracts.some((item) => !item.variable.trim() || !item.expression.trim())) return `步骤 ${index + 1} 的变量提取不完整`
   }
   return ''
diff --git a/src/views/ops/pages/business-system/components/MiddlewareCandidatePanel.vue b/src/views/ops/pages/business-system/components/MiddlewareCandidatePanel.vue
new file mode 100644
index 0000000..663ef64
--- /dev/null
+++ b/src/views/ops/pages/business-system/components/MiddlewareCandidatePanel.vue
@@ -0,0 +1,154 @@
+<template>
+  <a-card :bordered="false" title="调用链中间件识别" class="section-card">
+    <a-alert type="info" style="margin-bottom: 16px">
+      系统只从调用链标准属性中识别候选，不会自动创建设备。管理员确认时，只能关联当前业务系统已经纳入的中间件资源。
+    </a-alert>
+    <a-space style="margin-bottom: 12px">
+      <a-button :loading="loading" @click="loadData">刷新候选</a-button>
+      <a-typography-text type="secondary">默认分析最近 30 天调用链</a-typography-text>
+    </a-space>
+    <a-table :data="rows" :loading="loading" :pagination="false" row-key="candidate_key">
+      <template #columns>
+        <a-table-column title="产品" data-index="product" :width="130" />
+        <a-table-column title="候选名称" data-index="display_name" />
+        <a-table-column title="地址" data-index="address">
+          <template #cell="{ record }">{{ record.address || '-' }}</template>
+        </a-table-column>
+        <a-table-column title="来源服务" data-index="source_service" />
+        <a-table-column title="观测" :width="150">
+          <template #cell="{ record }">{{ record.span_count }} 次 / {{ record.error_count }} 次异常</template>
+        </a-table-column>
+        <a-table-column title="状态" :width="110">
+          <template #cell="{ record }">
+            <a-tag :color="stateColor(record.decision?.state)">{{ stateText(record.decision?.state) }}</a-tag>
+          </template>
+        </a-table-column>
+        <a-table-column title="确认关联" :width="360" fixed="right">
+          <template #cell="{ record }">
+            <a-space v-if="!record.decision">
+              <a-select
+                v-model="selections[record.candidate_key]"
+                allow-search
+                allow-clear
+                :disabled="disabled"
+                placeholder="选择本业务已有中间件资源"
+                style="width: 220px"
+              >
+                <a-option v-for="item in options" :key="item.resource_uid" :value="item.resource_uid">
+                  {{ optionLabel(item) }}
+                </a-option>
+              </a-select>
+              <a-button
+                type="primary"
+                size="small"
+                :disabled="disabled || !selections[record.candidate_key]"
+                :loading="savingKey === record.candidate_key"
+                @click="saveDecision(record, 'confirmed')"
+              >确认</a-button>
+              <a-button
+                size="small"
+                :disabled="disabled"
+                :loading="savingKey === record.candidate_key"
+                @click="saveDecision(record, 'ignored')"
+              >忽略</a-button>
+            </a-space>
+            <a-typography-text v-else-if="record.decision.state === 'confirmed'">
+              {{ optionName(record.decision.middleware_resource_uid) }}
+            </a-typography-text>
+            <a-typography-text v-else type="secondary">已忽略</a-typography-text>
+          </template>
+        </a-table-column>
+      </template>
+    </a-table>
+    <a-empty v-if="!loading && rows.length === 0" description="最近 30 天未识别到受支持的中间件候选" />
+    <a-alert v-if="!loading && rows.some((item) => !item.decision) && options.length === 0" type="warning" style="margin-top: 12px">
+      当前业务系统尚未纳入中间件资源。请先在资源成员中关联已有中间件设备，再确认候选；本页面不会自动创建设备。
+    </a-alert>
+  </a-card>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import { fetchMiddlewareCandidates, type MiddlewareCandidate } from '@/api/ops/logs'
+import {
+  decideBusinessMiddlewareCandidate,
+  fetchBusinessMiddlewareCandidateDecisions,
+  fetchBusinessMiddlewareOptions,
+  type BusinessMiddlewareCandidateDecision,
+  type BusinessMiddlewareOption,
+} from '@/api/ops/businessSystem'
+
+const props = withDefaults(defineProps<{ businessSystemId: number; disabled?: boolean }>(), { disabled: false })
+const loading = ref(false)
+const savingKey = ref('')
+const candidates = ref<MiddlewareCandidate[]>([])
+const decisions = ref<BusinessMiddlewareCandidateDecision[]>([])
+const options = ref<BusinessMiddlewareOption[]>([])
+const selections = reactive<Record<string, string | undefined>>({})
+
+const decisionMap = computed(() => new Map(decisions.value.map((item) => [item.candidate_key, item])))
+const rows = computed(() => candidates.value.map((item) => ({ ...item, decision: decisionMap.value.get(item.candidate_key) })))
+
+const loadData = async () => {
+  if (!props.businessSystemId) return
+  loading.value = true
+  try {
+    const [candidateResponse, decisionResponse, optionResponse] = await Promise.all([
+      fetchMiddlewareCandidates(props.businessSystemId),
+      fetchBusinessMiddlewareCandidateDecisions(props.businessSystemId),
+      fetchBusinessMiddlewareOptions(props.businessSystemId),
+    ])
+    candidates.value = candidateResponse.details?.items || []
+    decisions.value = decisionResponse.details?.list || []
+    options.value = optionResponse.details?.list || []
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载中间件候选失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+const saveDecision = async (candidate: MiddlewareCandidate, state: 'confirmed' | 'ignored') => {
+  const middlewareResourceUID = selections[candidate.candidate_key]
+  if (state === 'confirmed' && !middlewareResourceUID) return
+  savingKey.value = candidate.candidate_key
+  try {
+    const response = await decideBusinessMiddlewareCandidate(props.businessSystemId, {
+      candidate_key: candidate.candidate_key,
+      product: candidate.product,
+      display_name: candidate.display_name,
+      address: candidate.address,
+      source_service: candidate.source_service,
+      state,
+      middleware_resource_uid: state === 'confirmed' ? middlewareResourceUID : undefined,
+    })
+    if (response.code !== 0) throw new Error(response.message || '处理中间件候选失败')
+    Message.success(state === 'confirmed' ? '中间件候选已确认关联' : '中间件候选已忽略')
+    await loadData()
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '处理中间件候选失败')
+  } finally {
+    savingKey.value = ''
+  }
+}
+
+const optionLabel = (item: BusinessMiddlewareOption) => `${item.name || item.resource_uid}${item.product ? `｜${item.product}` : ''}`
+const optionName = (resourceUID?: string) => options.value.find((item) => item.resource_uid === resourceUID)?.name || resourceUID || '-'
+const stateText = (state?: string) => (state === 'confirmed' ? '已确认' : state === 'ignored' ? '已忽略' : '待确认')
+const stateColor = (state?: string) => (state === 'confirmed' ? 'green' : state === 'ignored' ? 'gray' : 'orange')
+
+watch(
+  () => props.businessSystemId,
+  (id) => {
+    if (id) loadData()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped>
+.section-card {
+  margin-bottom: 16px;
+}
+</style>
diff --git a/src/views/ops/pages/business-system/components/ServiceMonitorPanel.vue b/src/views/ops/pages/business-system/components/ServiceMonitorPanel.vue
new file mode 100644
index 0000000..67f13fa
--- /dev/null
+++ b/src/views/ops/pages/business-system/components/ServiceMonitorPanel.vue
@@ -0,0 +1,166 @@
+<template>
+  <a-card :bordered="false" title="服务可用性" class="section-card">
+    <a-alert type="info" style="margin-bottom: 16px">
+      这里只关联服务器中已经配置好的服务监控项。解除关联不会删除服务器配置；服务器端删除前会检查业务关联。
+    </a-alert>
+    <a-space fill style="margin-bottom: 12px">
+      <a-select
+        v-model="selectedMonitorId"
+        allow-search
+        allow-clear
+        :disabled="disabled"
+        placeholder="选择服务器服务监控项"
+        style="width: 520px; max-width: 100%"
+      >
+        <a-option v-for="item in selectableOptions" :key="item.id" :value="item.id">
+          {{ optionLabel(item) }}
+        </a-option>
+      </a-select>
+      <a-button type="primary" :loading="saving" :disabled="disabled || !selectedMonitorId" @click="linkMonitor">关联</a-button>
+      <a-button :loading="loading" @click="loadData">刷新</a-button>
+    </a-space>
+    <a-table :columns="columns" :data="links" :loading="loading" :pagination="false" row-key="id">
+      <template #service="{ record }">{{ record.service_monitor?.service_name || '-' }}</template>
+      <template #server="{ record }">{{ serverName(record.service_monitor_id, record.service_monitor?.resource_uid) }}</template>
+      <template #process="{ record }">
+        {{ record.service_monitor?.process_name || '-' }}:{{ record.service_monitor?.port || '-' }}
+      </template>
+      <template #availability="{ record }">
+        <a-tooltip :content="record.service_monitor?.last_message || availabilityText(record.service_monitor)">
+          <a-tag :color="availabilityColor(record.service_monitor)">
+            {{ availabilityText(record.service_monitor) }}
+          </a-tag>
+        </a-tooltip>
+      </template>
+      <template #checked_at="{ record }">{{ formatTime(record.service_monitor?.last_checked_at) }}</template>
+      <template #actions="{ record }">
+        <a-button type="text" status="danger" size="small" :disabled="disabled" @click="unlinkMonitor(record)">解除关联</a-button>
+      </template>
+    </a-table>
+  </a-card>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import { Message, Modal } from '@arco-design/web-vue'
+import {
+  createBusinessServiceMonitor,
+  deleteBusinessServiceMonitor,
+  fetchBusinessServiceMonitors,
+  type BusinessServiceMonitorLink,
+} from '@/api/ops/businessSystem'
+import { fetchServerServiceMonitorOptions, type ServerServiceMonitorOption } from '@/api/ops/server'
+
+const props = withDefaults(defineProps<{ businessSystemId: number; disabled?: boolean }>(), { disabled: false })
+const emit = defineEmits(['change'])
+const links = ref<BusinessServiceMonitorLink[]>([])
+const options = ref<ServerServiceMonitorOption[]>([])
+const selectedMonitorId = ref<number>()
+const loading = ref(false)
+const saving = ref(false)
+const columns = [
+  { title: '服务名称', slotName: 'service' },
+  { title: '所在服务器', slotName: 'server' },
+  { title: '进程与端口', slotName: 'process' },
+  { title: '可用性', slotName: 'availability', width: 110 },
+  { title: '最近检查时间', slotName: 'checked_at', width: 180 },
+  { title: '操作', slotName: 'actions', width: 110, fixed: 'right' },
+]
+
+const linkedIds = computed(() => new Set(links.value.map((item) => item.service_monitor_id)))
+const selectableOptions = computed(() => options.value.filter((item) => !linkedIds.value.has(item.id)))
+const optionLabel = (item: ServerServiceMonitorOption) =>
+  `${item.service_name}｜${item.server_name}｜${item.process_name}:${item.port}`
+
+const loadData = async () => {
+  if (!props.businessSystemId) return
+  loading.value = true
+  try {
+    const [linkResponse, optionResponse] = await Promise.all([
+      fetchBusinessServiceMonitors(props.businessSystemId),
+      fetchServerServiceMonitorOptions(props.businessSystemId),
+    ])
+    links.value = linkResponse.details?.list || []
+    options.value = optionResponse.details?.list || []
+    if (selectedMonitorId.value && linkedIds.value.has(selectedMonitorId.value)) selectedMonitorId.value = undefined
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载服务可用性关联失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+const linkMonitor = async () => {
+  if (!props.businessSystemId || !selectedMonitorId.value) return
+  saving.value = true
+  try {
+    const response = await createBusinessServiceMonitor(props.businessSystemId, selectedMonitorId.value)
+    if (response.code !== 0) throw new Error(response.message || '关联服务监控项失败')
+    selectedMonitorId.value = undefined
+    Message.success('服务监控项已关联')
+    await loadData()
+    emit('change')
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '关联服务监控项失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+const unlinkMonitor = (row: BusinessServiceMonitorLink) => {
+  Modal.confirm({
+    title: '解除服务监控关联',
+    content: `确认解除“${row.service_monitor?.service_name || row.service_monitor_id}”与当前业务系统的关联吗？服务器上的监控配置会保留。`,
+    onOk: async () => {
+      try {
+        const response = await deleteBusinessServiceMonitor(props.businessSystemId, row.id)
+        if (response.code !== 0) throw new Error(response.message || '解除关联失败')
+        Message.success('关联已解除')
+        await loadData()
+        emit('change')
+      } catch (error: any) {
+        Message.error(error?.response?.data?.message || error?.message || '解除关联失败')
+      }
+    },
+  })
+}
+
+const serverName = (monitorId: number, resourceUid?: string) => {
+  const option = options.value.find((item) => item.id === monitorId)
+  return option?.server_name || resourceUid || '-'
+}
+
+const availabilityText = (monitor?: BusinessServiceMonitorLink['service_monitor']) => {
+  if (!monitor?.enabled) return '未监控'
+  if (monitor.last_state === 'available') return '可用'
+  if (monitor.last_state === 'unavailable') return '不可用'
+  return '状态未知'
+}
+
+const availabilityColor = (monitor?: BusinessServiceMonitorLink['service_monitor']) => {
+  if (!monitor?.enabled) return 'gray'
+  if (monitor.last_state === 'available') return 'green'
+  if (monitor.last_state === 'unavailable') return 'red'
+  return 'gray'
+}
+
+const formatTime = (value?: string | null) => {
+  if (!value) return '-'
+  const date = new Date(value)
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN')
+}
+
+watch(
+  () => props.businessSystemId,
+  (id) => {
+    if (id) loadData()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped>
+.section-card {
+  margin-bottom: 16px;
+}
+</style>
diff --git a/src/views/ops/pages/business-system/detail.vue b/src/views/ops/pages/business-system/detail.vue
index 0488ff7..79f1ac9 100644
--- a/src/views/ops/pages/business-system/detail.vue
+++ b/src/views/ops/pages/business-system/detail.vue
@@ -30,9 +30,13 @@
       </a-col>
       <a-col :xs="24" :md="8">
         <a-card :bordered="false" class="summary-card">
-          <div class="summary-label">影响范围</div>
-          <div class="summary-value">{{ topology?.resources?.length || members.length || 0 }}</div>
-          <div class="summary-hint">受影响资源</div>
+          <div class="summary-label">活动告警</div>
+          <div class="summary-value" :class="{ danger: health?.alert_summary?.active_count }">
+            {{ health?.alert_summary?.active_count || 0 }}
+          </div>
+          <div class="summary-hint">
+            {{ health?.alert_summary?.highest_severity?.name || health?.alert_summary?.highest_severity?.code || '无活动告警' }}
+          </div>
         </a-card>
       </a-col>
       <a-col :xs="24" :md="8">
@@ -45,20 +49,22 @@
     </a-row>
 
     <HTTPCheckPanel :business-system-id="businessSystemID" :disabled="pageUnauthorized" />
+    <ServiceMonitorPanel :business-system-id="businessSystemID" :disabled="pageUnauthorized" @change="refreshHealth" />
+    <MiddlewareCandidatePanel :business-system-id="businessSystemID" :disabled="pageUnauthorized" />
 
     <a-row :gutter="16">
       <a-col :xs="24" :xl="15">
         <a-card :bordered="false" title="业务拓扑" class="section-card">
           <div v-if="topologyNodes.length" class="topology-panel">
             <div v-for="node in topologyNodes" :key="node.node_id || node.resource_uid" class="topology-node">
-              <div class="node-icon" :class="nodeStatusClass(node.status)">
+              <div class="node-icon" :class="nodeStatusClass(topologyNodeStatus(node))">
                 <icon-apps />
               </div>
               <div class="node-content">
                 <div class="node-title">{{ node.label }}</div>
                 <div class="node-meta">{{ node.resource_uid || node.type }}</div>
               </div>
-              <a-tag :color="statusColor(node.status)">{{ node.status || 'unknown' }}</a-tag>
+              <a-tag :color="statusColor(topologyNodeStatus(node))">{{ topologyNodeStatus(node) }}</a-tag>
             </div>
           </div>
           <a-empty v-else description="暂无拓扑节点" />
@@ -110,10 +116,12 @@
         <a-card :bordered="false" title="基础信息" class="section-card">
           <a-descriptions :column="1" bordered size="medium">
             <a-descriptions-item label="编码">{{ system?.code || '-' }}</a-descriptions-item>
-            <a-descriptions-item label="类型">{{ system?.system_type || '-' }}</a-descriptions-item>
+            <a-descriptions-item label="系统分类">{{ system?.system_type || '-' }}</a-descriptions-item>
+            <a-descriptions-item label="等保级别">{{ protectionLevelLabel }}</a-descriptions-item>
+            <a-descriptions-item label="网络类型">{{ networkTypeLabel }}</a-descriptions-item>
             <a-descriptions-item label="状态">{{ system?.status || '-' }}</a-descriptions-item>
-            <a-descriptions-item label="责任人">{{ system?.owner_user_id || '-' }}</a-descriptions-item>
-            <a-descriptions-item label="部门">{{ system?.department_id || '-' }}</a-descriptions-item>
+            <a-descriptions-item label="责任人">{{ ownerName }}</a-descriptions-item>
+            <a-descriptions-item label="部门">{{ departmentName }}</a-descriptions-item>
             <a-descriptions-item label="描述">{{ system?.description || '-' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
@@ -192,11 +200,15 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import { IconApps, IconRefresh } from '@arco-design/web-vue/es/icon'
 import HTTPCheckPanel from './components/HTTPCheckPanel.vue'
+import MiddlewareCandidatePanel from './components/MiddlewareCandidatePanel.vue'
+import ServiceMonitorPanel from './components/ServiceMonitorPanel.vue'
+import { fetchDictionaryOptions } from '@/api/ops/systemSettings'
+import { fetchDepartmentList, fetchUserList, type DepartmentItem, type UserItem } from '@/api/ops/rbac2'
 import {
   createBusinessDocumentLink,
   createBusinessNote,
@@ -230,6 +242,11 @@ const notes = ref<BusinessNote[]>([])
 const documents = ref<BusinessDocumentLink[]>([])
 const noteSaving = ref(false)
 const documentSaving = ref(false)
+const protectionLevelOptions = ref<Array<{ label: string; value: string }>>([])
+const networkTypeOptions = ref<Array<{ label: string; value: string }>>([])
+const users = ref<UserItem[]>([])
+const departments = ref<DepartmentItem[]>([])
+let alertRefreshTimer: ReturnType<typeof setInterval> | undefined
 
 const noteForm = reactive({
   title: '',
@@ -252,6 +269,20 @@ const topologyNodes = computed(() => topology.value?.nodes || [])
 const topologyLinks = computed(() => topology.value?.links || [])
 const businessDependencies = computed(() => topology.value?.dependencies || [])
 const healthScore = computed(() => health.value?.health?.score ?? 100)
+const resourceAlertSeverity = computed(() => {
+  const values = health.value?.alert_summary?.resources || []
+  return new Map(values.map((item) => [item.resource_uid, item.highest_severity?.code || 'warning']))
+})
+const protectionLevelLabel = computed(() =>
+  protectionLevelOptions.value.find((item) => item.value === system.value?.protection_level)?.label || system.value?.protection_level || '-'
+)
+const networkTypeLabel = computed(() =>
+  networkTypeOptions.value.find((item) => item.value === system.value?.network_type)?.label || system.value?.network_type || '-'
+)
+const ownerName = computed(() => users.value.find((item) => item.id === system.value?.owner_user_id)?.name || system.value?.owner_user_id || '-')
+const departmentName = computed(
+  () => departments.value.find((item) => item.id === system.value?.department_id)?.name || system.value?.department_id || '-'
+)
 const healthFactors = computed(() => {
   const deductions = health.value?.health?.deductions || {}
   const labels: Record<string, string> = {
@@ -320,6 +351,9 @@ const statusColor = (status?: string) => {
   return map[status || 'unknown'] || 'gray'
 }
 
+const topologyNodeStatus = (node: { resource_uid?: string; status?: string }) =>
+  (node.resource_uid && resourceAlertSeverity.value.get(node.resource_uid)) || node.status || 'unknown'
+
 const criticalityColor = (value?: string) => {
   const map: Record<string, string> = {
     high: 'red',
@@ -374,6 +408,11 @@ const timelineResourceUID = (item: BusinessTimelineItem) => {
   return typeof value === 'string' ? value : ''
 }
 
+const responseRows = <T,>(payload: T[] | { data?: T[] } | undefined): T[] => {
+  if (Array.isArray(payload)) return payload
+  return payload?.data || []
+}
+
 const fetchAll = async () => {
   const id = businessSystemID.value
   if (!id) {
@@ -385,7 +424,19 @@ const fetchAll = async () => {
   errorMessage.value = ''
   pageUnauthorized.value = false
   try {
-    const [detailRes, healthRes, membersRes, topologyRes, timelineRes, notesRes, documentsRes] = await Promise.all([
+    const [
+      detailRes,
+      healthRes,
+      membersRes,
+      topologyRes,
+      timelineRes,
+      notesRes,
+      documentsRes,
+      protectionLevels,
+      networkTypes,
+      userResponse,
+      departmentResponse,
+    ]: any[] = await Promise.all([
       fetchBusinessSystemDetail(id),
       fetchBusinessHealth(id),
       fetchBusinessMembers(id),
@@ -393,6 +444,10 @@ const fetchAll = async () => {
       fetchBusinessTimeline(id, { limit: 100 }),
       fetchBusinessNotes(id),
       fetchBusinessDocumentLinks(id),
+      fetchDictionaryOptions('business.protection_level'),
+      fetchDictionaryOptions('business.network_type'),
+      fetchUserList({ page: 1, size: 100, status: 1 }),
+      fetchDepartmentList({ page: 1, size: 1000 }),
     ])
     system.value = detailRes.details || null
     health.value = healthRes.details || null
@@ -401,6 +456,10 @@ const fetchAll = async () => {
     timeline.value = timelineRes.details?.list || []
     notes.value = notesRes.details?.list || []
     documents.value = documentsRes.details?.list || []
+    protectionLevelOptions.value = protectionLevels
+    networkTypeOptions.value = networkTypes
+    users.value = responseRows<UserItem>(userResponse?.details)
+    departments.value = responseRows<DepartmentItem>(departmentResponse?.details)
   } catch (error) {
     console.error('获取业务系统详情失败:', error)
     setLoadError(error, '获取业务系统详情失败')
@@ -410,6 +469,30 @@ const fetchAll = async () => {
   }
 }
 
+const refreshHealth = async () => {
+  if (!businessSystemID.value) return
+  try {
+    const response = await fetchBusinessHealth(businessSystemID.value)
+    health.value = response.details || null
+  } catch (error) {
+    console.error('刷新业务健康状态失败:', error)
+  }
+}
+
+const refreshAlertView = async () => {
+  if (!businessSystemID.value || loading.value) return
+  try {
+    const [healthResponse, topologyResponse] = await Promise.all([
+      fetchBusinessHealth(businessSystemID.value),
+      fetchBusinessTopology(businessSystemID.value),
+    ])
+    health.value = healthResponse.details || null
+    topology.value = topologyResponse.details || null
+  } catch (error) {
+    console.error('刷新业务告警状态失败:', error)
+  }
+}
+
 const submitNote = async () => {
   const id = businessSystemID.value
   if (!id) return
@@ -473,7 +556,14 @@ const openBusinessTopology = () => router.push({ path: '/business-topology', que
 const openLogs = () => router.push({ path: '/monitor/log', query: { tab: 'entries', business_system_id: businessSystemID.value } })
 const openTraces = () => router.push({ path: '/monitor/log', query: { tab: 'traces', business_system_id: businessSystemID.value } })
 
-onMounted(fetchAll)
+onMounted(async () => {
+  await fetchAll()
+  alertRefreshTimer = setInterval(refreshAlertView, 10_000)
+})
+
+onBeforeUnmount(() => {
+  if (alertRefreshTimer) clearInterval(alertRefreshTimer)
+})
 </script>
 
 <script lang="ts">
diff --git a/src/views/ops/pages/business-system/index.vue b/src/views/ops/pages/business-system/index.vue
index feb7336..7718474 100644
--- a/src/views/ops/pages/business-system/index.vue
+++ b/src/views/ops/pages/business-system/index.vue
@@ -29,16 +29,31 @@
 
     <a-card :bordered="false" title="业务系统视图">
       <template #extra>
-        <a-button type="primary" :loading="loading" :disabled="pageUnauthorized" @click="fetchData">
-          <template #icon><icon-refresh /></template>
-          刷新
-        </a-button>
+        <a-space>
+          <a-button type="primary" :disabled="pageUnauthorized" @click="openCreate">
+            <template #icon><icon-plus /></template>
+            新增业务系统
+          </a-button>
+          <a-button :loading="loading" :disabled="pageUnauthorized" @click="fetchData">
+            <template #icon><icon-refresh /></template>
+            刷新
+          </a-button>
+        </a-space>
       </template>
 
       <a-form :model="filters" layout="inline" class="filter-form">
         <a-form-item field="keyword" label="关键字">
           <a-input v-model="filters.keyword" allow-clear placeholder="编码 / 名称 / 类型" />
         </a-form-item>
+        <a-form-item field="system_type" label="系统分类">
+          <a-select v-model="filters.system_type" allow-clear allow-search placeholder="全部" :options="systemTypeOptions" />
+        </a-form-item>
+        <a-form-item field="protection_level" label="等保级别">
+          <a-select v-model="filters.protection_level" allow-clear placeholder="全部" :options="protectionLevelOptions" />
+        </a-form-item>
+        <a-form-item field="network_type" label="网络类型">
+          <a-select v-model="filters.network_type" allow-clear placeholder="全部" :options="networkTypeOptions" />
+        </a-form-item>
         <a-form-item field="status" label="状态">
           <a-select v-model="filters.status" allow-clear placeholder="全部">
             <a-option value="active">启用</a-option>
@@ -56,54 +71,94 @@
         </a-form-item>
       </a-form>
 
-      <PageState :status="pageStatus" :error-text="errorMessage" :partial-text="partialMessage" @retry="fetchData">
-      <a-table
-        v-if="pageStatus !== 'empty' && pageStatus !== 'error' && pageStatus !== 'unauthorized'"
-        row-key="id"
-        :data="rows"
-        :columns="columns"
-        :loading="loading"
-        :pagination="pagination"
-        :scroll="{ x: 'max-content' }"
-        @page-change="handlePageChange"
-        @page-size-change="handlePageSizeChange"
-      >
-        <template #code="{ record }">
-          <a-typography-text copyable>{{ record.code }}</a-typography-text>
-        </template>
-        <template #status="{ record }">
-          <a-tag :color="record.status === 'active' ? 'green' : 'gray'">{{ record.status === 'active' ? '启用' : '停用' }}</a-tag>
-        </template>
-        <template #health="{ record }">
-          <div class="health-cell">
-            <span class="health-score" :class="healthClass(record.health_score)">{{ scoreText(record.health_score) }}</span>
-            <span class="health-bar">
-              <span :class="healthClass(record.health_score)" :style="{ width: `${scoreValue(record.health_score)}%` }" />
-            </span>
+      <a-row :gutter="16">
+        <a-col :xs="24" :xl="6">
+          <div class="tree-panel">
+            <div class="tree-title">业务分类树</div>
+            <a-tree v-if="treeData.length" :data="treeData" block-node default-expand-all @select="handleTreeSelect" />
+            <a-empty v-else description="暂无业务系统" />
           </div>
-        </template>
-        <template #active_incident_count="{ record }">
-          <a-badge :count="record.active_incident_count || 0" :dot="false" :max-count="99" />
-        </template>
-        <template #actions="{ record }">
-          <a-button type="text" size="small" :disabled="pageUnauthorized" @click="openDetail(record.id)">
-            <template #icon><icon-eye /></template>
-            详情
-          </a-button>
-        </template>
-      </a-table>
-      </PageState>
+        </a-col>
+        <a-col :xs="24" :xl="18">
+          <PageState :status="pageStatus" :error-text="errorMessage" :partial-text="partialMessage" @retry="fetchData">
+            <a-table
+              v-if="pageStatus !== 'empty' && pageStatus !== 'error' && pageStatus !== 'unauthorized'"
+              row-key="id"
+              :data="rows"
+              :columns="columns"
+              :loading="loading"
+              :pagination="pagination"
+              :scroll="{ x: 'max-content' }"
+              @page-change="handlePageChange"
+              @page-size-change="handlePageSizeChange"
+            >
+              <template #code="{ record }">
+                <a-typography-text copyable>{{ record.code }}</a-typography-text>
+              </template>
+              <template #name="{ record }">
+                <span class="business-name" :class="{ 'alert-active': record.active_alert_count }">{{ record.name }}</span>
+              </template>
+              <template #protection_level="{ record }">{{ protectionLevelLabel(record.protection_level) }}</template>
+              <template #network_type="{ record }">{{ networkTypeLabel(record.network_type) }}</template>
+              <template #status="{ record }">
+                <a-tag :color="record.status === 'active' ? 'green' : 'gray'">{{ record.status === 'active' ? '启用' : '停用' }}</a-tag>
+              </template>
+              <template #health="{ record }">
+                <div class="health-cell">
+                  <span class="health-score" :class="healthClass(record.health_score)">{{ scoreText(record.health_score) }}</span>
+                  <span class="health-bar">
+                    <span :class="healthClass(record.health_score)" :style="{ width: `${scoreValue(record.health_score)}%` }" />
+                  </span>
+                </div>
+              </template>
+              <template #active_incident_count="{ record }">
+                <a-badge :count="record.active_incident_count || 0" :dot="false" :max-count="99" />
+              </template>
+              <template #active_alert_count="{ record }">
+                <a-space v-if="record.active_alert_count">
+                  <a-badge :count="record.active_alert_count" :dot="false" :max-count="99" />
+                  <a-tag :color="record.highest_alert_severity?.color || 'red'">
+                    {{ record.highest_alert_severity?.name || record.highest_alert_severity?.code || '告警' }}
+                  </a-tag>
+                </a-space>
+                <span v-else>-</span>
+              </template>
+              <template #actions="{ record }">
+                <a-space>
+                  <a-button type="text" size="small" :disabled="pageUnauthorized" @click="openDetail(record.id)">详情</a-button>
+                  <a-button type="text" size="small" :disabled="pageUnauthorized" @click="openCredential(record)">告警接入</a-button>
+                  <a-button type="text" size="small" :disabled="pageUnauthorized" @click="openEdit(record)">编辑</a-button>
+                  <a-popconfirm content="删除业务系统只解除其自身关联，不会删除服务器或其他资源。确认删除？" @ok="removeBusinessSystem(record)">
+                    <a-button type="text" size="small" status="danger" :disabled="pageUnauthorized || record.is_builtin">删除</a-button>
+                  </a-popconfirm>
+                </a-space>
+              </template>
+            </a-table>
+          </PageState>
+        </a-col>
+      </a-row>
     </a-card>
+    <BusinessSystemFormDialog v-model:visible="formVisible" :record="editingRecord" @saved="handleSaved" />
+    <BusinessAlertCredentialDialog v-model:visible="credentialVisible" :record="credentialRecord" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue'
+import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
-import { IconEye, IconRefresh, IconSearch } from '@arco-design/web-vue/es/icon'
+import { IconPlus, IconRefresh, IconSearch } from '@arco-design/web-vue/es/icon'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
-import { fetchBusinessHealth, fetchBusinessSystems, type BusinessSystemItem } from '@/api/ops/businessSystem'
+import {
+  deleteBusinessSystem,
+  fetchBusinessHealth,
+  fetchBusinessSystems,
+  fetchBusinessSystemTreeSource,
+  type BusinessSystemItem,
+} from '@/api/ops/businessSystem'
+import { fetchDictionaryOptions } from '@/api/ops/systemSettings'
+import BusinessSystemFormDialog from './components/BusinessSystemFormDialog.vue'
+import BusinessAlertCredentialDialog from './components/BusinessAlertCredentialDialog.vue'
 
 const router = useRouter()
 const loading = ref(false)
@@ -111,10 +166,21 @@ const rows = ref<BusinessSystemItem[]>([])
 const errorMessage = ref('')
 const partialMessage = ref('')
 const pageUnauthorized = ref(false)
+const treeRows = ref<BusinessSystemItem[]>([])
+const protectionLevelOptions = ref<Array<{ label: string; value: string }>>([])
+const networkTypeOptions = ref<Array<{ label: string; value: string }>>([])
+const formVisible = ref(false)
+const editingRecord = ref<BusinessSystemItem>()
+const credentialVisible = ref(false)
+const credentialRecord = ref<BusinessSystemItem>()
+let healthRefreshTimer: ReturnType<typeof setInterval> | undefined
 
 const filters = reactive({
   keyword: '',
   status: undefined as string | undefined,
+  system_type: undefined as string | undefined,
+  protection_level: undefined as string | undefined,
+  network_type: undefined as string | undefined,
 })
 
 const pagination = reactive({
@@ -127,16 +193,60 @@ const pagination = reactive({
 
 const columns: TableColumnData[] = [
   { title: '编码', dataIndex: 'code', slotName: 'code', width: 130 },
-  { title: '名称', dataIndex: 'name', ellipsis: true, tooltip: true },
+  { title: '名称', dataIndex: 'name', slotName: 'name', ellipsis: true, tooltip: true },
   { title: '类型', dataIndex: 'system_type', width: 120 },
+  { title: '等保级别', dataIndex: 'protection_level', slotName: 'protection_level', width: 110 },
+  { title: '网络类型', dataIndex: 'network_type', slotName: 'network_type', width: 100 },
   { title: '状态', dataIndex: 'status', slotName: 'status', width: 100 },
   { title: '资源数', dataIndex: 'resource_count', width: 100 },
   { title: '健康分', dataIndex: 'health_score', slotName: 'health', width: 180 },
   { title: '活跃 Incident', dataIndex: 'active_incident_count', slotName: 'active_incident_count', width: 130 },
+  { title: '活动告警', dataIndex: 'active_alert_count', slotName: 'active_alert_count', width: 180 },
   { title: '描述', dataIndex: 'description', ellipsis: true, tooltip: true },
-  { title: '操作', dataIndex: 'actions', slotName: 'actions', fixed: 'right', width: 100 },
+  { title: '操作', dataIndex: 'actions', slotName: 'actions', fixed: 'right', width: 250 },
 ]
 
+const protectionLevelLabel = (value?: string) => protectionLevelOptions.value.find((item) => item.value === value)?.label || value || '-'
+const networkTypeLabel = (value?: string) => networkTypeOptions.value.find((item) => item.value === value)?.label || value || '-'
+const systemTypeOptions = computed(() =>
+  [...new Set(treeRows.value.map((item) => item.system_type).filter(Boolean))].map((value) => ({ label: value, value }))
+)
+
+const treeData = computed(() => {
+  const typeGroups = new Map<string, Map<string, Map<string, BusinessSystemItem[]>>>()
+  treeRows.value.forEach((item) => {
+    const protectionGroups = typeGroups.get(item.system_type) || new Map<string, Map<string, BusinessSystemItem[]>>()
+    typeGroups.set(item.system_type, protectionGroups)
+    const networkGroups = protectionGroups.get(item.protection_level) || new Map<string, BusinessSystemItem[]>()
+    protectionGroups.set(item.protection_level, networkGroups)
+    const systems = networkGroups.get(item.network_type) || []
+    systems.push(item)
+    networkGroups.set(item.network_type, systems)
+  })
+  return [...typeGroups.entries()].map(([systemType, protectionGroups], typeIndex) => ({
+    key: `type-${typeIndex}`,
+    title: systemType,
+    dimension: 'system_type',
+    value: systemType,
+    children: [...protectionGroups.entries()].map(([protectionLevel, networkGroups], protectionIndex) => ({
+      key: `type-${typeIndex}-protection-${protectionIndex}`,
+      title: protectionLevelLabel(protectionLevel),
+      dimension: 'protection_level',
+      value: protectionLevel,
+      system_type: systemType,
+      children: [...networkGroups.entries()].map(([networkType, systems], networkIndex) => ({
+        key: `type-${typeIndex}-protection-${protectionIndex}-network-${networkIndex}`,
+        title: networkTypeLabel(networkType),
+        dimension: 'network_type',
+        value: networkType,
+        system_type: systemType,
+        protection_level: protectionLevel,
+        children: systems.map((system) => ({ key: `system-${system.id}`, title: system.name, system_id: system.id })),
+      })),
+    })),
+  }))
+})
+
 const healthyCount = computed(() => rows.value.filter((item) => scoreValue(item.health_score) >= 85).length)
 const affectedCount = computed(() => rows.value.filter((item) => scoreValue(item.health_score) < 85).length)
 const activeIncidentTotal = computed(() => rows.value.reduce((sum, item) => sum + (item.active_incident_count || 0), 0))
@@ -187,6 +297,8 @@ const hydrateHealth = async (items: BusinessSystemItem[]) => {
       health_level: health.health.level,
       resource_count: health.signal_counts.resources,
       active_incident_count: health.signal_counts.active_incidents,
+      active_alert_count: health.alert_summary.active_count,
+      highest_alert_severity: health.alert_summary.highest_severity,
     }
   })
 }
@@ -196,15 +308,22 @@ const fetchData = async () => {
   errorMessage.value = ''
   pageUnauthorized.value = false
   try {
-    const response = await fetchBusinessSystems({
-      page: pagination.current,
-      size: pagination.pageSize,
-      keyword: filters.keyword || undefined,
-      status: filters.status,
-    })
+    const [response, treeResponse] = await Promise.all([
+      fetchBusinessSystems({
+        page: pagination.current,
+        size: pagination.pageSize,
+        keyword: filters.keyword || undefined,
+        status: filters.status,
+        system_type: filters.system_type,
+        protection_level: filters.protection_level,
+        network_type: filters.network_type,
+      }),
+      fetchBusinessSystemTreeSource(filters.status),
+    ])
     const list = response.details?.data || []
     rows.value = await hydrateHealth(list)
     pagination.total = response.details?.total || 0
+    treeRows.value = treeResponse.details?.list || []
   } catch (error) {
     console.error('获取业务系统失败:', error)
     setLoadError(error, '获取业务系统失败')
@@ -222,6 +341,9 @@ const handleSearch = () => {
 const resetFilters = () => {
   filters.keyword = ''
   filters.status = undefined
+  filters.system_type = undefined
+  filters.protection_level = undefined
+  filters.network_type = undefined
   handleSearch()
 }
 
@@ -240,7 +362,72 @@ const openDetail = (id: number) => {
   router.push({ path: '/business-system/detail', query: { id } })
 }
 
-onMounted(fetchData)
+const handleTreeSelect = (_selectedKeys: Array<string | number>, event: any) => {
+  const node = event?.node
+  if (!node) return
+  if (node.system_id) {
+    openDetail(Number(node.system_id))
+    return
+  }
+  filters.system_type = node.system_type || (node.dimension === 'system_type' ? node.value : undefined)
+  filters.protection_level = node.protection_level || (node.dimension === 'protection_level' ? node.value : undefined)
+  filters.network_type = node.dimension === 'network_type' ? node.value : undefined
+  handleSearch()
+}
+
+const openCreate = () => {
+  editingRecord.value = undefined
+  formVisible.value = true
+}
+
+const openEdit = (record: BusinessSystemItem) => {
+  editingRecord.value = record
+  formVisible.value = true
+}
+
+const openCredential = (record: BusinessSystemItem) => {
+  credentialRecord.value = record
+  credentialVisible.value = true
+}
+
+const handleSaved = async () => {
+  formVisible.value = false
+  await fetchData()
+}
+
+const removeBusinessSystem = async (record: BusinessSystemItem) => {
+  try {
+    await deleteBusinessSystem(record.id)
+    Message.success('业务系统已删除')
+    if (rows.value.length === 1 && pagination.current > 1) pagination.current -= 1
+    await fetchData()
+  } catch (error) {
+    console.error('删除业务系统失败:', error)
+    Message.error((error as any)?.message || '删除业务系统失败')
+  }
+}
+
+onMounted(async () => {
+  try {
+    const [protectionLevels, networkTypes] = await Promise.all([
+      fetchDictionaryOptions('business.protection_level'),
+      fetchDictionaryOptions('business.network_type'),
+    ])
+    protectionLevelOptions.value = protectionLevels
+    networkTypeOptions.value = networkTypes
+  } catch (error) {
+    console.error('加载业务系统字典失败:', error)
+    Message.error('加载业务系统字典失败')
+  }
+  await fetchData()
+  healthRefreshTimer = setInterval(async () => {
+    if (!loading.value && rows.value.length) rows.value = await hydrateHealth(rows.value)
+  }, 10_000)
+})
+
+onBeforeUnmount(() => {
+  if (healthRefreshTimer) clearInterval(healthRefreshTimer)
+})
 </script>
 
 <script lang="ts">
@@ -291,6 +478,24 @@ export default {
   margin-bottom: 16px;
 }
 
+.tree-panel {
+  min-height: 320px;
+  padding: 12px;
+  border: 1px solid var(--color-border-2);
+  border-radius: 6px;
+}
+
+.tree-title {
+  margin-bottom: 10px;
+  color: var(--color-text-1);
+  font-weight: 600;
+}
+
+.business-name.alert-active {
+  color: rgb(var(--red-6));
+  font-weight: 600;
+}
+
 .health-cell {
   display: flex;
   align-items: center;
@@ -355,5 +560,10 @@ export default {
   :deep(.arco-card-extra) {
     width: 100%;
   }
+
+  .tree-panel {
+    min-height: auto;
+    margin-bottom: 16px;
+  }
 }
 </style>
diff --git a/src/views/ops/pages/business-topology/index.vue b/src/views/ops/pages/business-topology/index.vue
index 0ea8009..7720312 100644
--- a/src/views/ops/pages/business-topology/index.vue
+++ b/src/views/ops/pages/business-topology/index.vue
@@ -8,6 +8,9 @@
             刷新
           </a-button>
           <a-button :disabled="pageUnauthorized || !selectedBusiness" @click="handleResetLayout">重置布局</a-button>
+          <a-button type="primary" :disabled="pageUnauthorized || !topology?.topology_id" @click="openTopologyEditor">
+            编辑画布
+          </a-button>
         </a-space>
       </template>
     </a-page-header>
@@ -103,16 +106,21 @@
             <template #node-businessTopology="{ data }">
               <div class="flow-node" :class="`flow-node-${data.kind}`">
                 <div class="flow-node-header">
-                  <span class="flow-node-dot" :style="{ backgroundColor: statusColor(data.status) }"></span>
+                  <span class="flow-node-dot" :style="{ backgroundColor: data.alertColor || statusColor(data.status) }"></span>
                   <span class="flow-node-title">{{ data.label || '-' }}</span>
                 </div>
                 <div class="flow-node-meta">
                   <template v-if="data.kind === 'business'">
                     <span>{{ typeof data.healthScore === 'number' ? `健康分 ${healthScoreText(data.healthScore)}` : '业务系统' }}</span>
+                    <span v-if="data.activeAlertCount">活动告警 {{ data.activeAlertCount }}</span>
                   </template>
                   <template v-else>
                     <span>{{ data.resourceType || '资源' }}</span>
+                    <span v-if="data.activeAlertCount">活动告警 {{ data.activeAlertCount }}</span>
                     <span v-if="data.resourceUID">{{ data.resourceUID }}</span>
+                    <span v-if="data.manufacturerCode || data.model">
+                      {{ [data.manufacturerCode, data.model].filter(Boolean).join(' / ') }}
+                    </span>
                   </template>
                 </div>
               </div>
@@ -137,12 +145,21 @@
           <a-descriptions-item v-if="selectedItem.type === 'node' && selectedItem.data.kind === 'business'" label="健康分">
             {{ healthScoreText(selectedItem.data.healthScore) }}
           </a-descriptions-item>
+          <a-descriptions-item v-if="selectedItem.type === 'node' && selectedItem.data.activeAlertCount" label="活动告警">
+            {{ selectedItem.data.activeAlertCount }}
+          </a-descriptions-item>
           <a-descriptions-item v-if="selectedItem.type === 'node' && selectedItem.data.kind === 'resource' && selectedItem.data.resourceUID" label="资源 UID">
             <a-typography-text copyable>{{ selectedItem.data.resourceUID }}</a-typography-text>
           </a-descriptions-item>
           <a-descriptions-item v-if="selectedItem.type === 'node' && selectedItem.data.kind === 'resource' && selectedItem.data.resourceType" label="资源类型">
             {{ selectedItem.data.resourceType }}
           </a-descriptions-item>
+          <a-descriptions-item
+            v-if="selectedItem.type === 'node' && selectedItem.data.kind === 'resource' && (selectedItem.data.manufacturerCode || selectedItem.data.model)"
+            label="厂商 / 型号"
+          >
+            {{ [selectedItem.data.manufacturerCode, selectedItem.data.model].filter(Boolean).join(' / ') }}
+          </a-descriptions-item>
           <a-descriptions-item v-if="selectedItem.type === 'node' && selectedItem.data.kind === 'resource' && selectedItem.data.resourceUID" label="操作">
             <a-button
               type="secondary"
@@ -288,7 +305,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { VueFlow, useVueFlow } from '@vue-flow/core'
 import { Background } from '@vue-flow/background'
@@ -307,6 +324,7 @@ import {
   fetchBusinessTimeline,
   fetchBusinessTopology,
   type BusinessHealth,
+  type BusinessResourceDeleteConflict,
   type BusinessResourceMember,
   type BusinessResourceMemberPayload,
   type BusinessSystemItem,
@@ -353,6 +371,7 @@ const errorMessage = ref('')
 const partialMessage = ref('')
 const pageUnauthorized = ref(false)
 let selectionRequestSerial = 0
+let alertRefreshTimer: ReturnType<typeof setInterval> | undefined
 
 const filters = reactive({
 	health: 'all' as BusinessTopologyHealthFilter,
@@ -605,17 +624,54 @@ const confirmUnbindResource = (resourceUID?: string) => {
     hideCancel: false,
     okText: '解除绑定',
     cancelText: '取消',
-    onOk: async () => {
-      try {
-        await deleteBusinessMember(businessId, member.id)
-        Message.success('资源绑定已解除')
-        selectedItem.value = null
-        await fetchSelectedBusinessData(businessId)
-      } catch (error) {
-        console.error('解除资源绑定失败:', error)
-        Message.error('解除资源绑定失败')
-      }
-    },
+    onOk: () => unbindResource(businessId, member),
+  })
+}
+
+const unbindResource = async (
+  businessId: number,
+  member: BusinessResourceMember,
+  options?: { unlinkServiceMonitors: boolean; referenceVersion: number }
+) => {
+  try {
+    await deleteBusinessMember(businessId, member.id, options)
+    Message.success(options ? '服务监控关联和资源绑定已解除' : '资源绑定已解除')
+    selectedItem.value = null
+    await fetchSelectedBusinessData(businessId)
+  } catch (error: any) {
+    const details = error?.response?.data?.details as BusinessResourceDeleteConflict | undefined
+    if (!options && error?.response?.status === 409 && details?.conflict_code === 'BUSINESS_RESOURCE_SERVICE_MONITOR_REFERENCED') {
+      confirmResourceMonitorUnlink(businessId, member, details)
+      return
+    }
+    if (details?.conflict_code === 'BUSINESS_RESOURCE_REFERENCE_CHANGED') {
+      Message.warning('该服务器的服务监控关联已经变化，请查看最新关系后重新操作')
+      await fetchSelectedBusinessData(businessId)
+      return
+    }
+    console.error('解除资源绑定失败:', error)
+    Message.error(error?.response?.data?.message || error?.message || '解除资源绑定失败')
+  }
+}
+
+const confirmResourceMonitorUnlink = (
+  businessId: number,
+  member: BusinessResourceMember,
+  details: BusinessResourceDeleteConflict
+) => {
+  const serviceNames = details.service_monitors
+    .map((item) => `${item.service_name}（${item.process_name}:${item.port}）`)
+    .join('、')
+  Modal.warning({
+    title: '该服务器仍被服务可用性使用',
+    content: `当前业务关联了以下服务监控项：${serviceNames || '未知服务'}。继续后只解除当前业务中的服务监控关联和资源绑定，不删除服务器及其监控配置。`,
+    hideCancel: false,
+    okText: '解除关联并移除',
+    cancelText: '取消',
+    onOk: () => unbindResource(businessId, member, {
+      unlinkServiceMonitors: true,
+      referenceVersion: details.reference_version,
+    }),
   })
 }
 
@@ -646,7 +702,9 @@ const hydrateHealth = async (items: BusinessSystemItem[]) => {
         health_score: health.health.score,
         health_level: health.health.level,
         resource_count: health.signal_counts.resources,
-        active_incident_count: health.signal_counts.active_incidents,
+      active_incident_count: health.signal_counts.active_incidents,
+      active_alert_count: health.alert_summary.active_count,
+      highest_alert_severity: health.alert_summary.highest_severity,
       }
     })
   } finally {
@@ -686,6 +744,20 @@ const fetchData = async () => {
   }
 }
 
+const refreshAlertState = async () => {
+  if (loading.value || selectionLoading.value || healthLoading.value || !businessSystems.value.length) return
+  try {
+    businessSystems.value = await hydrateHealth(businessSystems.value)
+    const id = selectedBusinessId.value
+    if (!id) return
+    const [healthResponse, topologyResponse] = await Promise.all([fetchBusinessHealth(id), fetchBusinessTopology(id)])
+    selectedHealth.value = healthResponse.details || null
+    topology.value = topologyResponse.details || null
+  } catch (error) {
+    console.error('刷新业务拓扑告警状态失败:', error)
+  }
+}
+
 const resolveInitialBusinessId = () => {
   const requestedId = queryBusinessId.value
 
@@ -779,6 +851,11 @@ const handleResetLayout = () => {
   fitView({ padding: 0.2, duration: 300 })
 }
 
+const openTopologyEditor = () => {
+  if (!topology.value?.topology_id) return
+  router.push({ path: '/netarch/topo', query: { id: String(topology.value.topology_id) } })
+}
+
 watch(queryBusinessId, (id) => {
   if (!id || id === selectedBusinessId.value || !businessSystems.value.some((item) => item.id === id)) {
     return
@@ -796,7 +873,14 @@ watch([selectedBusinessId, topology, selectedHealth, () => filters.mode], async
   fitView({ padding: 0.2, duration: 300 })
 })
 
-onMounted(fetchData)
+onMounted(async () => {
+  await fetchData()
+  alertRefreshTimer = setInterval(refreshAlertState, 10_000)
+})
+
+onBeforeUnmount(() => {
+  if (alertRefreshTimer) clearInterval(alertRefreshTimer)
+})
 </script>
 
 <script lang="ts">
diff --git a/src/views/ops/pages/business-topology/transform.ts b/src/views/ops/pages/business-topology/transform.ts
index f995a65..bfca4db 100644
--- a/src/views/ops/pages/business-topology/transform.ts
+++ b/src/views/ops/pages/business-topology/transform.ts
@@ -5,6 +5,7 @@ import type {
   BusinessTopology,
   BusinessTopologyEdge,
   BusinessTopologyNode,
+  BusinessTopologyResource,
 } from '@/api/ops/businessSystem'
 import type {
   BusinessTopologyFlowEdge,
@@ -90,6 +91,9 @@ export function buildBusinessTopologyGraph(input: {
   const dependencies = topology.dependencies ?? []
   const topologyNodes = topology.nodes ?? []
   const topologyLinks = topology.links ?? []
+  const topologyResources = new Map((topology.resources ?? []).map((resource) => [resource.resource_uid, resource]))
+  const alertSummary = health?.alert_summary || topology.alert_summary
+  const resourceAlerts = new Map((alertSummary?.resources ?? []).map((item) => [item.resource_uid, item]))
   const nodes: BusinessTopologyFlowNode[] = []
   const edges: BusinessTopologyFlowEdge[] = []
   const businessNodeIds = new Set<string>()
@@ -157,7 +161,12 @@ export function buildBusinessTopologyGraph(input: {
       }
 
       resourceFlowNodeIds.add(id)
-      const node = createResourceNode(topologyNode, index)
+      const node = createResourceNode(
+        topologyNode,
+        index,
+        topologyResources.get(topologyNode.resource_uid),
+        resourceAlerts.get(topologyNode.resource_uid)
+      )
       nodes.push(node)
 
       if (keyword && nodeMatchesKeyword(node, keyword)) {
@@ -166,6 +175,9 @@ export function buildBusinessTopologyGraph(input: {
     })
 
     topologyNodes.forEach((topologyNode) => {
+      if (topologyNode.ref_type && topologyNode.ref_type !== 'resource') {
+        return
+      }
       const target = resourceNodeIds.get(resourceKey(topologyNode))
 
       if (!target) {
@@ -226,6 +238,8 @@ function normalizedHealthLevel(item: BusinessSystemItem): 'healthy' | 'degraded'
 
 function createCurrentBusinessNode(currentBusiness: BusinessSystemItem, health?: BusinessHealth | null): BusinessTopologyFlowNode {
   const healthScore = health?.health.score ?? currentBusiness.health_score
+  const alertSummary = health?.alert_summary
+  const highestSeverity = alertSummary?.highest_severity || currentBusiness.highest_alert_severity
   const label = currentBusiness.name || currentBusiness.code || `业务系统 ${currentBusiness.id}`
 
   return {
@@ -235,8 +249,11 @@ function createCurrentBusinessNode(currentBusiness: BusinessSystemItem, health?:
     data: {
       kind: 'business',
       label,
-      status: currentBusiness.status,
+      status: highestSeverity?.code || currentBusiness.status,
       ...(typeof healthScore === 'number' ? { healthScore } : {}),
+      ...(alertSummary?.active_count || currentBusiness.active_alert_count
+        ? { activeAlertCount: alertSummary?.active_count || currentBusiness.active_alert_count, alertColor: highestSeverity?.color }
+        : {}),
       businessSystem: currentBusiness,
     },
   }
@@ -265,22 +282,32 @@ function createDependencyBusinessNode(
   }
 }
 
-function createResourceNode(topologyNode: BusinessTopologyNode, index: number): BusinessTopologyFlowNode {
+function createResourceNode(
+  topologyNode: BusinessTopologyNode,
+  index: number,
+  resource?: BusinessTopologyResource,
+  alertSummary?: BusinessHealth['alert_summary']['resources'][number]
+): BusinessTopologyFlowNode {
   const key = resourceKey(topologyNode)
 
   return {
     id: resourceNodeId(key),
     type: 'businessTopology',
     position: {
-      x: (index % 4) * 240 - 360,
-      y: 260 + Math.floor(index / 4) * 140,
+      x: typeof topologyNode.position_x === 'number' ? topologyNode.position_x : (index % 4) * 240 - 360,
+      y: typeof topologyNode.position_y === 'number' ? topologyNode.position_y : 260 + Math.floor(index / 4) * 140,
     },
     data: {
       kind: 'resource',
       label: topologyNode.label || topologyNode.resource_uid || topologyNode.node_id,
-      status: topologyNode.status,
+      status: alertSummary?.highest_severity?.code || topologyNode.status,
+      ...(alertSummary?.active_count
+        ? { activeAlertCount: alertSummary.active_count, alertColor: alertSummary.highest_severity?.color }
+        : {}),
       ...(topologyNode.resource_uid ? { resourceUID: topologyNode.resource_uid } : {}),
       ...(topologyNode.type ? { resourceType: topologyNode.type } : {}),
+      ...(resource?.manufacturer_code ? { manufacturerCode: resource.manufacturer_code } : {}),
+      ...(resource?.model ? { model: resource.model } : {}),
       topologyNode,
     },
   }
diff --git a/src/views/ops/pages/business-topology/types.ts b/src/views/ops/pages/business-topology/types.ts
index dd0e22a..9d32708 100644
--- a/src/views/ops/pages/business-topology/types.ts
+++ b/src/views/ops/pages/business-topology/types.ts
@@ -14,6 +14,8 @@ export interface BusinessTopologyBusinessNodeData {
   label: string
   status: string
   healthScore?: number
+  activeAlertCount?: number
+  alertColor?: string
   businessSystem?: BusinessSystemItem
   dependency?: BusinessDependency
   resourceUID?: never
@@ -28,7 +30,11 @@ export interface BusinessTopologyResourceNodeData {
   resourceUID?: string
   resourceType?: string
   topologyNode?: BusinessTopologyNode
+  manufacturerCode?: string
+  model?: string
   healthScore?: never
+  activeAlertCount?: number
+  alertColor?: string
   businessSystem?: never
   dependency?: never
 }
diff --git a/src/views/ops/pages/collection/components/BindingFormModal.vue b/src/views/ops/pages/collection/components/BindingFormModal.vue
index 4716c61..4798b56 100644
--- a/src/views/ops/pages/collection/components/BindingFormModal.vue
+++ b/src/views/ops/pages/collection/components/BindingFormModal.vue
@@ -4,7 +4,7 @@
       <a-alert type="info" class="mb-16">每条绑定唯一确定设备、节点、凭证、模板、协议、目标和采集间隔。绑定区域节点后，立即采集也只由该节点执行。</a-alert>
       <a-row :gutter="16">
         <a-col :span="12"><a-form-item label="绑定名称" required><a-input v-model="form.name" /></a-form-item></a-col>
-        <a-col :span="12"><a-form-item label="设备" required><a-select v-model="form.resource_uid" allow-search :disabled="Boolean(fixedResourceUid)" placeholder="选择统一设备"><a-option v-for="item in resources" :key="item.value" :value="item.value">{{ item.label }}</a-option></a-select></a-form-item></a-col>
+        <a-col :span="12"><a-form-item label="设备" required><a-select v-model="form.resource_uid" allow-search :disabled="Boolean(fixedResourceUid)" placeholder="选择统一设备" @change="onResourceChange"><a-option v-for="item in resources" :key="item.value" :value="item.value">{{ item.label }}</a-option></a-select></a-form-item></a-col>
         <a-col :span="12"><a-form-item label="采集节点" required><a-select v-model="form.collector_node_id"><a-option v-for="item in nodes" :key="item.id" :value="item.id">{{ item.name }}（{{ item.node_type === 'center' ? '中心' : item.region_code }}）</a-option></a-select></a-form-item></a-col>
         <a-col :span="12"><a-form-item label="厂商采集模板" required><a-select v-model="form.template_id" allow-search @change="onTemplateChange"><a-option v-for="item in templates" :key="item.id" :value="item.id">{{ item.name }} / v{{ item.version }}</a-option></a-select></a-form-item></a-col>
         <a-col :span="12"><a-form-item label="凭证" required><a-select v-model="form.credential_id" allow-search><a-option v-for="item in compatibleCredentials" :key="item.id" :value="item.id">{{ item.name }}（{{ item.type }}）</a-option></a-select></a-form-item></a-col>
@@ -23,6 +23,7 @@ import { computed, reactive, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { fetchControlResourceOptions, type OptionItem } from '@/api/ops/dcControl'
 import { createCollectionBinding, fetchCollectionTemplates, fetchCollectorNodes, fetchCredentials, updateCollectionBinding, type CollectionBinding, type CollectionBindingInput, type CollectionCredential, type CollectionTemplate, type CollectorNode } from '@/api/ops/collection'
+import { collectionTemplateMatchesModel } from '@/utils/collectionTemplate'
 
 const props = defineProps<{ visible: boolean; record?: CollectionBinding | null; fixedResourceUid?: string; defaultTarget?: string }>()
 const emit = defineEmits<{ (event: 'update:visible', value: boolean): void; (event: 'success'): void }>()
@@ -30,7 +31,15 @@ const saving = ref(false)
 const resources = ref<OptionItem[]>([])
 const nodes = ref<CollectorNode[]>([])
 const credentials = ref<CollectionCredential[]>([])
-const templates = ref<CollectionTemplate[]>([])
+const allTemplates = ref<CollectionTemplate[]>([])
+const selectedResource = computed(() => resources.value.find((item) => item.value === form.resource_uid))
+const templates = computed(() => allTemplates.value.filter((item) => {
+  const resource = selectedResource.value
+  if (!resource) return false
+  return item.resource_category === resource.resource_category
+    && (item.manufacturer_code === 'GENERIC' || item.manufacturer_code === resource.manufacturer_code)
+    && collectionTemplateMatchesModel(item, resource.model)
+}))
 const defaultForm = (): CollectionBindingInput => ({ name: '', resource_uid: '', collector_node_id: 0, credential_id: 0, template_id: 0, protocol: '', target: '', port: 161, interval_seconds: 60, retry_policy: '{"max_attempts":2}', enabled: true })
 const form = reactive<CollectionBindingInput>(defaultForm())
 const editing = computed(() => Boolean(props.record?.id))
@@ -47,12 +56,13 @@ const loadOptions = async () => {
   ])
   resources.value = resourceRes.details?.list || []
   if (props.fixedResourceUid && !resources.value.some((item) => item.value === props.fixedResourceUid)) resources.value.unshift({ label: props.fixedResourceUid, value: props.fixedResourceUid })
-  nodes.value = nodeRes.details?.data || []; credentials.value = credentialRes.details?.data || []; templates.value = templateRes.details?.data || []
+  nodes.value = nodeRes.details?.data || []; credentials.value = credentialRes.details?.data || []; allTemplates.value = templateRes.details?.data || []
 }
 const reset = () => {
   Object.assign(form, defaultForm(), { resource_uid: props.fixedResourceUid || '', target: props.defaultTarget || '' })
   if (props.record) Object.assign(form, { name: props.record.name, resource_uid: props.record.resource_uid, collector_node_id: props.record.collector_node_id, credential_id: props.record.credential_id, template_id: props.record.template_id, protocol: props.record.protocol, target: props.record.target, port: props.record.port, interval_seconds: props.record.interval_seconds, retry_policy: props.record.retry_policy, enabled: props.record.enabled })
 }
+const onResourceChange = () => { form.template_id = 0; form.protocol = ''; form.credential_id = 0 }
 const onTemplateChange = () => { const selected = templates.value.find((item) => item.id === form.template_id); if (!selected) return; form.protocol = selected.protocol; form.port = defaultPort(selected.protocol); if (!compatibleCredentials.value.some((item) => item.id === form.credential_id)) form.credential_id = 0 }
 const close = () => emit('update:visible', false)
 const save = async () => {
@@ -64,7 +74,7 @@ const save = async () => {
     Message.success('采集绑定已保存'); close(); emit('success')
   } finally { saving.value = false }
 }
-watch(() => props.visible, async (value) => { if (!value) return; reset(); await loadOptions() })
+watch(() => props.visible, async (value) => { if (!value) return; await loadOptions(); reset() })
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/ops/pages/collection/nodes/index.vue b/src/views/ops/pages/collection/nodes/index.vue
index 60758db..2666e79 100644
--- a/src/views/ops/pages/collection/nodes/index.vue
+++ b/src/views/ops/pages/collection/nodes/index.vue
@@ -1,51 +1,151 @@
 <template>
   <div class="page-container">
     <a-card title="采集节点管理" :bordered="false">
-      <template #extra><a-space><a-input v-model="keyword" allow-clear placeholder="节点名称、编码或区域" @press-enter="loadData" /><a-button @click="loadData">查询</a-button><a-button type="primary" @click="openCreate">新增区域节点</a-button></a-space></template>
-      <a-alert type="info" class="mb-16">中心直连与区域采集使用同一种节点。区域节点由现场人员在 Linux 上安装，设备选择区域节点后，中心不会绕过该节点直连设备。</a-alert>
+      <template #extra>
+        <a-space>
+          <a-input v-model="keyword" allow-clear placeholder="节点名称、编码或区域" @press-enter="loadData" />
+          <a-button @click="loadData">查询</a-button>
+          <a-button type="primary" @click="openCreate">新增区域节点</a-button>
+        </a-space>
+      </template>
+      <a-alert type="info" class="mb-16">
+        中心直连与区域采集使用同一种节点。区域节点由现场人员在 Linux 上安装，设备选择区域节点后，中心不会绕过该节点直连设备。
+      </a-alert>
       <a-table row-key="id" :columns="columns" :data="rows" :loading="loading" :pagination="pagination" @page-change="onPageChange">
         <template #type="{ record }">{{ record.node_type === 'center' ? '中心节点' : '区域节点' }}</template>
-        <template #status="{ record }"><a-tag :color="statusColor(record.status)">{{ statusLabel(record.status) }}</a-tag></template>
-        <template #heartbeat="{ record }">{{ record.last_heartbeat_at ? new Date(record.last_heartbeat_at).toLocaleString() : '尚未连接' }}</template>
-        <template #actions="{ record }"><a-space><a-button type="text" size="small" @click="openEdit(record)">编辑</a-button><a-button type="text" size="small" @click="rotateToken(record)">生成安装令牌</a-button><a-popconfirm v-if="record.code !== 'CENTER'" content="确认删除该节点？" @ok="remove(record)"><a-button type="text" size="small" status="danger">删除</a-button></a-popconfirm></a-space></template>
+        <template #status="{ record }">
+          <a-tag :color="statusColor(record.status)">{{ statusLabel(record.status) }}</a-tag>
+        </template>
+        <template #heartbeat="{ record }">
+          {{ record.last_heartbeat_at ? new Date(record.last_heartbeat_at).toLocaleString() : '尚未连接' }}
+        </template>
+        <template #actions="{ record }">
+          <a-space>
+            <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
+            <a-button type="text" size="small" @click="rotateToken(record)">生成安装令牌</a-button>
+            <a-popconfirm v-if="record.code !== 'CENTER'" content="确认删除该节点？" @ok="remove(record)">
+              <a-button type="text" size="small" status="danger">删除</a-button>
+            </a-popconfirm>
+          </a-space>
+        </template>
       </a-table>
     </a-card>
 
-	<a-card title="主机 Agent 关联" :bordered="false" class="mt-16">
-	  <template #extra><a-space><a-input v-model="agentKeyword" allow-clear placeholder="Agent、主机名或设备" @press-enter="loadAgents" /><a-select v-model="agentStatus" allow-clear placeholder="关联状态" style="width: 150px"><a-option value="pending_confirmation">待确认</a-option><a-option value="confirmed">已确认</a-option></a-select><a-button @click="loadAgents">查询</a-button></a-space></template>
-	  <a-alert type="info" class="mb-16">Agent 只能关联到系统中已有的服务器。身份冲突时进入待确认，不会自动创建重复服务器。</a-alert>
-	  <a-table row-key="id" :columns="agentColumns" :data="agents" :loading="agentLoading" :pagination="agentPagination" @page-change="onAgentPageChange">
-		<template #agentStatus="{ record }"><a-tag :color="record.status === 'confirmed' ? 'green' : 'orange'">{{ record.status === 'confirmed' ? '已确认' : '待确认' }}</a-tag></template>
-		<template #agentSeen="{ record }">{{ record.last_seen_at ? new Date(record.last_seen_at).toLocaleString() : '-' }}</template>
-		<template #agentActions="{ record }"><a-button v-if="record.status !== 'confirmed'" type="text" size="small" @click="openAgentConfirm(record)">确认关联</a-button></template>
-	  </a-table>
-	</a-card>
+    <a-card title="主机 Agent 关联" :bordered="false" class="mt-16">
+      <template #extra>
+        <a-space>
+          <a-input v-model="agentKeyword" allow-clear placeholder="Agent、主机名或设备" @press-enter="loadAgents" />
+          <a-select v-model="agentStatus" allow-clear placeholder="关联状态" style="width: 150px">
+            <a-option value="pending_confirmation">待确认</a-option>
+            <a-option value="confirmed">已确认</a-option>
+          </a-select>
+          <a-button @click="loadAgents">查询</a-button>
+        </a-space>
+      </template>
+      <a-alert type="info" class="mb-16">Agent 只能关联到系统中已有的服务器。身份冲突时进入待确认，不会自动创建重复服务器。</a-alert>
+      <a-table
+        row-key="id"
+        :columns="agentColumns"
+        :data="agents"
+        :loading="agentLoading"
+        :pagination="agentPagination"
+        @page-change="onAgentPageChange"
+      >
+        <template #agentStatus="{ record }">
+          <a-tag :color="record.status === 'confirmed' ? 'green' : 'orange'">
+            {{ record.status === 'confirmed' ? '已确认' : '待确认' }}
+          </a-tag>
+        </template>
+        <template #agentSeen="{ record }">{{ record.last_seen_at ? new Date(record.last_seen_at).toLocaleString() : '-' }}</template>
+        <template #agentActions="{ record }">
+          <a-button v-if="record.status !== 'confirmed'" type="text" size="small" @click="openAgentConfirm(record)">确认关联</a-button>
+        </template>
+      </a-table>
+    </a-card>
 
-    <a-modal v-model:visible="visible" :title="editingId ? '编辑采集节点' : '新增区域节点'" width="620px" :ok-loading="saving" @ok="save">
+    <a-modal v-model:visible="visible" :title="editingId ? '编辑采集节点' : '新增区域节点'" width="720px" :ok-loading="saving" @ok="save">
       <a-form :model="form" layout="vertical">
         <a-row :gutter="16">
-          <a-col :span="12"><a-form-item label="节点编码" required><a-input v-model="form.code" :disabled="form.code === 'CENTER'" /></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="节点名称" required><a-input v-model="form.name" /></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="节点类型" required><a-select v-model="form.node_type" :disabled="form.code === 'CENTER'"><a-option value="center">中心节点</a-option><a-option value="regional">区域节点</a-option></a-select></a-form-item></a-col>
-          <a-col :span="12"><a-form-item label="区域编码" :required="form.node_type === 'regional'"><a-input v-model="form.region_code" placeholder="如 NORTH-HOSPITAL" /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="节点能力（JSON 数组）"><a-textarea v-model="form.capabilities" :rows="3" placeholder='["icmp","snmp","ssh","http_api"]' /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="说明"><a-textarea v-model="form.description" :rows="2" /></a-form-item></a-col>
-          <a-col :span="24"><a-form-item label="启用"><a-switch v-model="form.enabled" /></a-form-item></a-col>
+          <a-col :span="12">
+            <a-form-item label="节点编码" required><a-input v-model="form.code" :disabled="form.code === 'CENTER'" /></a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="节点名称" required><a-input v-model="form.name" /></a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="节点类型" required>
+              <a-select v-model="form.node_type" :disabled="form.code === 'CENTER'">
+                <a-option value="center">中心节点</a-option>
+                <a-option value="regional">区域节点</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="区域编码" :required="form.node_type === 'regional'">
+              <a-input v-model="form.region_code" placeholder="如 NORTH-HOSPITAL" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <section class="capability-section">
+              <div class="capability-section-header">
+                <div>
+                  <div class="capability-title">节点能力</div>
+                  <div class="capability-description">选择该节点可承担的采集任务。</div>
+                </div>
+                <span class="capability-count">已选 {{ selectedCapabilities.length }} 项</span>
+              </div>
+              <div class="capability-groups">
+                <section v-for="group in capabilityGroups" :key="group.key" class="capability-card">
+                  <div class="capability-card-title">
+                    <span class="capability-card-dot"></span>
+                    {{ group.label }}
+                  </div>
+                  <div class="capability-items">
+                    <button
+                      v-for="item in group.items"
+                      :key="item.value"
+                      type="button"
+                      class="capability-item"
+                      :class="{ selected: isCapabilitySelected(item.value) }"
+                      :aria-pressed="isCapabilitySelected(item.value)"
+                      @click="toggleCapability(item.value)"
+                    >
+                      <span class="capability-check" aria-hidden="true"></span>
+                      <span>{{ item.label }}</span>
+                    </button>
+                  </div>
+                </section>
+              </div>
+              <a-alert type="info" class="capability-hint">节点安装上线后，系统会以 Agent 实际上报的能力为准。</a-alert>
+            </section>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="说明"><a-textarea v-model="form.description" :rows="2" /></a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="启用"><a-switch v-model="form.enabled" /></a-form-item>
+          </a-col>
         </a-row>
       </a-form>
     </a-modal>
 
     <a-modal v-model:visible="tokenVisible" title="一次性安装令牌" :footer="false" width="620px">
       <a-alert type="warning" class="mb-16">令牌只显示本次，30 分钟内有效。请通过安全渠道交给现场部署人员。</a-alert>
-      <a-input :model-value="installationToken" readonly><template #append><a-button @click="copyToken">复制</a-button></template></a-input>
+      <a-input :model-value="installationToken" readonly>
+        <template #append><a-button @click="copyToken">复制</a-button></template>
+      </a-input>
     </a-modal>
 
-	<a-modal v-model:visible="agentConfirmVisible" title="确认主机 Agent 关联" :ok-loading="agentConfirming" @ok="confirmAgent">
-	  <a-form layout="vertical">
-		<a-form-item label="Agent"><a-input :model-value="confirmingAgent?.agent_id" disabled /></a-form-item>
-		<a-form-item label="关联到已有服务器" required><a-select v-model="confirmResourceUid" allow-search placeholder="请选择服务器"><a-option v-for="item in resourceOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option></a-select></a-form-item>
-	  </a-form>
-	</a-modal>
+    <a-modal v-model:visible="agentConfirmVisible" title="确认主机 Agent 关联" :ok-loading="agentConfirming" @ok="confirmAgent">
+      <a-form layout="vertical">
+        <a-form-item label="Agent"><a-input :model-value="confirmingAgent?.agent_id" disabled /></a-form-item>
+        <a-form-item label="关联到已有服务器" required>
+          <a-select v-model="confirmResourceUid" allow-search placeholder="请选择服务器">
+            <a-option v-for="item in resourceOptions" :key="item.value" :value="item.value">{{ item.label }}</a-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </div>
 </template>
 
@@ -53,7 +153,18 @@
 import { onMounted, reactive, ref } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { TableColumnData } from '@arco-design/web-vue'
-import { confirmHostAgentRegistration, createCollectorNode, deleteCollectorNode, fetchCollectorNodes, fetchHostAgentRegistrations, rotateCollectorNodeToken, updateCollectorNode, type CollectorNode, type CollectorNodeInput, type HostAgentRegistration } from '@/api/ops/collection'
+import {
+  confirmHostAgentRegistration,
+  createCollectorNode,
+  deleteCollectorNode,
+  fetchCollectorNodes,
+  fetchHostAgentRegistrations,
+  rotateCollectorNodeToken,
+  updateCollectorNode,
+  type CollectorNode,
+  type CollectorNodeInput,
+  type HostAgentRegistration,
+} from '@/api/ops/collection'
 import { fetchControlResourceOptions, type OptionItem } from '@/api/ops/dcControl'
 
 const rows = ref<CollectorNode[]>([])
@@ -75,41 +186,372 @@ const confirmingAgent = ref<HostAgentRegistration>()
 const confirmResourceUid = ref('')
 const resourceOptions = ref<OptionItem[]>([])
 const agentPagination = reactive({ current: 1, pageSize: 20, total: 0 })
-const defaultForm = (): CollectorNodeInput => ({ code: '', name: '', node_type: 'regional', region_code: '', description: '', capabilities: '["icmp","snmp","ssh","http_api","redfish","ipmi"]', enabled: true })
+const capabilityGroups = [
+  {
+    key: 'network',
+    label: '网络采集',
+    items: [
+      { value: 'icmp', label: 'ICMP 连通性探测' },
+      { value: 'snmp', label: 'SNMP' },
+      { value: 'ssh', label: 'SSH' },
+      { value: 'http_api', label: 'HTTP API' },
+    ],
+  },
+  {
+    key: 'service',
+    label: '服务采集',
+    items: [
+      { value: 'agent', label: '主机 Agent' },
+      { value: 'database', label: '数据库' },
+      { value: 'middleware', label: '中间件' },
+    ],
+  },
+  {
+    key: 'hardware',
+    label: '硬件管理',
+    items: [
+      { value: 'redfish', label: 'Redfish' },
+      { value: 'ipmi', label: 'IPMI' },
+    ],
+  },
+]
+const capabilityOptions = capabilityGroups.flatMap((group) => group.items)
+const capabilityValues = new Set(capabilityOptions.map((item) => item.value))
+const defaultCapabilities = ['icmp', 'snmp', 'ssh', 'http_api', 'redfish', 'ipmi']
+const selectedCapabilities = ref<string[]>([...defaultCapabilities])
+const defaultForm = (): CollectorNodeInput => ({
+  code: '',
+  name: '',
+  node_type: 'regional',
+  region_code: '',
+  description: '',
+  capabilities: JSON.stringify(defaultCapabilities),
+  enabled: true,
+})
 const form = reactive<CollectorNodeInput>(defaultForm())
 const columns: TableColumnData[] = [
-  { title: '编码', dataIndex: 'code' }, { title: '名称', dataIndex: 'name' }, { title: '类型', slotName: 'type', width: 110 },
-  { title: '区域', dataIndex: 'region_code' }, { title: '状态', slotName: 'status', width: 100 }, { title: '版本', dataIndex: 'version', width: 100 },
-  { title: '队列深度', dataIndex: 'queue_depth', width: 100 }, { title: '最近心跳', slotName: 'heartbeat', width: 180 }, { title: '最近错误', dataIndex: 'last_error', ellipsis: true, tooltip: true },
+  { title: '编码', dataIndex: 'code' },
+  { title: '名称', dataIndex: 'name' },
+  { title: '类型', slotName: 'type', width: 110 },
+  { title: '区域', dataIndex: 'region_code' },
+  { title: '状态', slotName: 'status', width: 100 },
+  { title: '版本', dataIndex: 'version', width: 100 },
+  { title: '队列深度', dataIndex: 'queue_depth', width: 100 },
+  { title: '最近心跳', slotName: 'heartbeat', width: 180 },
+  { title: '最近错误', dataIndex: 'last_error', ellipsis: true, tooltip: true },
   { title: '操作', slotName: 'actions', width: 250, fixed: 'right' },
 ]
 const agentColumns: TableColumnData[] = [
-	{ title: 'Agent ID', dataIndex: 'agent_id', ellipsis: true, tooltip: true }, { title: '主机名', dataIndex: 'hostname' },
-	{ title: '当前设备', dataIndex: 'resource_uid', ellipsis: true, tooltip: true }, { title: 'Agent 声明设备', dataIndex: 'claimed_resource_uid', ellipsis: true, tooltip: true },
-	{ title: '版本', dataIndex: 'version', width: 100 }, { title: '状态', slotName: 'agentStatus', width: 100 },
-	{ title: '最近上报', slotName: 'agentSeen', width: 180 }, { title: '说明', dataIndex: 'last_error', ellipsis: true, tooltip: true },
-	{ title: '操作', slotName: 'agentActions', width: 100 },
+  { title: 'Agent ID', dataIndex: 'agent_id', ellipsis: true, tooltip: true },
+  { title: '主机名', dataIndex: 'hostname' },
+  { title: '当前设备', dataIndex: 'resource_uid', ellipsis: true, tooltip: true },
+  { title: 'Agent 声明设备', dataIndex: 'claimed_resource_uid', ellipsis: true, tooltip: true },
+  { title: '版本', dataIndex: 'version', width: 100 },
+  { title: '状态', slotName: 'agentStatus', width: 100 },
+  { title: '最近上报', slotName: 'agentSeen', width: 180 },
+  { title: '说明', dataIndex: 'last_error', ellipsis: true, tooltip: true },
+  { title: '操作', slotName: 'agentActions', width: 100 },
 ]
-const statusLabel = (status: string) => ({ pending: '待安装', enrolled: '等待心跳', active: '在线', degraded: '异常', offline: '离线' }[status] || status)
-const statusColor = (status: string) => ({ pending: 'orange', enrolled: 'orange', active: 'green', degraded: 'red', offline: 'gray' }[status] || 'blue')
-const loadData = async () => { loading.value = true; try { const res = await fetchCollectorNodes({ page: pagination.current, size: pagination.pageSize, keyword: keyword.value || undefined }); rows.value = res.details?.data || []; pagination.total = res.details?.total || 0 } finally { loading.value = false } }
-const onPageChange = (page: number) => { pagination.current = page; loadData() }
-const openCreate = () => { editingId.value = undefined; Object.assign(form, defaultForm()); visible.value = true }
-const openEdit = (row: CollectorNode) => { editingId.value = row.id; Object.assign(form, { code: row.code, name: row.name, node_type: row.node_type, region_code: row.region_code || '', description: row.description || '', capabilities: row.capabilities || '[]', enabled: row.enabled }); visible.value = true }
-const showToken = (res: any) => { const token = res?.details?.installation_token; if (res?.code !== 0 || !token) { Message.error(res?.message || '生成安装令牌失败'); return }; installationToken.value = token; tokenVisible.value = true }
-const save = async () => { if (!form.code.trim() || !form.name.trim()) { Message.warning('请填写节点编码和名称'); return }; saving.value = true; try { const res: any = editingId.value ? await updateCollectorNode(editingId.value, form) : await createCollectorNode(form); if (res.code !== 0) { Message.error(res.message || '保存失败'); return }; visible.value = false; Message.success('已保存'); if (!editingId.value) showToken(res); await loadData() } finally { saving.value = false } }
+const statusLabel = (status: string) =>
+  ({ pending: '待安装', enrolled: '等待心跳', active: '在线', degraded: '异常', offline: '离线' })[status] || status
+const statusColor = (status: string) =>
+  ({ pending: 'orange', enrolled: 'orange', active: 'green', degraded: 'red', offline: 'gray' })[status] || 'blue'
+const loadData = async () => {
+  loading.value = true
+  try {
+    const res = await fetchCollectorNodes({ page: pagination.current, size: pagination.pageSize, keyword: keyword.value || undefined })
+    rows.value = res.details?.data || []
+    pagination.total = res.details?.total || 0
+  } finally {
+    loading.value = false
+  }
+}
+const onPageChange = (page: number) => {
+  pagination.current = page
+  loadData()
+}
+const parseCapabilities = (value: string): string[] => {
+  const parsed: unknown = JSON.parse(value)
+  if (!Array.isArray(parsed) || !parsed.every((item): item is string => typeof item === 'string' && capabilityValues.has(item))) {
+    throw new Error('节点能力数据无效')
+  }
+  return parsed
+}
+const resetForm = () => {
+  Object.assign(form, defaultForm())
+  selectedCapabilities.value = [...defaultCapabilities]
+}
+
+const isCapabilitySelected = (value: string) => selectedCapabilities.value.includes(value)
+
+const toggleCapability = (value: string) => {
+  const index = selectedCapabilities.value.indexOf(value)
+  if (index === -1) {
+    selectedCapabilities.value.push(value)
+    return
+  }
+  selectedCapabilities.value.splice(index, 1)
+}
+
+const openCreate = () => {
+  editingId.value = undefined
+  resetForm()
+  visible.value = true
+}
+const openEdit = (row: CollectorNode) => {
+  try {
+    const capabilities = parseCapabilities(row.capabilities)
+    editingId.value = row.id
+    Object.assign(form, {
+      code: row.code,
+      name: row.name,
+      node_type: row.node_type,
+      region_code: row.region_code || '',
+      description: row.description || '',
+      capabilities: JSON.stringify(capabilities),
+      enabled: row.enabled,
+    })
+    selectedCapabilities.value = capabilities
+    visible.value = true
+  } catch {
+    Message.error('节点能力数据无效，无法编辑')
+  }
+}
+const showToken = (res: any) => {
+  const token = res?.details?.installation_token
+  if (res?.code !== 0 || !token) {
+    Message.error(res?.message || '生成安装令牌失败')
+    return
+  }
+  installationToken.value = token
+  tokenVisible.value = true
+}
+const save = async () => {
+  if (!form.code.trim() || !form.name.trim()) {
+    Message.warning('请填写节点编码和名称')
+    return
+  }
+  if (!selectedCapabilities.value.length) {
+    Message.warning('请至少选择一项节点能力')
+    return
+  }
+  form.capabilities = JSON.stringify(selectedCapabilities.value)
+  saving.value = true
+  try {
+    const res: any = editingId.value ? await updateCollectorNode(editingId.value, form) : await createCollectorNode(form)
+    if (res.code !== 0) {
+      Message.error(res.message || '保存失败')
+      return
+    }
+    visible.value = false
+    Message.success('已保存')
+    if (!editingId.value) showToken(res)
+    await loadData()
+  } finally {
+    saving.value = false
+  }
+}
 const rotateToken = async (row: CollectorNode) => showToken(await rotateCollectorNodeToken(row.id))
-const copyToken = async () => { await navigator.clipboard.writeText(installationToken.value); Message.success('已复制') }
-const remove = async (row: CollectorNode) => { const res: any = await deleteCollectorNode(row.id); if (res.code === 0) { Message.success('已删除'); await loadData() } else Message.error(res.message || '删除失败') }
-const loadAgents = async () => { agentLoading.value = true; try { const res = await fetchHostAgentRegistrations({ page: agentPagination.current, size: agentPagination.pageSize, keyword: agentKeyword.value || undefined, status: agentStatus.value }); agents.value = res.details?.data || []; agentPagination.total = res.details?.total || 0 } finally { agentLoading.value = false } }
-const onAgentPageChange = (page: number) => { agentPagination.current = page; loadAgents() }
-const openAgentConfirm = async (row: HostAgentRegistration) => { confirmingAgent.value = row; confirmResourceUid.value = row.resource_uid; if (!resourceOptions.value.length) { const res = await fetchControlResourceOptions({ resource_category: 'host' }); resourceOptions.value = res.details?.list || [] }; agentConfirmVisible.value = true }
-const confirmAgent = async () => { if (!confirmingAgent.value || !confirmResourceUid.value) { Message.warning('请选择服务器'); return }; agentConfirming.value = true; try { const res: any = await confirmHostAgentRegistration(confirmingAgent.value.id, confirmResourceUid.value); if (res.code !== 0) { Message.error(res.message || '确认失败'); return }; Message.success('关联已确认'); agentConfirmVisible.value = false; await loadAgents() } finally { agentConfirming.value = false } }
-onMounted(() => { loadData(); loadAgents() })
+const copyToken = async () => {
+  await navigator.clipboard.writeText(installationToken.value)
+  Message.success('已复制')
+}
+const remove = async (row: CollectorNode) => {
+  const res: any = await deleteCollectorNode(row.id)
+  if (res.code === 0) {
+    Message.success('已删除')
+    await loadData()
+  } else Message.error(res.message || '删除失败')
+}
+const loadAgents = async () => {
+  agentLoading.value = true
+  try {
+    const res = await fetchHostAgentRegistrations({
+      page: agentPagination.current,
+      size: agentPagination.pageSize,
+      keyword: agentKeyword.value || undefined,
+      status: agentStatus.value,
+    })
+    agents.value = res.details?.data || []
+    agentPagination.total = res.details?.total || 0
+  } finally {
+    agentLoading.value = false
+  }
+}
+const onAgentPageChange = (page: number) => {
+  agentPagination.current = page
+  loadAgents()
+}
+const openAgentConfirm = async (row: HostAgentRegistration) => {
+  confirmingAgent.value = row
+  confirmResourceUid.value = row.resource_uid
+  if (!resourceOptions.value.length) {
+    const res = await fetchControlResourceOptions({ resource_category: 'host' })
+    resourceOptions.value = res.details?.list || []
+  }
+  agentConfirmVisible.value = true
+}
+const confirmAgent = async () => {
+  if (!confirmingAgent.value || !confirmResourceUid.value) {
+    Message.warning('请选择服务器')
+    return
+  }
+  agentConfirming.value = true
+  try {
+    const res: any = await confirmHostAgentRegistration(confirmingAgent.value.id, confirmResourceUid.value)
+    if (res.code !== 0) {
+      Message.error(res.message || '确认失败')
+      return
+    }
+    Message.success('关联已确认')
+    agentConfirmVisible.value = false
+    await loadAgents()
+  } finally {
+    agentConfirming.value = false
+  }
+}
+onMounted(() => {
+  loadData()
+  loadAgents()
+})
 </script>
 
 <style scoped lang="less">
-.page-container { padding: 20px; }
-.mb-16 { margin-bottom: 16px; }
-.mt-16 { margin-top: 16px; }
+.page-container {
+  padding: 20px;
+}
+.mb-16 {
+  margin-bottom: 16px;
+}
+.mt-16 {
+  margin-top: 16px;
+}
+.capability-section {
+  padding-top: 2px;
+}
+.capability-section-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+.capability-title {
+  color: var(--color-text-1);
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 22px;
+}
+.capability-description {
+  margin-top: 2px;
+  color: var(--color-text-3);
+  font-size: 12px;
+  line-height: 18px;
+}
+.capability-count {
+  flex: none;
+  padding: 2px 8px;
+  border-radius: 10px;
+  background: #e8f3ff;
+  color: #165dff;
+  font-size: 12px;
+  line-height: 18px;
+}
+.capability-groups {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 12px;
+}
+.capability-card {
+  min-width: 0;
+  overflow: hidden;
+  border: 1px solid var(--color-border-2);
+  border-radius: 4px;
+  background: var(--color-bg-2);
+}
+.capability-card-title {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  padding: 9px 12px;
+  border-bottom: 1px solid var(--color-border-2);
+  color: var(--color-text-2);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 20px;
+}
+.capability-card-dot {
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background: #165dff;
+}
+.capability-card:nth-child(2) .capability-card-dot {
+  background: #00b42a;
+}
+.capability-card:nth-child(3) .capability-card-dot {
+  background: #ff7d00;
+}
+.capability-items {
+  display: grid;
+  gap: 4px;
+  padding: 8px;
+}
+.capability-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-height: 32px;
+  padding: 5px 7px;
+  border: 1px solid transparent;
+  border-radius: 3px;
+  background: transparent;
+  color: var(--color-text-2);
+  cursor: pointer;
+  font-size: 12px;
+  line-height: 20px;
+  text-align: left;
+  transition: all 0.16s ease;
+}
+.capability-item:hover {
+  background: var(--color-fill-2);
+}
+.capability-item.selected {
+  border-color: #b7d3ff;
+  background: #f2f7ff;
+  color: #165dff;
+}
+.capability-check {
+  position: relative;
+  flex: none;
+  width: 14px;
+  height: 14px;
+  border: 1px solid var(--color-border-3);
+  border-radius: 2px;
+  background: var(--color-bg-2);
+}
+.capability-item.selected .capability-check {
+  border-color: #165dff;
+  background: #165dff;
+}
+.capability-item.selected .capability-check::after {
+  position: absolute;
+  top: 2px;
+  left: 4px;
+  width: 4px;
+  height: 7px;
+  border: solid #fff;
+  border-width: 0 1px 1px 0;
+  content: '';
+  transform: rotate(45deg);
+}
+.capability-hint {
+  margin-top: 12px;
+}
+@media (max-width: 768px) {
+  .capability-groups {
+    grid-template-columns: 1fr;
+  }
+}
 </style>
diff --git a/src/views/ops/pages/dc/components/AlertPolicySelect.vue b/src/views/ops/pages/dc/components/AlertPolicySelect.vue
new file mode 100644
index 0000000..87c7d41
--- /dev/null
+++ b/src/views/ops/pages/dc/components/AlertPolicySelect.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-form-item field="policy_ids" label="告警策略">
+    <a-select
+      :model-value="modelValue"
+      multiple
+      allow-clear
+      :loading="loading"
+      :disabled="disabled || loading"
+      placeholder="请选择适用于当前设备类型的告警策略"
+      @update:model-value="updateValue"
+    >
+      <a-option v-for="policy in options" :key="policy.id" :value="policy.id">
+        {{ policy.name }}（{{ categoryName(policy.category) }}）
+      </a-option>
+    </a-select>
+  </a-form-item>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import {
+  fetchPolicyOptions,
+  fetchServicePolicyBindings,
+  type PolicyOptionItem,
+  type ServicePolicyCategory,
+} from '@/api/ops/alertPolicy'
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: number[]
+    resourceCategory: ServicePolicyCategory
+    resourceUid?: string
+    disabled?: boolean
+  }>(),
+  { resourceUid: '', disabled: false }
+)
+const emit = defineEmits<{ (event: 'update:modelValue', value: number[]): void }>()
+const loading = ref(false)
+const options = ref<PolicyOptionItem[]>([])
+
+const categoryLabels: Record<string, string> = {
+  os: '操作系统',
+  pc_os: '办公 PC 操作系统',
+  server_hardware: '服务器硬件',
+  service_process: '服务进程',
+  network_device: '网络设备',
+  security_device: '安全设备',
+  storage: '存储设备',
+  database: '数据库',
+  middleware: '中间件',
+  power_env: '动力环境',
+  safety_env: '安防环境',
+}
+
+const categoryName = (category: string) => categoryLabels[category] || category
+const updateValue = (value: Array<string | number>) => emit('update:modelValue', value.map(Number).filter((item) => item > 0))
+
+const load = async () => {
+  loading.value = true
+  try {
+    const optionResponse: any = await fetchPolicyOptions({ enabled: true, resource_category: props.resourceCategory })
+    options.value = Array.isArray(optionResponse)
+      ? optionResponse
+      : optionResponse?.details?.data || optionResponse?.details || []
+    if (props.resourceUid) {
+      const bindingResponse = await fetchServicePolicyBindings(props.resourceUid)
+      if (bindingResponse.code !== 0) throw new Error(bindingResponse.message || '加载告警策略绑定失败')
+      emit('update:modelValue', bindingResponse.details?.policy_ids || [])
+    }
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载告警策略失败')
+  } finally {
+    loading.value = false
+  }
+}
+
+watch(
+  () => [props.resourceCategory, props.resourceUid] as const,
+  () => load(),
+  { immediate: true }
+)
+</script>
diff --git a/src/views/ops/pages/dc/components/PrimaryCollectionFields.vue b/src/views/ops/pages/dc/components/PrimaryCollectionFields.vue
index ce29b42..c1452f7 100644
--- a/src/views/ops/pages/dc/components/PrimaryCollectionFields.vue
+++ b/src/views/ops/pages/dc/components/PrimaryCollectionFields.vue
@@ -11,17 +11,18 @@
       <a-col :span="5"><a-form-item label="端口" required><a-input-number v-model="model.port" :min="1" :max="65535" style="width: 100%" /></a-form-item></a-col>
       <a-col :span="5"><a-form-item label="间隔（秒）" required><a-input-number v-model="model.interval_seconds" :min="10" :max="86400" style="width: 100%" /></a-form-item></a-col>
     </a-row>
-    <a-empty v-if="model.enabled && !templates.length" description="当前厂商和设备类型没有已启用采集模板，请先到供应商管理维护模板" />
+    <a-empty v-if="model.enabled && !templates.length" description="当前厂商、设备类型和型号没有适用的已启用采集模板，请先到供应商管理维护模板" />
   </template>
 </template>
 
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue'
 import { fetchCollectionTemplates, fetchCollectorNodes, fetchCredentials, type CollectionCredential, type CollectionTemplate, type CollectorNode } from '@/api/ops/collection'
+import { collectionTemplateMatchesModel } from '@/utils/collectionTemplate'
 
 import type { PrimaryCollectionDraft } from './deviceMaster'
 
-const props = defineProps<{ resourceCategory: string; manufacturerCode?: string; editing?: boolean; managementIp?: string; preferredPort?: number }>()
+const props = defineProps<{ resourceCategory: string; manufacturerCode?: string; deviceModel?: string; editing?: boolean; managementIp?: string; preferredPort?: number }>()
 const model = defineModel<PrimaryCollectionDraft>({ required: true })
 const nodes = ref<CollectorNode[]>([])
 const credentials = ref<CollectionCredential[]>([])
@@ -41,11 +42,17 @@ const loadOptions = async () => {
   nodes.value = nodeRes.details?.data || []
   credentials.value = credentialRes.details?.data || []
   templates.value = (templateRes.details?.data || []).filter((item) =>
-    item.manufacturer_code === 'GENERIC' || item.manufacturer_code === props.manufacturerCode
+    (item.manufacturer_code === 'GENERIC' || item.manufacturer_code === props.manufacturerCode)
+      && collectionTemplateMatchesModel(item, props.deviceModel)
   )
+  if (!templates.value.some((item) => item.id === model.value.template_id)) {
+    model.value.template_id = undefined
+    model.value.protocol = ''
+    model.value.credential_id = undefined
+  }
 }
 const onTemplateChange = () => { const selected = templates.value.find((item) => item.id === model.value.template_id); if (!selected) return; model.value.protocol = selected.protocol; model.value.port = props.preferredPort || defaultPort(selected.protocol); if (!compatibleCredentials.value.some((item) => item.id === model.value.credential_id)) model.value.credential_id = undefined }
-watch(() => props.manufacturerCode, loadOptions)
+watch(() => [props.manufacturerCode, props.deviceModel], loadOptions)
 watch(() => props.managementIp, (value) => { if (!model.value.target) model.value.target = value || '' })
 onMounted(loadOptions)
 </script>
diff --git a/src/views/ops/pages/dc/components/deviceMaster.ts b/src/views/ops/pages/dc/components/deviceMaster.ts
index b4e8dcd..08f98a2 100644
--- a/src/views/ops/pages/dc/components/deviceMaster.ts
+++ b/src/views/ops/pages/dc/components/deviceMaster.ts
@@ -1,15 +1,14 @@
 import {
   AssetStatus,
   createAsset,
-  deleteAsset,
   fetchAssetDetail,
   fetchCategoryOptions,
   fetchManufacturerOptions,
   updateAsset,
+  waitForDeviceProjection,
   type AssetForm,
 } from '@/api/ops/asset'
-import { fetchControlResourceOverview } from '@/api/ops/dcControl'
-import { createCollectionBinding, deleteCollectionBinding, fetchCollectionBindings, updateCollectionBinding } from '@/api/ops/collection'
+import { createCollectionBinding, fetchCollectionBindings, updateCollectionBinding } from '@/api/ops/collection'
 
 export type DeviceLevel = 'core' | 'important' | 'normal'
 
@@ -59,6 +58,7 @@ export interface PersistDeviceMasterInput {
 export interface PersistedDeviceMaster {
   assetId: number
   resourceUid: string
+  eventVersion: number
   asset: Record<string, any>
   created: boolean
 }
@@ -113,30 +113,6 @@ export async function persistPrimaryCollectionBinding(
   return { id: bindingId, created: !current }
 }
 
-export async function rollbackCreatedDeviceSetup(
-  master?: PersistedDeviceMaster,
-  binding?: PersistedPrimaryCollectionBinding
-): Promise<void> {
-  const errors: string[] = []
-  if (binding?.created && binding.id) {
-    try {
-      const response: any = await deleteCollectionBinding(binding.id)
-      if (response?.code !== 0) throw new Error(response?.message || '删除采集绑定失败')
-    } catch (error: any) {
-      errors.push(error?.response?.data?.message || error?.message || '删除采集绑定失败')
-    }
-  }
-  if (master?.created) {
-    try {
-      const response: any = await deleteAsset(master.resourceUid)
-      if (response?.code !== 0) throw new Error(response?.message || '删除资产失败')
-    } catch (error: any) {
-      errors.push(error?.response?.data?.message || error?.message || '删除资产失败')
-    }
-  }
-  if (errors.length > 0) throw new Error(errors.join('；'))
-}
-
 function responseDetails(response: any, operation: string): any {
   if (response?.code !== 0 || !response?.details) {
     throw new Error(response?.message || `${operation}失败`)
@@ -231,38 +207,10 @@ export async function persistDeviceMaster(context: DeviceMasterContext, input: P
   const asset = responseDetails(response, input.state.resource_uid ? '更新设备主信息' : '创建设备主信息')
   const assetId = Number(asset.id)
   const resourceUid = String(asset.resource_uid || '')
-  if (!assetId || !resourceUid) throw new Error('设备服务未返回有效设备标识')
+  const eventVersion = Number(asset.event_version)
+  if (!assetId || !resourceUid || !eventVersion) throw new Error('设备服务未返回有效设备标识或事件版本')
   input.state.asset_id = assetId
   input.state.resource_uid = resourceUid
-  try {
-    await waitForDeviceProjection(resourceUid, assetId)
-  } catch (error: any) {
-    if (created) {
-      try {
-        const deleteResponse: any = await deleteAsset(resourceUid)
-        if (deleteResponse?.code !== 0) throw new Error(deleteResponse?.message || '删除资产失败')
-        input.state.asset_id = undefined
-        input.state.resource_uid = undefined
-      } catch (cleanupError: any) {
-        throw new Error(
-          `${error?.message || '设备主信息同步失败'}；自动清理失败：${cleanupError?.response?.data?.message || cleanupError?.message || '删除资产失败'}`
-        )
-      }
-    }
-    throw error
-  }
-  return { assetId, resourceUid, asset, created }
-}
-
-async function waitForDeviceProjection(resourceUid: string, assetId: number): Promise<void> {
-  for (let attempt = 0; attempt < 20; attempt += 1) {
-    try {
-      const response = await fetchControlResourceOverview(resourceUid)
-      if (response.code === 0 && Number(response.details?.master.asset_id) === assetId) return
-    } catch {
-      // 设备事件由资源投影任务异步消费，未找到时继续等待。
-    }
-    await new Promise((resolve) => window.setTimeout(resolve, 500))
-  }
-  throw new Error('设备主信息同步超时，统一设备已创建，请稍后再次保存监控配置')
+  await waitForDeviceProjection(resourceUid, eventVersion)
+  return { assetId, resourceUid, eventVersion, asset, created }
 }
diff --git a/src/views/ops/pages/dc/database/components/DetailDialog.vue b/src/views/ops/pages/dc/database/components/DetailDialog.vue
index 73a47f4..e4b9571 100644
--- a/src/views/ops/pages/dc/database/components/DetailDialog.vue
+++ b/src/views/ops/pages/dc/database/components/DetailDialog.vue
@@ -109,6 +109,36 @@
             </a-descriptions>
           </a-tab-pane>
 
+          <a-tab-pane key="performance" title="性能指标">
+            <div class="tab-toolbar">采集时间：{{ formatTime(metricsTimestamp) }}</div>
+            <a-table :data="metricRows" :pagination="false" row-key="key" :scroll="{ y: 420 }">
+              <template #columns>
+                <a-table-column title="指标" data-index="name" :width="230" />
+                <a-table-column title="对象" data-index="target" :width="180" />
+                <a-table-column title="当前值" :width="150">
+                  <template #cell="{ record }">{{ formatMetricValue(record.value, record.unit) }}</template>
+                </a-table-column>
+                <a-table-column title="指标编码" data-index="code" />
+              </template>
+            </a-table>
+          </a-tab-pane>
+
+          <a-tab-pane v-if="isPostgresFamily" key="sql-top" title="SQL TOP">
+            <div v-for="group in sqlTopGroups" :key="group.title" class="sql-top-section">
+              <h3>{{ group.title }}</h3>
+              <table class="sql-top-table">
+                <thead><tr><th>#</th><th>SQL 摘要</th><th>执行次数</th><th>{{ group.valueTitle }}</th></tr></thead>
+                <tbody>
+                  <tr v-for="item in group.items" :key="`${item.rank}-${item.sql_id}`">
+                    <td>{{ item.rank }}</td><td :title="item.sql_text">{{ item.sql_text }}</td>
+                    <td>{{ formatNumber(item.executions) }}</td><td>{{ formatMetricValue(item.metric_value, item.metric_unit) }}</td>
+                  </tr>
+                  <tr v-if="!group.items.length"><td colspan="4" class="empty-cell">暂无采集数据</td></tr>
+                </tbody>
+              </table>
+            </div>
+          </a-tab-pane>
+
           <a-tab-pane key="status" title="运行状态">
             <a-descriptions :column="2" bordered>
               <a-descriptions-item label="运行状态">
@@ -130,10 +160,19 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { IconEdit, IconDelete, IconSync } from '@arco-design/web-vue/es/icon'
-import { fetchDatabaseDetail, type DatabaseService } from '@/api/ops/database'
+import {
+  fetchDatabaseDetail,
+  fetchDatabaseMetricsLatest,
+  fetchDatabaseSQLTopCalls,
+  fetchDatabaseSQLTopElapsed,
+  fetchDatabaseSQLTopIO,
+  type DatabaseMetricItem,
+  type DatabaseService,
+  type DatabaseSQLTopItem,
+} from '@/api/ops/database'
 
 interface Props {
   visible: boolean
@@ -149,6 +188,66 @@ const emit = defineEmits(['update:visible', 'edit', 'delete', 'collect'])
 const loading = ref(false)
 const detailData = ref<DatabaseService | null>(null)
 const activeTab = ref('basic')
+const latestMetrics = ref<DatabaseMetricItem[]>([])
+const metricsTimestamp = ref<string | null>(null)
+const sqlTopElapsed = ref<DatabaseSQLTopItem[]>([])
+const sqlTopCalls = ref<DatabaseSQLTopItem[]>([])
+const sqlTopIO = ref<DatabaseSQLTopItem[]>([])
+
+const metricNames: Record<string, string> = {
+  'database.response_time_ms': '响应时间',
+  'database.uptime_seconds': '运行时长',
+  'database.connections.current': '当前连接数',
+  'database.connections.running': '活动连接数',
+  'database.connections.idle': '空闲连接数',
+  'database.connections.waiting': '等待连接数',
+  'database.connections.max': '最大连接数',
+  'database.connections.usage_percent': '连接使用率',
+  'database.transactions.commit_total': '提交事务累计数',
+  'database.transactions.rollback_total': '回滚事务累计数',
+  'database.rows.read_total': '读取行累计数',
+  'database.rows.write_total': '写入行累计数',
+  'database.cache.hit_percent': '缓存命中率',
+  'database.temp.files_total': '临时文件累计数',
+  'database.temp.bytes_total': '临时文件累计容量',
+  'database.locks.waiting': '等待锁数量',
+  'database.slow_queries.current': '当前慢查询数',
+  'database.slow_queries.max_duration_seconds': '当前最长 SQL 时长',
+  'database.deadlocks.total': '死锁累计数',
+  'database.size_bytes': '数据库容量',
+  'database.tablespace.used_bytes': '表空间已用容量',
+  'database.replication.is_replica': '是否为只读副本',
+  'database.replication.connected_replicas': '已连接副本数',
+  'database.replication.seconds_behind': '复制延迟',
+  'database.timescale.hypertables': 'Hypertable 数量',
+  'database.timescale.compression_enabled_hypertables': '启用压缩的 Hypertable 数量',
+  'database.timescale.chunks': 'Chunk 数量',
+  'database.timescale.compressed_chunks': '已压缩 Chunk 数量',
+  'database.timescale.compression_percent': 'Chunk 压缩率',
+  'database.timescale.continuous_aggregates': '连续聚合数量',
+  'database.timescale.jobs': '后台任务数量',
+  'database.timescale.job_failures': '后台任务失败累计数',
+  'database.timescale.retention_policies': '保留策略数量',
+  'database.timescale.compression_policies': '压缩策略数量',
+  'database.timescale.hypertable_size_bytes': 'Hypertable 总容量',
+}
+
+const isPostgresFamily = computed(() => detailData.value?.type === 'PostgreSQL' || detailData.value?.type === 'TimescaleDB')
+const sqlTopGroups = computed(() => [
+  { title: '累计执行耗时 TOP 5', valueTitle: '累计耗时', items: sqlTopElapsed.value },
+  { title: '执行次数 TOP 5', valueTitle: '执行次数', items: sqlTopCalls.value },
+  { title: '块读取量 TOP 5', valueTitle: '读取量', items: sqlTopIO.value },
+])
+const metricRows = computed(() => latestMetrics.value
+  .filter((item) => !item.metric_name.startsWith('database.sql_top_'))
+  .map((item) => ({
+    key: `${item.metric_name}-${item.series_key}`,
+    code: item.metric_name,
+    name: metricNames[item.metric_name] || item.metric_name,
+    target: metricTarget(item.labels),
+    value: item.metric_value,
+    unit: item.metric_unit,
+  })))
 
 watch(
   () => props.visible,
@@ -165,6 +264,26 @@ const fetchDetail = async () => {
   try {
     const res: any = await fetchDatabaseDetail(props.recordId)
     detailData.value = res?.details || null
+    latestMetrics.value = []
+    metricsTimestamp.value = null
+    sqlTopElapsed.value = []
+    sqlTopCalls.value = []
+    sqlTopIO.value = []
+    if (!detailData.value?.resource_uid) return
+
+    const metricsResponse: any = await fetchDatabaseMetricsLatest(detailData.value.resource_uid)
+    latestMetrics.value = metricsResponse?.details?.metrics || []
+    metricsTimestamp.value = metricsResponse?.details?.latest_timestamp || null
+    if (isPostgresFamily.value) {
+      const [elapsedResponse, callsResponse, ioResponse]: any[] = await Promise.all([
+        fetchDatabaseSQLTopElapsed(detailData.value.resource_uid),
+        fetchDatabaseSQLTopCalls(detailData.value.resource_uid),
+        fetchDatabaseSQLTopIO(detailData.value.resource_uid),
+      ])
+      sqlTopElapsed.value = elapsedResponse?.details?.items || []
+      sqlTopCalls.value = callsResponse?.details?.items || []
+      sqlTopIO.value = ioResponse?.details?.items || []
+    }
   } catch (error) {
     console.error('获取详情失败:', error)
     Message.error('获取详情失败')
@@ -187,6 +306,7 @@ const getTypeColor = (type?: string) => {
   const colorMap: Record<string, string> = {
     MySQL: 'blue',
     PostgreSQL: 'purple',
+    TimescaleDB: 'arcoblue',
     Redis: 'red',
     MongoDB: 'green',
     DM: 'orange',
@@ -199,6 +319,7 @@ const getTypeAbbr = (type?: string) => {
   const abbrMap: Record<string, string> = {
     MySQL: 'MY',
     PostgreSQL: 'PG',
+    TimescaleDB: 'TS',
     Redis: 'RD',
     MongoDB: 'MG',
     DM: 'DM',
@@ -272,6 +393,32 @@ const parseTags = (tags?: string) => {
   return tags.split(',').filter((t) => t.trim())
 }
 
+const parseMetricLabels = (labels: string) => {
+  return JSON.parse(labels) as Record<string, string>
+}
+
+const metricTarget = (labels: string) => {
+  const values = parseMetricLabels(labels)
+  return values.tablespace || values.database || '-'
+}
+
+const formatNumber = (value: number) => Number(value || 0).toLocaleString('zh-CN', { maximumFractionDigits: 2 })
+
+const formatMetricValue = (value: number, unit: string) => {
+  if (unit === 'bytes' || unit === 'B') {
+    const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
+    let size = Number(value || 0)
+    let index = 0
+    while (size >= 1024 && index < units.length - 1) {
+      size /= 1024
+      index++
+    }
+    return `${size.toFixed(index === 0 ? 0 : 2)} ${units[index]}`
+  }
+  if (unit === 'boolean') return value ? '是' : '否'
+  return `${formatNumber(value)}${unit === '%' ? '%' : unit ? ` ${unit}` : ''}`
+}
+
 </script>
 
 <style scoped lang="less">
@@ -384,6 +531,56 @@ const parseTags = (tags?: string) => {
   padding: 16px;
 }
 
+.tab-toolbar {
+  margin-bottom: 12px;
+  color: #86909c;
+}
+
+.sql-top-section {
+  margin-bottom: 20px;
+
+  h3 {
+    margin: 0 0 10px;
+    font-size: 14px;
+  }
+}
+
+.sql-top-table {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+
+  th,
+  td {
+    padding: 9px 10px;
+    border: 1px solid #e5e6eb;
+    text-align: left;
+  }
+
+  th:first-child,
+  td:first-child {
+    width: 42px;
+  }
+
+  th:nth-child(3),
+  td:nth-child(3),
+  th:nth-child(4),
+  td:nth-child(4) {
+    width: 120px;
+  }
+
+  td:nth-child(2) {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .empty-cell {
+    text-align: center;
+    color: #86909c;
+  }
+}
+
 .json-display {
   margin: 0;
   padding: 8px;
diff --git a/src/views/ops/pages/dc/database/components/FormDialog.vue b/src/views/ops/pages/dc/database/components/FormDialog.vue
index c49ef6b..746189d 100644
--- a/src/views/ops/pages/dc/database/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/database/components/FormDialog.vue
@@ -17,6 +17,7 @@
         <a-col :span="12"><a-form-item field="type" label="数据库类型" required>
           <a-select v-model="formData.type" @change="onTypeChange">
             <a-option value="MySQL">MySQL</a-option><a-option value="PostgreSQL">PostgreSQL</a-option>
+            <a-option value="TimescaleDB">TimescaleDB</a-option>
             <a-option value="Redis">Redis</a-option><a-option value="MongoDB">MongoDB</a-option>
             <a-option value="DM">DM（达梦）</a-option><a-option value="KingBase">KingBaseES（人大金仓）</a-option>
             <a-option value="Oracle">Oracle</a-option><a-option value="OracleRAC">Oracle RAC</a-option>
@@ -24,9 +25,10 @@
         </a-form-item></a-col>
         <a-col :span="12"><a-form-item field="host" label="主机地址" required><a-input v-model="formData.host" /></a-form-item></a-col>
         <a-col :span="12"><a-form-item field="port" label="端口" required><a-input-number v-model="formData.port" :min="1" :max="65535" style="width: 100%" /></a-form-item></a-col>
-        <a-col :span="12"><a-form-item field="database" label="数据库名 / 服务名"><a-input v-model="formData.database" /></a-form-item></a-col>
+        <a-col :span="12"><a-form-item field="database" label="数据库名 / 服务名" :required="requiresDatabaseName" :rules="requiresDatabaseName ? [{ required: true, message: '请输入数据库名' }] : []"><a-input v-model="formData.database" /></a-form-item></a-col>
         <a-col :span="12"><a-form-item field="tls_mode" label="传输加密校验">
           <a-select v-model="formData.tls_mode">
+            <a-option v-if="supportsDisabledTLS" value="disable">不启用 TLS</a-option>
             <a-option value="require">启用 TLS</a-option><a-option value="verify-ca">校验签发机构</a-option><a-option value="verify-full">校验证书和主机名</a-option>
           </a-select>
         </a-form-item></a-col>
@@ -36,12 +38,19 @@
         <a-col :span="24"><a-form-item field="tags" label="标签"><a-input v-model="formData.tags" placeholder="多个标签用逗号分隔" /></a-form-item></a-col>
       </a-row>
 
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="database"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
+
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="database"
         :editing="isEdit"
         :management-ip="formData.host"
         :preferred-port="formData.port"
+        :device-model="formData.type"
       />
     </a-form>
   </a-modal>
@@ -51,8 +60,9 @@
 import { computed, reactive, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { FormInstance } from '@arco-design/web-vue'
-import { createDatabase, updateDatabase, type CreateDatabaseParams, type DatabaseType, type UpdateDatabaseParams } from '@/api/ops/database'
+import { createDatabase, updateDatabase, type CreateDatabaseParams, type DatabaseTLSMode, type DatabaseType, type UpdateDatabaseParams } from '@/api/ops/database'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import { createPrimaryCollectionDraft, persistPrimaryCollectionBinding } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: any }>(), { record: () => ({}) })
@@ -63,15 +73,21 @@ const primaryCollection = ref(createPrimaryCollectionDraft())
 const isEdit = computed(() => Boolean(props.record?.id))
 const formData = reactive({
   service_identity: '', name: '', category: 'database', type: '' as DatabaseType | '', host: '', port: 5432,
-  database: '', tls_mode: 'require' as 'require' | 'verify-ca' | 'verify-full', description: '', enabled: true,
-  interval: 60, tags: '',
+  database: '', tls_mode: 'require' as DatabaseTLSMode, description: '', enabled: true,
+  interval: 60, tags: '', policy_ids: [] as number[],
 })
 const rules = {
   name: [{ required: true, message: '请输入服务名称' }], type: [{ required: true, message: '请选择数据库类型' }],
   host: [{ required: true, message: '请输入主机地址' }], port: [{ required: true, message: '请输入端口' }],
 }
-const defaultPorts: Record<string, number> = { MySQL: 3306, PostgreSQL: 5432, Redis: 6379, MongoDB: 27017, DM: 5236, KingBase: 54321, Oracle: 1521, OracleRAC: 1521 }
-const onTypeChange = () => { formData.port = defaultPorts[formData.type] || 5432; if (!primaryCollection.value.port || primaryCollection.value.port === 5432) primaryCollection.value.port = formData.port }
+const defaultPorts: Record<string, number> = { MySQL: 3306, PostgreSQL: 5432, TimescaleDB: 5433, Redis: 6379, MongoDB: 27017, DM: 5236, KingBase: 54321, Oracle: 1521, OracleRAC: 1521 }
+const supportsDisabledTLS = computed(() => formData.type === 'PostgreSQL' || formData.type === 'TimescaleDB')
+const requiresDatabaseName = computed(() => formData.type === 'PostgreSQL' || formData.type === 'TimescaleDB')
+const onTypeChange = () => {
+  formData.port = defaultPorts[formData.type] || 5432
+  if (!supportsDisabledTLS.value && formData.tls_mode === 'disable') formData.tls_mode = 'require'
+  primaryCollection.value.port = formData.port
+}
 watch(() => formData.host, (value) => { if (!primaryCollection.value.target) primaryCollection.value.target = value })
 watch(() => props.visible, (visible) => {
   if (!visible) return
@@ -83,7 +99,7 @@ watch(() => props.visible, (visible) => {
       enabled: props.record.enabled ?? true, interval: props.record.interval || 60, tags: props.record.tags || '',
     })
   } else {
-    Object.assign(formData, { service_identity: '', name: '', category: 'database', type: '', host: '', port: 5432, database: '', tls_mode: 'require', description: '', enabled: true, interval: 60, tags: '' })
+    Object.assign(formData, { service_identity: '', name: '', category: 'database', type: '', host: '', port: 5432, database: '', tls_mode: 'require', description: '', enabled: true, interval: 60, tags: '', policy_ids: [] })
     primaryCollection.value = createPrimaryCollectionDraft()
   }
 })
@@ -95,6 +111,7 @@ const handleOk = async () => {
       name: formData.name.trim(), category: 'database', type: formData.type as DatabaseType,
       host: formData.host.trim(), port: formData.port, database: formData.database.trim(), tls_mode: formData.tls_mode,
       description: formData.description.trim(), enabled: formData.enabled, interval: formData.interval, tags: formData.tags.trim(),
+      policy_ids: formData.policy_ids,
     }
     if (isEdit.value) {
       const response: any = await updateDatabase(props.record.id, payload)
@@ -102,9 +119,9 @@ const handleOk = async () => {
     } else {
       const response: any = await createDatabase(payload as CreateDatabaseParams)
       if (response?.code !== 0) throw new Error(response?.message || '创建失败')
-      const serviceIdentity = String(response.details?.service_identity || '')
-      if (!serviceIdentity) throw new Error('数据库服务未返回统一标识')
-      await persistPrimaryCollectionBinding(`database:${serviceIdentity}`, formData.name, primaryCollection.value)
+      const resourceUID = String(response.details?.resource_uid || '')
+      if (!resourceUID) throw new Error('数据库服务未返回统一资源标识')
+      await persistPrimaryCollectionBinding(resourceUID, formData.name, primaryCollection.value)
     }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
diff --git a/src/views/ops/pages/dc/database/config/search-form.ts b/src/views/ops/pages/dc/database/config/search-form.ts
index bbe6a12..d1bfc7a 100644
--- a/src/views/ops/pages/dc/database/config/search-form.ts
+++ b/src/views/ops/pages/dc/database/config/search-form.ts
@@ -16,10 +16,13 @@ export const searchFormConfig: FormItem[] = [
     options: [
       { label: 'MySQL', value: 'MySQL' },
       { label: 'PostgreSQL', value: 'PostgreSQL' },
+      { label: 'TimescaleDB', value: 'TimescaleDB' },
       { label: 'Redis', value: 'Redis' },
       { label: 'MongoDB', value: 'MongoDB' },
       { label: 'DM', value: 'DM' },
       { label: 'KingBase', value: 'KingBase' },
+      { label: 'Oracle', value: 'Oracle' },
+      { label: 'Oracle RAC', value: 'OracleRAC' },
     ],
     span: 6,
   },
diff --git a/src/views/ops/pages/dc/database/index.vue b/src/views/ops/pages/dc/database/index.vue
index f81528f..66049b9 100644
--- a/src/views/ops/pages/dc/database/index.vue
+++ b/src/views/ops/pages/dc/database/index.vue
@@ -184,6 +184,7 @@ const getTypeColor = (type: string) => {
   const colorMap: Record<string, string> = {
     MySQL: 'blue',
     PostgreSQL: 'purple',
+    TimescaleDB: 'arcoblue',
     Redis: 'red',
     MongoDB: 'green',
     DM: 'orange',
diff --git a/src/views/ops/pages/dc/device-collect/components/Detail.vue b/src/views/ops/pages/dc/device-collect/components/Detail.vue
index bf9978c..fe72293 100644
--- a/src/views/ops/pages/dc/device-collect/components/Detail.vue
+++ b/src/views/ops/pages/dc/device-collect/components/Detail.vue
@@ -83,7 +83,7 @@ const handleViewMetrics = async () => {
   metricsVisible.value = true
   metricsLoading.value = true
   try {
-    const response = await fetchLatestMetrics(props.record.service_identity)
+    const response = await fetchLatestMetrics(props.record.resource_uid)
     metricsLatestTimestamp.value = response?.details?.latest_timestamp || ''
     metricsCount.value = response?.details?.count || 0
     const metrics =
diff --git a/src/views/ops/pages/dc/device-collect/components/FormDialog.vue b/src/views/ops/pages/dc/device-collect/components/FormDialog.vue
index 68827dc..8493731 100644
--- a/src/views/ops/pages/dc/device-collect/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/device-collect/components/FormDialog.vue
@@ -67,6 +67,7 @@
         v-model="primaryCollection"
         resource-category="room_device"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.management_address"
       />
@@ -104,10 +105,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 interface Props {
@@ -154,7 +152,7 @@ const rules = {
 
 const loadPolicyOptions = async () => {
   try {
-    const response: any = await fetchPolicyOptions({ enabled: true })
+    const response: any = await fetchPolicyOptions({ enabled: true, resource_category: 'room_device' })
     if (Array.isArray(response)) {
       policyOptions.value = response
     } else if (response && response.details) {
@@ -193,10 +191,9 @@ watch(
       masterContext.value ||= await loadDeviceMasterContext('ROOM_DEVICE')
       if (isEdit.value) {
         if (!props.record.resource_uid) throw new Error('该机房设备缺少统一设备标识，无法编辑')
-        if (!props.record.service_identity) throw new Error('该机房设备缺少服务标识，无法加载告警策略')
         const [loaded, bindingResponse] = await Promise.all([
           loadDeviceMaster(props.record.resource_uid),
-          fetchServicePolicyBindings('room_device', props.record.service_identity),
+          fetchServicePolicyBindings(props.record.resource_uid),
         ])
         if (bindingResponse.code !== 0) throw new Error(bindingResponse.message || '加载告警策略绑定失败')
         masterData.value = loaded.state
@@ -240,8 +237,6 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     const roomId = formData.room_id
@@ -251,7 +246,7 @@ const handleOk = async () => {
     }
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'ROOM_DEVICE',
       state: masterData.value,
       assetName: formData.name,
@@ -263,7 +258,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const payload: RoomDeviceCreateData | RoomDeviceUpdateData = {
       resource_uid: master.resourceUid,
       asset_id: master.assetId,
@@ -281,23 +275,19 @@ const handleOk = async () => {
       ? await updateRoomDevice(props.record.id, payload)
       : await createRoomDevice(payload as RoomDeviceCreateData)
     if (response?.code !== 0) throw new Error(response?.message || '保存机房设备失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`机房设备已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
 
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '操作失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '操作失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/device-collect/index.vue b/src/views/ops/pages/dc/device-collect/index.vue
index e4353f9..970cc39 100644
--- a/src/views/ops/pages/dc/device-collect/index.vue
+++ b/src/views/ops/pages/dc/device-collect/index.vue
@@ -92,7 +92,7 @@ import FormDialog from './components/FormDialog.vue'
 import Detail from './components/Detail.vue'
 import { columns as columnsConfig } from './config/columns'
 import { fetchRoomDeviceList, type RoomDeviceItem, type RoomDeviceListParams } from '@/api/ops/room-device'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 
 const loading = ref(false)
 const tableData = ref<RoomDeviceItem[]>([])
@@ -214,13 +214,14 @@ const handleDelete = (record: RoomDeviceItem) => {
     content: `确认删除机房设备 "${record.name}" 吗？`,
     onOk: async () => {
       try {
-		if (!record.resource_uid) throw new Error('该机房设备缺少统一设备标识，无法删除')
-		await deleteAsset(record.resource_uid)
-        Message.success('删除成功')
-        fetchRoomDeviceData()
-      } catch (error) {
+        if (!record.resource_uid) throw new Error('该机房设备缺少统一设备标识，无法删除')
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') Message.success('删除成功')
+        else Message.info('设备正在删除，系统将自动完成清理')
+        await fetchRoomDeviceData()
+      } catch (error: any) {
         console.error('删除机房设备失败:', error)
-        Message.error('删除失败')
+        Message.error(error?.response?.data?.message || error?.message || '删除失败')
       }
     },
   })
diff --git a/src/views/ops/pages/dc/device-overview/index.vue b/src/views/ops/pages/dc/device-overview/index.vue
index f71900c..5bfdb55 100644
--- a/src/views/ops/pages/dc/device-overview/index.vue
+++ b/src/views/ops/pages/dc/device-overview/index.vue
@@ -82,9 +82,78 @@
           </a-grid>
         </a-card>
 
-        <a-card title="关联信息入口" :bordered="false" class="section-card">
+        <a-card title="监控趋势" :bordered="false" class="section-card">
+          <template #extra>
+            <a-select
+              v-if="overview.master.resource_category !== 'network'"
+              v-model="trendMetricKey"
+              :options="metricOptions"
+              placeholder="选择指标"
+              style="width: 240px"
+              @change="loadTrend"
+            />
+          </template>
+          <a-alert v-if="trendError" type="warning">{{ trendError }}</a-alert>
+          <a-empty v-else-if="!trend?.points?.length" description="最近 24 小时暂无趋势数据" />
+          <Chart v-else :options="trendChartOptions" height="300px" />
+        </a-card>
+
+        <a-card title="当前告警" :bordered="false" class="section-card">
+          <template #extra><a-link @click="openRelated('/alert/incidents')">查看全部</a-link></template>
+          <a-alert v-if="incidentError" type="warning">{{ incidentError }}</a-alert>
+          <a-empty v-else-if="!incidents.length" description="该设备当前没有未关闭告警" />
+          <a-table v-else :data="incidents" :pagination="false" row-key="id">
+            <template #columns>
+              <a-table-column title="告警编号" data-index="incident_no" :width="180" />
+              <a-table-column title="级别" data-index="severity" :width="100">
+                <template #cell="{ record }">
+                  <a-tag :color="severityColor(record.severity)">{{ record.severity }}</a-tag>
+                </template>
+              </a-table-column>
+              <a-table-column title="告警摘要" data-index="summary" />
+              <a-table-column title="状态" data-index="status" :width="110" />
+              <a-table-column title="发生时间" data-index="opened_at" :width="190">
+                <template #cell="{ record }">{{ formatTime(record.opened_at) }}</template>
+              </a-table-column>
+            </template>
+          </a-table>
+        </a-card>
+
+        <a-card v-if="supportsCapacity" title="容量分析（滚动 7 天）" :bordered="false" class="section-card">
+          <a-alert v-if="capacityError" type="warning">{{ capacityError }}</a-alert>
+          <a-empty v-else-if="!capacities.length" description="该设备暂无容量分析结果" />
+          <a-table v-else :data="capacities" :pagination="false" row-key="metric_code">
+            <template #columns>
+              <a-table-column title="容量对象" :width="220">
+                <template #cell="{ record }">{{ record.object_name || overview.master.display_name }}</template>
+              </a-table-column>
+              <a-table-column title="指标" data-index="display_name" :width="180" />
+              <a-table-column title="当前值" :width="130">
+                <template #cell="{ record }">{{ formatMetric(record.current_value, record.unit) }}</template>
+              </a-table-column>
+              <a-table-column title="7 天平均/峰值" :width="190">
+                <template #cell="{ record }">
+                  {{ formatMetric(record.average_value, record.unit) }} / {{ formatMetric(record.peak_value, record.unit) }}
+                </template>
+              </a-table-column>
+              <a-table-column title="状态" :width="120">
+                <template #cell="{ record }">
+                  <a-tag :color="capacityColor(record.status)">{{ record.status }}</a-tag>
+                </template>
+              </a-table-column>
+              <a-table-column title="预计可用天数" :width="140">
+                <template #cell="{ record }">{{ record.estimated_available_days ?? '-' }}</template>
+              </a-table-column>
+              <a-table-column title="说明">
+                <template #cell="{ record }">{{ record.insufficient_reason || '数据正常' }}</template>
+              </a-table-column>
+            </template>
+          </a-table>
+        </a-card>
+
+        <a-card title="相关功能" :bordered="false" class="section-card">
           <a-space wrap>
-            <a-button type="primary" @click="openRelated(monitorPath)">实时与趋势监控</a-button>
+            <a-button type="primary" @click="openRelated(monitorPath)">专业监控页面</a-button>
             <a-button @click="openRelated('/alert/incidents')">设备告警</a-button>
             <a-button @click="openRelated('/log-mgmt/entries')">设备日志</a-button>
             <a-button @click="openRelated('/governance')">容量与风险</a-button>
@@ -99,13 +168,28 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { fetchControlResourceOverview, type ControlResourceOverview } from '@/api/ops/dcControl'
+import Chart from '@/components/chart/index.vue'
+import {
+  fetchControlResourceMetricTrend,
+  fetchControlResourceOverview,
+  type ControlResourceOverview,
+  type ControlResourceTrend,
+} from '@/api/ops/dcControl'
+import { fetchCapacityRisks, type CapacityRisk } from '@/api/ops/governance'
+import { fetchIncidents, type Incident } from '@/api/ops/incident'
 
 const route = useRoute()
 const router = useRouter()
 const loading = ref(false)
 const errorMessage = ref('')
 const overview = ref<ControlResourceOverview | null>(null)
+const trend = ref<ControlResourceTrend | null>(null)
+const trendMetricKey = ref('')
+const trendError = ref('')
+const incidents = ref<Incident[]>([])
+const incidentError = ref('')
+const capacities = ref<CapacityRisk[]>([])
+const capacityError = ref('')
 const resourceUid = computed(() => String(route.params.resource_uid || ''))
 const statusText = computed(() => {
   const status = overview.value?.runtime?.status || overview.value?.master.status || 'unknown'
@@ -122,6 +206,32 @@ const monitorPath = computed(() => {
   }
   return paths[overview.value?.master.resource_category || ''] || '/resource-context'
 })
+const supportsCapacity = computed(() => ['host', 'server', 'pc', 'database'].includes(overview.value?.master.resource_category || ''))
+const metricOptions = computed(() =>
+  (overview.value?.runtime?.metrics || []).map((metric) => ({
+    label: `${metric.name}${metric.type ? `（${metric.type}）` : ''}`,
+    value: `${metric.type || ''}\u0000${metric.name}`,
+  }))
+)
+const trendChartOptions = computed(() => ({
+  tooltip: { trigger: 'axis' },
+  grid: { left: 56, right: 24, top: 24, bottom: 48 },
+  xAxis: {
+    type: 'category',
+    data: (trend.value?.points || []).map((point) => formatTime(point.time)),
+    axisLabel: { rotate: 30 },
+  },
+  yAxis: { type: 'value', name: trend.value?.unit || '' },
+  series: [
+    {
+      name: trend.value?.metric_name || '指标趋势',
+      type: 'line',
+      smooth: true,
+      showSymbol: false,
+      data: (trend.value?.points || []).map((point) => Number(point.value.toFixed(2))),
+    },
+  ],
+}))
 
 const deviceLevelText = (level?: string) => ({ core: '核心设备', important: '重要设备', normal: '普通设备' })[level || ''] || '-'
 
@@ -131,6 +241,59 @@ const formatTime = (value?: string) => {
   return Number.isNaN(date.getTime()) ? value : date.toLocaleString()
 }
 
+const formatMetric = (value?: number, unit?: string) => (Number.isFinite(value) ? `${Number(value).toFixed(2)}${unit || ''}` : '-')
+const severityColor = (severity: string) => ({ critical: 'red', major: 'orangered', warning: 'orange', minor: 'gold' })[severity] || 'blue'
+const capacityColor = (status: string) =>
+  ({ 资源不足: 'red', 容量风险: 'orangered', 配置合理: 'green', 资源闲置: 'blue', 数据不足: 'gray' })[status] || 'gray'
+
+const loadTrend = async () => {
+  if (!overview.value) return
+  trendError.value = ''
+  const isNetwork = overview.value.master.resource_category === 'network'
+  const [metricType, metricName] = isNetwork ? ['', ''] : trendMetricKey.value.split('\u0000')
+  if (!isNetwork && !metricName) {
+    trend.value = null
+    return
+  }
+  try {
+    const metric = overview.value.runtime?.metrics.find((item) => item.type === metricType && item.name === metricName)
+    const response = await fetchControlResourceMetricTrend(resourceUid.value, {
+      metric_name: metricName || undefined,
+      metric_type: metricType || undefined,
+      unit: metric?.unit || undefined,
+      window_hours: 24,
+    })
+    if (response.code !== 0 || !response.details) throw new Error(response.message || '趋势数据不存在')
+    trend.value = response.details
+  } catch (error: any) {
+    trend.value = null
+    trendError.value = error?.message || '监控趋势加载失败'
+  }
+}
+
+const loadIncidents = async () => {
+  incidentError.value = ''
+  try {
+    const response: any = await fetchIncidents({ page: 1, page_size: 50, resource_uid: resourceUid.value })
+    incidents.value = (response.details?.data || []).filter((item: Incident) => !['resolved', 'closed'].includes(item.status)).slice(0, 10)
+  } catch (error: any) {
+    incidents.value = []
+    incidentError.value = error?.message || '当前告警加载失败'
+  }
+}
+
+const loadCapacities = async () => {
+  if (!supportsCapacity.value) return
+  capacityError.value = ''
+  try {
+    const response: any = await fetchCapacityRisks({ resource_uid: resourceUid.value })
+    capacities.value = response.details || []
+  } catch (error: any) {
+    capacities.value = []
+    capacityError.value = error?.message || '容量分析加载失败'
+  }
+}
+
 const loadOverview = async () => {
   if (!resourceUid.value) {
     errorMessage.value = '缺少统一设备标识'
@@ -142,6 +305,9 @@ const loadOverview = async () => {
     const response = await fetchControlResourceOverview(resourceUid.value)
     if (response.code !== 0 || !response.details) throw new Error(response.message || '设备概览不存在')
     overview.value = response.details
+    const firstMetric = response.details.runtime?.metrics?.[0]
+    trendMetricKey.value = firstMetric ? `${firstMetric.type || ''}\u0000${firstMetric.name}` : ''
+    await Promise.all([loadTrend(), loadIncidents(), loadCapacities()])
   } catch (error: any) {
     errorMessage.value = error?.message || '加载失败'
   } finally {
diff --git a/src/views/ops/pages/dc/middleware/components/Detail.vue b/src/views/ops/pages/dc/middleware/components/Detail.vue
index 4e6b2c6..35daaaf 100644
--- a/src/views/ops/pages/dc/middleware/components/Detail.vue
+++ b/src/views/ops/pages/dc/middleware/components/Detail.vue
@@ -138,7 +138,7 @@ const handleViewMetrics = async () => {
   metricsVisible.value = true
   metricsLoading.value = true
   try {
-    const response: any = await fetchMiddlewareMetricsLatest(props.record.service_identity)
+    const response: any = await fetchMiddlewareMetricsLatest(props.record.resource_uid)
     metricsData.value = response?.details || null
   } catch (error) {
     console.error('获取最新指标失败:', error)
diff --git a/src/views/ops/pages/dc/middleware/components/FormDialog.vue b/src/views/ops/pages/dc/middleware/components/FormDialog.vue
index ceeabbd..3827c93 100644
--- a/src/views/ops/pages/dc/middleware/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/middleware/components/FormDialog.vue
@@ -14,7 +14,13 @@
       </a-alert>
       <a-row :gutter="20">
         <a-col :span="12"><a-form-item field="name" label="服务名称" required><a-input v-model="formData.name" /></a-form-item></a-col>
-        <a-col :span="12"><a-form-item field="server_identity" label="关联服务器"><a-input v-model="formData.server_identity" placeholder="服务器唯一标识，可选" /></a-form-item></a-col>
+        <a-col :span="12"><a-form-item field="server_resource_uid" label="关联服务器">
+          <a-select v-model="formData.server_resource_uid" allow-clear allow-search :loading="serverLoading" placeholder="请选择服务器，可选">
+            <a-option v-for="server in serverOptions" :key="server.resource_uid" :value="server.resource_uid">
+              {{ server.name }}（{{ server.ip_address || server.host }} / {{ server.server_identity }}）
+            </a-option>
+          </a-select>
+        </a-form-item></a-col>
         <a-col :span="12"><a-form-item field="type" label="中间件产品" required>
           <a-select v-model="formData.type" @change="onTypeChange">
             <a-option value="nginx">Nginx</a-option><a-option value="apache">Apache</a-option><a-option value="tomcat">Tomcat</a-option>
@@ -35,6 +41,12 @@
         <a-col :span="24"><a-form-item field="tags" label="标签"><a-input v-model="formData.tags" placeholder="多个标签用逗号分隔" /></a-form-item></a-col>
       </a-row>
 
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="middleware"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
+
       <PrimaryCollectionFields v-model="primaryCollection" resource-category="middleware" :editing="isEdit" :preferred-port="defaultPorts[formData.type]" />
       <a-alert v-if="!isEdit" type="info">
         采集目标请填写真实只读端点，例如 Nginx stub_status、RocketMQ /metrics、ActiveMQ/Kafka Jolokia read 或 WebSphere Liberty /metrics。
@@ -48,18 +60,22 @@ import { computed, reactive, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { FormInstance } from '@arco-design/web-vue'
 import { createMiddleware, updateMiddleware, type MiddlewareCreateData, type MiddlewareUpdateData } from '@/api/ops/middleware'
+import { fetchServerList, type ServerItem } from '@/api/ops/server'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import { createPrimaryCollectionDraft, persistPrimaryCollectionBinding } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: any }>(), { record: () => ({}) })
 const emit = defineEmits(['update:visible', 'success'])
 const formRef = ref<FormInstance>()
 const confirmLoading = ref(false)
+const serverLoading = ref(false)
+const serverOptions = ref<ServerItem[]>([])
 const primaryCollection = ref(createPrimaryCollectionDraft())
 const isEdit = computed(() => Boolean(props.record?.id))
 const formData = reactive({
-  service_identity: '', server_identity: '', name: '', category: 'middleware', type: '', adapter_mode: 'http_status' as 'http_status' | 'json' | 'prometheus' | 'jolokia',
-  description: '', enabled: true, interval: 60, tags: '',
+  service_identity: '', server_resource_uid: '', name: '', category: 'middleware', type: '', adapter_mode: 'http_status' as 'http_status' | 'json' | 'prometheus' | 'jolokia',
+  description: '', enabled: true, interval: 60, tags: '', policy_ids: [] as number[],
 })
 const rules = { name: [{ required: true, message: '请输入服务名称' }], type: [{ required: true, message: '请选择中间件产品' }], adapter_mode: [{ required: true, message: '请选择只读接口类型' }] }
 const defaultModes: Record<string, typeof formData.adapter_mode> = {
@@ -73,17 +89,37 @@ const modeOptions = computed(() => {
 })
 const defaultPorts: Record<string, number> = { nginx: 80, apache: 80, tomcat: 8080, rabbitmq: 15672, elasticsearch: 9200, activemq: 8161, rocketmq: 5557, kafka: 8778, websphere: 9443, generic: 443 }
 const onTypeChange = () => { formData.adapter_mode = defaultModes[formData.type] || 'json'; primaryCollection.value.port = defaultPorts[formData.type] || 443 }
-watch(() => props.visible, (visible) => {
+const loadServerOptions = async () => {
+  serverLoading.value = true
+  try {
+    const pageSize = 100
+    const items: ServerItem[] = []
+    let page = 1
+    while (true) {
+      const response: any = await fetchServerList({ page, size: pageSize })
+      const details = response?.details || response
+      const chunk: ServerItem[] = details?.data || []
+      items.push(...chunk)
+      if (chunk.length === 0 || chunk.length < pageSize || (details?.total > 0 && items.length >= details.total)) break
+      page += 1
+    }
+    serverOptions.value = items
+  } finally {
+    serverLoading.value = false
+  }
+}
+watch(() => props.visible, async (visible) => {
   if (!visible) return
+  await loadServerOptions()
   if (isEdit.value && props.record) {
     Object.assign(formData, {
-      service_identity: props.record.service_identity || '', server_identity: props.record.server_identity || '', name: props.record.name || '',
+      service_identity: props.record.service_identity || '', server_resource_uid: props.record.server_resource_uid || '', name: props.record.name || '',
       category: 'middleware', type: props.record.type || '', adapter_mode: props.record.adapter_mode || defaultModes[props.record.type] || 'json',
       description: props.record.description || '', enabled: props.record.enabled ?? true, interval: props.record.interval || 60,
       tags: props.record.tags || '',
     })
   } else {
-    Object.assign(formData, { service_identity: '', server_identity: '', name: '', category: 'middleware', type: '', adapter_mode: 'http_status', description: '', enabled: true, interval: 60, tags: '' })
+    Object.assign(formData, { service_identity: '', server_resource_uid: '', name: '', category: 'middleware', type: '', adapter_mode: 'http_status', description: '', enabled: true, interval: 60, tags: '', policy_ids: [] })
     primaryCollection.value = createPrimaryCollectionDraft()
   }
 })
@@ -92,9 +128,9 @@ const handleOk = async () => {
     await formRef.value?.validate()
     confirmLoading.value = true
     const payload: MiddlewareCreateData | MiddlewareUpdateData = {
-      server_identity: formData.server_identity.trim(), name: formData.name.trim(),
+      server_resource_uid: formData.server_resource_uid, name: formData.name.trim(),
       category: 'middleware', type: formData.type, adapter_mode: formData.adapter_mode, description: formData.description.trim(),
-      enabled: formData.enabled, interval: formData.interval, tags: formData.tags.trim(),
+      enabled: formData.enabled, interval: formData.interval, tags: formData.tags.trim(), policy_ids: formData.policy_ids,
     }
     if (isEdit.value) {
       const response: any = await updateMiddleware(props.record.id, payload)
@@ -102,9 +138,9 @@ const handleOk = async () => {
     } else {
       const response: any = await createMiddleware(payload as MiddlewareCreateData)
       if (response?.code !== 0) throw new Error(response?.message || '创建失败')
-      const serviceIdentity = String(response.details?.service_identity || '')
-      if (!serviceIdentity) throw new Error('中间件服务未返回统一标识')
-      await persistPrimaryCollectionBinding(`middleware:${serviceIdentity}`, formData.name, primaryCollection.value)
+      const resourceUID = String(response.details?.resource_uid || '')
+      if (!resourceUID) throw new Error('中间件服务未返回统一资源标识')
+      await persistPrimaryCollectionBinding(resourceUID, formData.name, primaryCollection.value)
     }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
diff --git a/src/views/ops/pages/dc/network/components/Detail.vue b/src/views/ops/pages/dc/network/components/Detail.vue
index 4e430ae..6d942be 100644
--- a/src/views/ops/pages/dc/network/components/Detail.vue
+++ b/src/views/ops/pages/dc/network/components/Detail.vue
@@ -11,6 +11,7 @@
       </div>
       <a-space>
         <a-button type="primary" @click="$emit('edit')">编辑</a-button>
+        <a-button type="outline" @click="handleViewMetrics">查看最新指标</a-button>
         <a-button status="danger" @click="$emit('delete')">删除</a-button>
       </a-space>
     </div>
@@ -46,16 +47,59 @@
       <a-alert type="info" style="margin-bottom: 12px">AP 由控制器只读发现，不能在本页面手工创建。</a-alert>
       <a-table :data="accessPoints" :columns="accessPointColumns" row-key="ap_identity" :pagination="{ pageSize: 10 }" />
     </template>
+
+    <a-drawer v-model:visible="metricsVisible" :width="860" title="最新指标数据" :footer="false" unmount-on-close>
+      <a-spin :loading="metricsLoading" style="width: 100%">
+        <div v-if="metricsData?.metrics?.length">
+          <a-alert type="info" style="margin-bottom: 16px">
+            <template #message>
+              <div>最新采集时间：{{ formatTime(metricsData.latest_timestamp) }}</div>
+              <div>指标数量：{{ metricsData.count }}</div>
+            </template>
+          </a-alert>
+          <a-row :gutter="16">
+            <a-col v-for="(item, index) in metricsData.metrics" :key="`${item.metric_name}-${item.series_key || index}`" :span="8">
+              <a-card class="metric-card" :bordered="false">
+                <div class="metric-name">{{ item.metric_name }}</div>
+                <div v-if="metricSeriesLabel(item)" class="metric-series">{{ metricSeriesLabel(item) }}</div>
+                <div class="metric-value">{{ item.metric_value }} {{ item.metric_unit || '' }}</div>
+              </a-card>
+            </a-col>
+          </a-row>
+          <a-divider orientation="left">近 24 小时趋势</a-divider>
+          <a-select
+            v-model="selectedMetric"
+            :options="metricOptions"
+            placeholder="选择指标"
+            allow-search
+            style="width: 360px; max-width: 100%; margin-bottom: 12px"
+            @change="loadTrend"
+          />
+          <a-spin :loading="trendLoading" style="width: 100%">
+            <Chart v-if="trendRows.length" :options="trendChartOptions" height="300px" />
+            <a-empty v-else-if="!trendLoading" description="所选指标近 24 小时暂无数据" />
+          </a-spin>
+        </div>
+        <a-empty v-else-if="!metricsLoading" description="暂无指标数据" />
+      </a-spin>
+    </a-drawer>
   </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue'
+import dayjs from 'dayjs'
+import { Message } from '@arco-design/web-vue'
+import Chart from '@/components/chart/index.vue'
 import ImportantInterfacesPanel from '../../components/ImportantInterfacesPanel.vue'
 import ConfigBackupPanel from '../../components/ConfigBackupPanel.vue'
 import {
   fetchNetworkDeviceAccessPoints,
+  fetchNetworkMetricsLatest,
+  fetchNetworkMetricsTimeseries,
+  type NetworkDeviceMetric,
   type NetworkDeviceService,
+  type NetworkMetricsLatestData,
   type WirelessAccessPoint,
 } from '@/api/ops/network-device'
 
@@ -67,16 +111,80 @@ const props = defineProps<Props>()
 defineEmits(['edit', 'delete'])
 const accessPoints = ref<WirelessAccessPoint[]>([])
 const inventoryLoading = ref(false)
+const metricsVisible = ref(false)
+const metricsLoading = ref(false)
+const metricsData = ref<NetworkMetricsLatestData | null>(null)
+const selectedMetric = ref('')
+const trendLoading = ref(false)
+const trendRows = ref<NetworkDeviceMetric[]>([])
 const accessPointColumns = [
   { title: '名称', dataIndex: 'name' }, { title: 'IP', dataIndex: 'ip_address' }, { title: 'MAC', dataIndex: 'mac_address' },
   { title: '型号', dataIndex: 'model' }, { title: '状态', dataIndex: 'status', width: 100 },
   { title: '射频数', dataIndex: 'radio_count', width: 90 }, { title: '客户端数', dataIndex: 'client_count', width: 100 },
 ]
 
+const metricOptions = computed(() => {
+  const names = new Set((metricsData.value?.metrics || []).map((item) => item.metric_name))
+  return [...names].sort().map((value) => ({ label: value, value }))
+})
+
+const parseMetricLabels = (metric: NetworkDeviceMetric) => {
+  if (!metric.labels) return {} as Record<string, string>
+  try {
+    const value = JSON.parse(metric.labels)
+    return value && typeof value === 'object' ? value as Record<string, string> : {}
+  } catch {
+    return {} as Record<string, string>
+  }
+}
+
+const metricSeriesLabel = (metric: NetworkDeviceMetric) => {
+  const labels = parseMetricLabels(metric)
+  const component = labels.component_name || labels.component_description
+  const index = labels.index ? `索引 ${labels.index}` : ''
+  const group = labels.group ? `分组 ${labels.group}` : ''
+  return [component, index, group].filter(Boolean).join(' / ')
+}
+
+const trendSeriesName = (seriesKey: string, metric?: NetworkDeviceMetric) => {
+  const label = metric ? metricSeriesLabel(metric) : ''
+  if (label) return label
+  return seriesKey === 'default' ? selectedMetric.value : seriesKey.slice(0, 8)
+}
+
+const trendChartOptions = computed(() => {
+  const groups = new Map<string, NetworkDeviceMetric[]>()
+  for (const row of trendRows.value) {
+    const key = row.series_key || 'default'
+    const current = groups.get(key) || []
+    current.push(row)
+    groups.set(key, current)
+  }
+  const timestamps = [...new Set(trendRows.value.map((row) => row.timestamp || ''))].filter(Boolean).sort()
+  const unit = trendRows.value.find((row) => row.metric_unit)?.metric_unit || ''
+  return {
+    tooltip: { trigger: 'axis' },
+    legend: { type: 'scroll', top: 0 },
+    grid: { left: '3%', right: '4%', top: 42, bottom: 42, containLabel: true },
+    xAxis: { type: 'category', boundaryGap: false, data: timestamps.map((item) => dayjs(item).format('MM-DD HH:mm')) },
+    yAxis: { type: 'value', name: unit },
+    series: [...groups.entries()].map(([seriesKey, rows]) => {
+      const values = new Map(rows.map((row) => [row.timestamp || '', Number(row.metric_value)]))
+      return {
+        name: trendSeriesName(seriesKey, rows[0]), type: 'line', smooth: true, connectNulls: true,
+        showSymbol: timestamps.length <= 48, data: timestamps.map((timestamp) => values.get(timestamp) ?? null),
+      }
+    }),
+  }
+})
+
 watch(
   () => props.record.id,
   async (id) => {
     accessPoints.value = []
+    metricsData.value = null
+    selectedMetric.value = ''
+    trendRows.value = []
     if (!id) return
     inventoryLoading.value = true
     try {
@@ -89,6 +197,46 @@ watch(
   { immediate: true }
 )
 
+const handleViewMetrics = async () => {
+  metricsVisible.value = true
+  metricsLoading.value = true
+  try {
+    const response: any = await fetchNetworkMetricsLatest(props.record.resource_uid || '')
+    metricsData.value = response?.details || null
+    selectedMetric.value = metricOptions.value[0]?.value || ''
+    if (selectedMetric.value) await loadTrend()
+  } catch (error) {
+    console.error('获取网络设备指标失败:', error)
+    Message.error('获取网络设备指标失败')
+    metricsData.value = null
+  } finally {
+    metricsLoading.value = false
+  }
+}
+
+const loadTrend = async () => {
+  if (!selectedMetric.value || !props.record.resource_uid) {
+    trendRows.value = []
+    return
+  }
+  trendLoading.value = true
+  try {
+    const end = dayjs()
+    const response: any = await fetchNetworkMetricsTimeseries(props.record.resource_uid, {
+      metric_name: selectedMetric.value,
+      start_time: end.subtract(24, 'hour').toISOString(),
+      end_time: end.toISOString(),
+    })
+    trendRows.value = response?.details?.metrics || []
+  } catch (error) {
+    console.error('获取网络设备指标趋势失败:', error)
+    Message.error('获取网络设备指标趋势失败')
+    trendRows.value = []
+  } finally {
+    trendLoading.value = false
+  }
+}
+
 const statusMap: Record<string, { text: string; color: string }> = {
   online: { text: '在线', color: 'green' },
   offline: { text: '离线', color: 'red' },
@@ -153,4 +301,26 @@ const formatUptime = (uptime?: number) => {
   font-weight: 600;
   margin-bottom: 8px;
 }
+
+.metric-card {
+  margin-bottom: 16px;
+}
+
+.metric-name {
+  color: var(--color-text-3);
+  font-size: 14px;
+  margin-bottom: 8px;
+}
+
+.metric-series {
+  color: var(--color-text-3);
+  font-size: 12px;
+  margin-bottom: 4px;
+}
+
+.metric-value {
+  color: var(--color-text-1);
+  font-size: 24px;
+  font-weight: 600;
+}
 </style>
diff --git a/src/views/ops/pages/dc/network/components/FormDialog.vue b/src/views/ops/pages/dc/network/components/FormDialog.vue
index 974e4d5..0029850 100644
--- a/src/views/ops/pages/dc/network/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/network/components/FormDialog.vue
@@ -54,11 +54,17 @@
       <a-form-item field="description" label="描述">
         <a-textarea v-model="formData.description" :rows="2" />
       </a-form-item>
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="network"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
 
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="network"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.host"
       />
@@ -73,6 +79,7 @@ import type { FormInstance } from '@arco-design/web-vue'
 import { createNetworkDevice, updateNetworkDevice } from '@/api/ops/network-device'
 import DeviceMasterFields from '../../components/DeviceMasterFields.vue'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import {
   createDeviceMasterState,
   createPrimaryCollectionDraft,
@@ -80,10 +87,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: any }>(), { record: () => ({}) })
@@ -100,7 +104,7 @@ const isEdit = computed(() => !!props.record?.id)
 const manufacturerCode = computed(
   () => masterContext.value?.manufacturers.find((item) => item.id === masterData.value.manufacturer_id)?.code || ''
 )
-const formData = reactive({ name: '', category: 'switch', host: '', location: '', description: '', tags: '' })
+const formData = reactive({ name: '', category: 'switch', host: '', location: '', description: '', tags: '', policy_ids: [] as number[] })
 const rules = {
   name: [{ required: true, message: '请输入设备名称' }],
   category: [{ required: true, message: '请选择设备类型' }],
@@ -125,6 +129,7 @@ watch(
       masterContext.value ||= await loadDeviceMasterContext('NETWORK')
       if (isEdit.value) {
         if (!props.record.resource_uid) throw new Error('该网络设备缺少统一设备标识，无法编辑')
+        if (!props.record.service_identity) throw new Error('该网络设备缺少服务标识，无法加载告警策略')
         const loaded = await loadDeviceMaster(props.record.resource_uid)
         masterData.value = loaded.state
         existingAsset.value = loaded.asset
@@ -145,7 +150,7 @@ watch(
         primaryCollection.value = createPrimaryCollectionDraft()
         existingAsset.value = null
         tagList.value = []
-        Object.assign(formData, { name: '', category: 'switch', host: '', location: '', description: '', tags: '' })
+        Object.assign(formData, { name: '', category: 'switch', host: '', location: '', description: '', tags: '', policy_ids: [] })
       }
     } catch (error: any) {
       Message.error(error?.message || '加载网络设备信息失败')
@@ -156,13 +161,11 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'NETWORK',
       state: masterData.value,
       assetName: formData.name,
@@ -174,7 +177,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const manufacturer = masterContext.value.manufacturers.find((item) => item.id === masterData.value.manufacturer_id)
     const payload = {
       resource_uid: master.resourceUid,
@@ -189,25 +191,22 @@ const handleOk = async () => {
       description: formData.description.trim(),
       tags: formData.tags,
       enabled: true,
+      policy_ids: formData.policy_ids,
     }
     const response: any = isEdit.value ? await updateNetworkDevice(props.record.id, payload) : await createNetworkDevice(payload)
     if (response?.code !== 0) throw new Error(response?.message || '保存网络设备失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`网络设备已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '保存失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '保存失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/network/index.vue b/src/views/ops/pages/dc/network/index.vue
index 799992f..12611bb 100644
--- a/src/views/ops/pages/dc/network/index.vue
+++ b/src/views/ops/pages/dc/network/index.vue
@@ -102,7 +102,7 @@ import {
   type NetworkDeviceService,
   type NetworkDeviceQueryParams,
 } from '@/api/ops/network-device'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 
 const loading = ref(false)
 const tableData = ref<NetworkDeviceService[]>([])
@@ -288,16 +288,17 @@ const handleDetailDelete = () => {
 const handleDelete = (record: NetworkDeviceService) => {
   Modal.confirm({
     title: '确认删除',
-    content: `确认删除设备「${record.name}」吗？删除为软删除，建议先停用后再执行。`,
+    content: `确认删除设备「${record.name}」吗？删除将同步清理该设备的监控配置和采集任务。`,
     okButtonProps: { status: 'danger' },
     onOk: async () => {
       try {
         if (!record.resource_uid) throw new Error('该网络设备缺少统一设备标识，无法删除')
-        await deleteAsset(record.resource_uid)
-        Message.success('删除成功')
-        fetchList()
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') Message.success('删除成功')
+        else Message.info('设备正在删除，系统将自动完成清理')
+        await fetchList()
       } catch (error: any) {
-        Message.error(error?.response?.data?.message || '删除失败')
+        Message.error(error?.response?.data?.message || error?.message || '删除失败')
       }
     },
   })
diff --git a/src/views/ops/pages/dc/pc/components/FormDialog.vue b/src/views/ops/pages/dc/pc/components/FormDialog.vue
index d7fdbcb..b7f4368 100644
--- a/src/views/ops/pages/dc/pc/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/pc/components/FormDialog.vue
@@ -64,10 +64,17 @@
       </a-row>
       <a-form-item field="description" label="描述"><a-textarea v-model="formData.description" :rows="2" /></a-form-item>
 
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="pc"
+        :resource-uid="record?.resource_uid || ''"
+      />
+
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="pc"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.management_ip"
       />
@@ -81,6 +88,7 @@ import { Message } from '@arco-design/web-vue'
 import type { FormInstance } from '@arco-design/web-vue'
 import { createPC, updatePC, type PCItem } from '@/api/ops/pc'
 import DeviceMasterFields from '../../components/DeviceMasterFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
 import {
   createDeviceMasterState,
@@ -89,10 +97,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: PCItem | null }>(), { record: null })
@@ -119,6 +124,7 @@ const formData = reactive({
   server_type: 'physical',
   tags: '',
   location: '',
+  policy_ids: [] as number[],
 })
 const rules = {
   name: [{ required: true, message: '请输入办公PC名称' }],
@@ -176,6 +182,7 @@ watch(
           server_type: 'physical',
           tags: '',
           location: '',
+          policy_ids: [],
         })
       }
     } catch (error: any) {
@@ -187,13 +194,11 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'TERMINAL',
       state: masterData.value,
       assetName: formData.name,
@@ -205,7 +210,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const payload = {
       resource_uid: master.resourceUid,
       asset_id: master.assetId,
@@ -219,25 +223,22 @@ const handleOk = async () => {
       server_type: formData.server_type,
       tags: formData.tags,
       location: formData.location.trim(),
+      policy_ids: formData.policy_ids,
     }
     const response: any = isEdit.value && props.record ? await updatePC(props.record.id, payload) : await createPC(payload)
     if (response?.code !== 0) throw new Error(response?.message || '保存办公PC失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`办公PC已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '保存失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '保存失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/pc/index.vue b/src/views/ops/pages/dc/pc/index.vue
index ad749f0..bd52dac 100644
--- a/src/views/ops/pages/dc/pc/index.vue
+++ b/src/views/ops/pages/dc/pc/index.vue
@@ -52,7 +52,7 @@ import { Message, Modal } from '@arco-design/web-vue'
 import { IconPlus } from '@arco-design/web-vue/es/icon'
 import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 import { collectResourceNow } from '@/api/ops/collection'
 import { fetchPCList, type PCItem } from '@/api/ops/pc'
 import { searchFormConfig } from './config/search-form'
@@ -121,10 +121,15 @@ const handleDelete = (record: PCItem) => {
     title: '确认删除',
     content: `删除统一设备“${record.name}”后，资产、机房关联和监控配置会同步移除。确认继续吗？`,
     onOk: async () => {
-      const response: any = await deleteAsset(record.resource_uid)
-      if (response?.code !== 0) throw new Error(response?.message || '删除失败')
-      Message.success('删除成功')
-      await fetchPCs()
+      try {
+        if (!record.resource_uid) throw new Error('该 PC 缺少统一设备标识，无法删除')
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') Message.success('删除成功')
+        else Message.info('设备正在删除，系统将自动完成清理')
+        await fetchPCs()
+      } catch (error: any) {
+        Message.error(error?.response?.data?.message || error?.message || '删除 PC 失败')
+      }
     },
   })
 }
diff --git a/src/views/ops/pages/dc/security/components/Detail.vue b/src/views/ops/pages/dc/security/components/Detail.vue
index 9a4fbd6..68aedab 100644
--- a/src/views/ops/pages/dc/security/components/Detail.vue
+++ b/src/views/ops/pages/dc/security/components/Detail.vue
@@ -219,7 +219,7 @@ const handleViewMetrics = async () => {
   metricsVisible.value = true
   metricsLoading.value = true
   try {
-    const response: any = await fetchSecurityMetricsLatest(props.record.service_identity)
+    const response: any = await fetchSecurityMetricsLatest(props.record.resource_uid)
     metricsData.value = response?.details || null
     selectedMetric.value = metricOptions.value[0]?.value || ''
     if (selectedMetric.value) await loadTrend()
@@ -233,14 +233,14 @@ const handleViewMetrics = async () => {
 }
 
 const loadTrend = async () => {
-  if (!selectedMetric.value || !props.record.service_identity) {
+  if (!selectedMetric.value || !props.record.resource_uid) {
     trendRows.value = []
     return
   }
   trendLoading.value = true
   try {
     const end = dayjs()
-    const response: any = await fetchSecurityMetricsTimeseries(props.record.service_identity, {
+    const response: any = await fetchSecurityMetricsTimeseries(props.record.resource_uid, {
       metric_name: selectedMetric.value,
       start_time: end.subtract(24, 'hour').toISOString(),
       end_time: end.toISOString(),
diff --git a/src/views/ops/pages/dc/security/components/FormDialog.vue b/src/views/ops/pages/dc/security/components/FormDialog.vue
index 1015c57..887987c 100644
--- a/src/views/ops/pages/dc/security/components/FormDialog.vue
+++ b/src/views/ops/pages/dc/security/components/FormDialog.vue
@@ -46,16 +46,17 @@
       <a-form-item field="description" label="描述">
         <a-textarea v-model="formData.description" :rows="2" />
       </a-form-item>
-      <a-form-item field="policy_ids" label="附加告警策略">
-        <a-select v-model="formData.policy_ids" multiple allow-clear placeholder="可选；模板内规则之外的设备级策略">
-          <a-option v-for="policy in policyOptions" :key="policy.id" :value="policy.id">{{ policy.name }}</a-option>
-        </a-select>
-      </a-form-item>
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="security"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
 
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="security"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.management_ip"
       />
@@ -68,9 +69,9 @@ import { computed, reactive, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import type { FormInstance } from '@arco-design/web-vue'
 import { createSecurityService, updateSecurityService, SECURITY_TYPE_OPTIONS, type SecurityServiceFormData } from '@/api/ops/security'
-import { fetchPolicyOptions, fetchServicePolicyBindings, type PolicyOptionItem } from '@/api/ops/alertPolicy'
 import DeviceMasterFields from '../../components/DeviceMasterFields.vue'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import {
   createDeviceMasterState,
   createPrimaryCollectionDraft,
@@ -78,10 +79,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: any }>(), { record: () => ({}) })
@@ -93,7 +91,6 @@ const masterData = ref(createDeviceMasterState())
 const primaryCollection = ref(createPrimaryCollectionDraft())
 const masterContext = ref<DeviceMasterContext | null>(null)
 const existingAsset = ref<Record<string, any> | null>(null)
-const policyOptions = ref<PolicyOptionItem[]>([])
 const tagList = ref<string[]>([])
 const isEdit = computed(() => !!props.record?.id)
 const manufacturerCode = computed(
@@ -122,18 +119,10 @@ watch(
     masterLoading.value = true
     try {
       masterContext.value ||= await loadDeviceMasterContext('SECURITY')
-      if (!policyOptions.value.length) {
-        const response: any = await fetchPolicyOptions({ enabled: true })
-        policyOptions.value = Array.isArray(response) ? response : response?.details?.data || response?.details || []
-      }
       if (isEdit.value) {
         if (!props.record.resource_uid) throw new Error('该安全设备缺少统一设备标识，无法编辑')
         if (!props.record.service_identity) throw new Error('该安全设备缺少服务标识，无法加载告警策略')
-        const [loaded, bindingResponse] = await Promise.all([
-          loadDeviceMaster(props.record.resource_uid),
-          fetchServicePolicyBindings('security', props.record.service_identity),
-        ])
-        if (bindingResponse.code !== 0) throw new Error(bindingResponse.message || '加载告警策略绑定失败')
+        const loaded = await loadDeviceMaster(props.record.resource_uid)
         masterData.value = loaded.state
         existingAsset.value = loaded.asset
         Object.assign(formData, {
@@ -142,7 +131,6 @@ watch(
           management_ip: loaded.asset.management_ip || '',
           description: props.record.description || loaded.asset.description || '',
           tags: props.record.tags || '',
-          policy_ids: bindingResponse.details?.policy_ids || [],
         })
         tagList.value = formData.tags
           .split(',')
@@ -164,13 +152,11 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'SECURITY',
       state: masterData.value,
       assetName: formData.name,
@@ -181,7 +167,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const payload: SecurityServiceFormData = {
       resource_uid: master.resourceUid,
       asset_id: master.assetId,
@@ -198,22 +183,18 @@ const handleOk = async () => {
     }
     const response: any = isEdit.value ? await updateSecurityService(props.record.id, payload) : await createSecurityService(payload)
     if (response?.code !== 0) throw new Error(response?.message || '保存安全设备失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`安全设备已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '保存失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '保存失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/security/index.vue b/src/views/ops/pages/dc/security/index.vue
index 2d1ef84..b26cdd4 100644
--- a/src/views/ops/pages/dc/security/index.vue
+++ b/src/views/ops/pages/dc/security/index.vue
@@ -102,7 +102,7 @@ import FormDialog from './components/FormDialog.vue'
 import Detail from './components/Detail.vue'
 import { columns as columnsConfig } from './config/columns'
 import { fetchSecurityServiceList, STATUS_MAP, type SecurityServiceItem, type SecurityServiceListParams } from '@/api/ops/security'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 
 const loading = ref(false)
 const tableData = ref<SecurityServiceItem[]>([])
@@ -225,12 +225,13 @@ const handleDelete = (record: SecurityServiceItem) => {
     onOk: async () => {
       try {
         if (!record.resource_uid) throw new Error('该安全设备缺少统一设备标识，无法删除')
-        await deleteAsset(record.resource_uid)
-        Message.success('删除成功')
-        fetchSecurityServiceData()
-      } catch (error) {
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') Message.success('删除成功')
+        else Message.info('设备正在删除，系统将自动完成清理')
+        await fetchSecurityServiceData()
+      } catch (error: any) {
         console.error('删除安全设备服务失败:', error)
-        Message.error('删除失败')
+        Message.error(error?.response?.data?.message || error?.message || '删除失败')
       }
     },
   })
diff --git a/src/views/ops/pages/dc/server/components/FileLogMonitorDialog.vue b/src/views/ops/pages/dc/server/components/FileLogMonitorDialog.vue
new file mode 100644
index 0000000..6966283
--- /dev/null
+++ b/src/views/ops/pages/dc/server/components/FileLogMonitorDialog.vue
@@ -0,0 +1,245 @@
+<template>
+  <a-modal
+    :visible="visible"
+    :title="`${server?.name || ''} 文件日志采集`"
+    width="1040px"
+    :footer="false"
+    @cancel="close"
+    @update:visible="updateVisible"
+  >
+    <a-alert type="info" style="margin-bottom: 16px">
+      Linux Agent 只读取管理员指定的固定日志文件，不执行命令，也不会修改或删除服务器上的文件。中心日志服务成功接收后才会确认读取位置；日志轮转或文件截断后会从新文件起点继续读取。
+    </a-alert>
+    <a-space style="margin-bottom: 12px">
+      <a-button type="primary" @click="openCreate">
+        <template #icon><icon-plus /></template>
+        新增文件日志
+      </a-button>
+      <a-button :loading="loading" @click="loadRows">
+        <template #icon><icon-refresh /></template>
+        刷新
+      </a-button>
+    </a-space>
+    <a-table :columns="columns" :data="rows" :loading="loading" :pagination="false" row-key="id">
+      <template #file_path="{ record }"><a-typography-text copyable>{{ record.file_path }}</a-typography-text></template>
+      <template #multiline_mode="{ record }">{{ record.multiline_mode === 'start_pattern' ? '多行合并' : '每行一条' }}</template>
+      <template #enabled="{ record }">
+        <a-tag :color="record.enabled ? 'green' : 'gray'">{{ record.enabled ? '已启用' : '已停用' }}</a-tag>
+      </template>
+      <template #read_state="{ record }">
+        <a-tooltip :content="record.last_error || '最近读取正常'">
+          <a-tag :color="record.last_error ? 'red' : record.last_read_at ? 'green' : 'gray'">
+            {{ record.last_error ? '读取异常' : record.last_read_at ? '正常' : '尚未采集' }}
+          </a-tag>
+        </a-tooltip>
+      </template>
+      <template #last_read_at="{ record }">{{ formatTime(record.last_read_at) }}</template>
+      <template #actions="{ record }">
+        <a-space>
+          <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
+          <a-button type="text" status="danger" size="small" @click="removeRow(record)">删除</a-button>
+        </a-space>
+      </template>
+    </a-table>
+
+    <a-modal
+      v-model:visible="editorVisible"
+      :title="editing?.id ? '编辑文件日志' : '新增文件日志'"
+      :confirm-loading="saving"
+      width="640px"
+      @ok="saveRow"
+    >
+      <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
+        <a-form-item field="name" label="日志名称" required>
+          <a-input v-model="form.name" placeholder="例如：门诊接口服务日志" :max-length="100" />
+        </a-form-item>
+        <a-form-item field="file_path" label="Linux 日志文件绝对路径" required>
+          <a-input v-model="form.file_path" placeholder="例如：/opt/hospital/logs/application.log" />
+        </a-form-item>
+        <a-form-item field="encoding" label="文件编码" required>
+          <a-select v-model="form.encoding">
+            <a-option value="utf-8">UTF-8</a-option>
+            <a-option value="gb18030">GB18030</a-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item field="multiline_mode" label="日志边界" required>
+          <a-radio-group v-model="form.multiline_mode">
+            <a-radio value="single_line">每行一条日志</a-radio>
+            <a-radio value="start_pattern">按起始正则合并多行</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item
+          v-if="form.multiline_mode === 'start_pattern'"
+          field="multiline_start_pattern"
+          label="每条日志的起始正则"
+          required
+        >
+          <a-input v-model="form.multiline_start_pattern" placeholder="例如：^\\d{4}-\\d{2}-\\d{2}" />
+          <template #extra>匹配到该正则的行视为一条新日志开始，后续未匹配行并入该条日志。</template>
+        </a-form-item>
+        <a-form-item field="enabled" label="是否启用">
+          <a-switch v-model="form.enabled" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from 'vue'
+import { Message, Modal, type FormInstance } from '@arco-design/web-vue'
+import { IconPlus, IconRefresh } from '@arco-design/web-vue/es/icon'
+import {
+  createServerFileLogMonitor,
+  deleteServerFileLogMonitor,
+  fetchServerFileLogMonitors,
+  updateServerFileLogMonitor,
+  type ServerFileLogMonitor,
+  type ServerFileLogMonitorInput,
+  type ServerItem,
+} from '@/api/ops/server'
+
+const props = withDefaults(defineProps<{ visible: boolean; server?: ServerItem | null }>(), { server: null })
+const emit = defineEmits(['update:visible', 'success'])
+const rows = ref<ServerFileLogMonitor[]>([])
+const loading = ref(false)
+const saving = ref(false)
+const editorVisible = ref(false)
+const editing = ref<ServerFileLogMonitor | null>(null)
+const formRef = ref<FormInstance>()
+const form = reactive<ServerFileLogMonitorInput>({
+  name: '',
+  file_path: '',
+  encoding: 'utf-8',
+  multiline_mode: 'single_line',
+  multiline_start_pattern: '',
+  enabled: true,
+})
+const rules = {
+  name: [{ required: true, message: '请输入日志名称' }],
+  file_path: [
+    { required: true, message: '请输入日志文件路径' },
+    { match: /^\/(?!$)/, message: '请输入明确的 Linux 绝对文件路径' },
+  ],
+  encoding: [{ required: true, message: '请选择文件编码' }],
+  multiline_mode: [{ required: true, message: '请选择日志边界' }],
+  multiline_start_pattern: [{ required: true, message: '请输入起始正则' }],
+}
+const columns = [
+  { title: '日志名称', dataIndex: 'name', ellipsis: true, tooltip: true, width: 170 },
+  { title: '固定文件路径', slotName: 'file_path', ellipsis: true, tooltip: true },
+  { title: '编码', dataIndex: 'encoding', width: 100 },
+  { title: '日志边界', slotName: 'multiline_mode', width: 110 },
+  { title: '配置状态', slotName: 'enabled', width: 100 },
+  { title: '读取状态', slotName: 'read_state', width: 110 },
+  { title: '最近读取', slotName: 'last_read_at', width: 180 },
+  { title: '操作', slotName: 'actions', width: 130, fixed: 'right' },
+]
+
+const unwrapError = (error: any, fallback: string) => error?.response?.data?.message || error?.message || fallback
+
+const loadRows = async () => {
+  if (!props.server?.id) return
+  loading.value = true
+  try {
+    const response = await fetchServerFileLogMonitors(props.server.id)
+    rows.value = response.details?.list || []
+  } catch (error: any) {
+    Message.error(unwrapError(error, '加载文件日志配置失败'))
+  } finally {
+    loading.value = false
+  }
+}
+
+const resetForm = (row?: ServerFileLogMonitor) => {
+  Object.assign(form, {
+    name: row?.name || '',
+    file_path: row?.file_path || '',
+    encoding: row?.encoding || 'utf-8',
+    multiline_mode: row?.multiline_mode || 'single_line',
+    multiline_start_pattern: row?.multiline_start_pattern || '',
+    enabled: row?.enabled ?? true,
+  })
+  formRef.value?.clearValidate()
+}
+
+const openCreate = () => {
+  editing.value = null
+  resetForm()
+  editorVisible.value = true
+}
+
+const openEdit = (row: ServerFileLogMonitor) => {
+  editing.value = row
+  resetForm(row)
+  editorVisible.value = true
+}
+
+const saveRow = async () => {
+  if (!props.server?.id) return
+  const errors = await formRef.value?.validate()
+  if (errors) return
+  saving.value = true
+  try {
+    const payload: ServerFileLogMonitorInput = {
+      name: form.name.trim(),
+      file_path: form.file_path.trim(),
+      encoding: form.encoding,
+      multiline_mode: form.multiline_mode,
+      multiline_start_pattern: form.multiline_mode === 'start_pattern' ? form.multiline_start_pattern.trim() : '',
+      enabled: form.enabled,
+    }
+    const response = editing.value
+      ? await updateServerFileLogMonitor(props.server.id, editing.value.id, payload)
+      : await createServerFileLogMonitor(props.server.id, payload)
+    if (response.code !== 0) throw new Error(response.message || '保存文件日志配置失败')
+    Message.success(editing.value ? '文件日志配置已更新' : '文件日志配置已新增')
+    editorVisible.value = false
+    await loadRows()
+    emit('success')
+  } catch (error: any) {
+    Message.error(unwrapError(error, '保存文件日志配置失败'))
+  } finally {
+    saving.value = false
+  }
+}
+
+const removeRow = (row: ServerFileLogMonitor) => {
+  if (!props.server?.id) return
+  Modal.confirm({
+    title: '删除文件日志配置',
+    content: `确认停止读取并删除“${row.name}”吗？已经进入日志中心的数据不会删除。`,
+    onOk: async () => {
+      try {
+        const response = await deleteServerFileLogMonitor(props.server!.id, row.id)
+        if (response.code !== 0) throw new Error(response.message || '删除文件日志配置失败')
+        Message.success('文件日志配置已删除')
+        await loadRows()
+        emit('success')
+      } catch (error: any) {
+        Message.error(unwrapError(error, '删除文件日志配置失败'))
+      }
+    },
+  })
+}
+
+const formatTime = (value?: string | null) => {
+  if (!value) return '-'
+  const date = new Date(value)
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN')
+}
+
+const close = () => emit('update:visible', false)
+const updateVisible = (value: boolean) => emit('update:visible', value)
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) loadRows()
+    else {
+      rows.value = []
+      editorVisible.value = false
+    }
+  }
+)
+</script>
diff --git a/src/views/ops/pages/dc/server/components/ServerFormDialog.vue b/src/views/ops/pages/dc/server/components/ServerFormDialog.vue
index c2f4339..6d1ce60 100644
--- a/src/views/ops/pages/dc/server/components/ServerFormDialog.vue
+++ b/src/views/ops/pages/dc/server/components/ServerFormDialog.vue
@@ -77,26 +77,17 @@
       <a-form-item field="description" label="描述">
         <a-textarea v-model="formData.description" :rows="2" />
       </a-form-item>
-
-      <a-divider orientation="left">实例监控项</a-divider>
-      <a-alert type="info" style="margin-bottom: 16px">进程和端口属于当前服务器的独立配置，不会被厂商采集模板覆盖。</a-alert>
-      <a-row :gutter="20">
-        <a-col :span="12">
-          <a-form-item field="monitored_processes" label="核心进程">
-            <a-input-tag v-model="formData.monitored_processes" placeholder="输入进程名称后回车" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item field="monitored_ports" label="监听端口">
-            <a-input-tag v-model="portTags" placeholder="输入端口号后回车" />
-          </a-form-item>
-        </a-col>
-      </a-row>
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="host"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
 
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="host"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.management_ip"
       />
@@ -111,6 +102,7 @@ import type { FormInstance } from '@arco-design/web-vue'
 import { createServer, updateServer, type ServerFormData, type ServerItem } from '@/api/ops/server'
 import DeviceMasterFields from '../../components/DeviceMasterFields.vue'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import {
   createDeviceMasterState,
   createPrimaryCollectionDraft,
@@ -118,10 +110,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: ServerItem | null }>(), { record: null })
@@ -134,7 +123,6 @@ const primaryCollection = ref(createPrimaryCollectionDraft())
 const masterContext = ref<DeviceMasterContext | null>(null)
 const existingAsset = ref<Record<string, any> | null>(null)
 const tagList = ref<string[]>([])
-const portTags = ref<string[]>([])
 const isEdit = computed(() => !!props.record?.id)
 const manufacturerCode = computed(
   () => masterContext.value?.manufacturers.find((item) => item.id === masterData.value.manufacturer_id)?.code || ''
@@ -149,8 +137,7 @@ const formData = reactive({
   server_type: 'physical',
   tags: '',
   location: '',
-  monitored_processes: [] as string[],
-  monitored_ports: [] as number[],
+  policy_ids: [] as number[],
 })
 const rules = {
   name: [{ required: true, message: '请输入服务器名称' }],
@@ -160,11 +147,6 @@ const rules = {
 watch(tagList, (value) => {
   formData.tags = value.join(',')
 })
-watch(portTags, (value) => {
-  formData.monitored_ports = [
-    ...new Set(value.map((item) => Number(item)).filter((item) => Number.isInteger(item) && item >= 1 && item <= 65535)),
-  ]
-})
 watch(
   () => formData.management_ip,
   (value) => {
@@ -180,6 +162,7 @@ watch(
       masterContext.value ||= await loadDeviceMasterContext('SERVER')
       if (isEdit.value && props.record) {
         if (!props.record.resource_uid) throw new Error('该服务器缺少统一设备标识，无法编辑')
+        if (!props.record.server_identity) throw new Error('该服务器缺少服务标识，无法加载告警策略')
         const loaded = await loadDeviceMaster(props.record.resource_uid)
         masterData.value = loaded.state
         existingAsset.value = loaded.asset
@@ -193,20 +176,16 @@ watch(
           server_type: props.record.server_type || 'physical',
           tags: props.record.tags || '',
           location: props.record.location || loaded.asset.location || '',
-          monitored_processes: [...(props.record.monitored_processes || [])],
-          monitored_ports: [...(props.record.monitored_ports || [])],
         })
         tagList.value = formData.tags
           .split(',')
           .map((item) => item.trim())
           .filter(Boolean)
-        portTags.value = formData.monitored_ports.map(String)
       } else {
         masterData.value = createDeviceMasterState()
         primaryCollection.value = createPrimaryCollectionDraft()
         existingAsset.value = null
         tagList.value = []
-        portTags.value = []
         Object.assign(formData, {
           name: '',
           management_ip: '',
@@ -217,8 +196,7 @@ watch(
           server_type: 'physical',
           tags: '',
           location: '',
-          monitored_processes: [],
-          monitored_ports: [],
+          policy_ids: [],
         })
       }
     } catch (error: any) {
@@ -230,13 +208,11 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'SERVER',
       state: masterData.value,
       assetName: formData.name,
@@ -248,7 +224,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const payload: ServerFormData = {
       resource_uid: master.resourceUid,
       asset_id: master.assetId,
@@ -262,27 +237,22 @@ const handleOk = async () => {
       server_type: formData.server_type,
       tags: formData.tags,
       location: formData.location.trim(),
-      monitored_processes: formData.monitored_processes,
-      monitored_ports: formData.monitored_ports,
+      policy_ids: formData.policy_ids,
     }
     const response: any = isEdit.value && props.record ? await updateServer(props.record.id, payload) : await createServer(payload)
     if (response?.code !== 0) throw new Error(response?.message || '保存服务器失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`服务器已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '保存失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '保存失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/server/components/ServiceMonitorDialog.vue b/src/views/ops/pages/dc/server/components/ServiceMonitorDialog.vue
new file mode 100644
index 0000000..dc77ecb
--- /dev/null
+++ b/src/views/ops/pages/dc/server/components/ServiceMonitorDialog.vue
@@ -0,0 +1,248 @@
+<template>
+  <a-modal
+    :visible="visible"
+    :title="`${server?.name || ''} 服务监控`"
+    width="960px"
+    :footer="false"
+    @cancel="close"
+    @update:visible="updateVisible"
+  >
+    <a-alert type="info" style="margin-bottom: 16px">
+      Linux Agent 会同时核对进程是否运行、该进程是否监听指定端口；两项均正常时，系统才判定该服务可用。采集权限不足时显示状态未知，不会误报为服务故障。
+    </a-alert>
+    <a-space style="margin-bottom: 12px">
+      <a-button type="primary" @click="openCreate">
+        <template #icon><icon-plus /></template>
+        新增服务监控项
+      </a-button>
+      <a-button :loading="loading" @click="loadRows">
+        <template #icon><icon-refresh /></template>
+        刷新
+      </a-button>
+    </a-space>
+    <a-table :columns="columns" :data="rows" :loading="loading" :pagination="false" row-key="id">
+      <template #enabled="{ record }">
+        <a-tag :color="record.enabled ? 'green' : 'gray'">{{ record.enabled ? '已启用' : '已停用' }}</a-tag>
+      </template>
+      <template #last_available="{ record }">
+        <a-tooltip :content="record.last_message || availabilityText(record)">
+          <a-tag :color="availabilityColor(record)">{{ availabilityText(record) }}</a-tag>
+        </a-tooltip>
+      </template>
+      <template #last_checked_at="{ record }">{{ formatTime(record.last_checked_at) }}</template>
+      <template #actions="{ record }">
+        <a-space>
+          <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
+          <a-button type="text" status="danger" size="small" @click="removeRow(record)">删除</a-button>
+        </a-space>
+      </template>
+    </a-table>
+
+    <a-modal
+      v-model:visible="editorVisible"
+      :title="editing?.id ? '编辑服务监控项' : '新增服务监控项'"
+      :confirm-loading="saving"
+      width="560px"
+      @ok="saveRow"
+    >
+      <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
+        <a-form-item field="service_name" label="服务名称" required>
+          <a-input v-model="form.service_name" placeholder="例如：门诊接口服务" :max-length="100" />
+        </a-form-item>
+        <a-form-item field="process_name" label="进程名称" required>
+          <a-input v-model="form.process_name" placeholder="例如：java 或 nginx" :max-length="128" />
+        </a-form-item>
+        <a-form-item field="port" label="端口号" required>
+          <a-input-number v-model="form.port" :min="1" :max="65535" placeholder="例如：8080" style="width: 100%" />
+        </a-form-item>
+        <a-form-item field="enabled" label="是否启用">
+          <a-switch v-model="form.enabled" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from 'vue'
+import { Message, Modal, type FormInstance } from '@arco-design/web-vue'
+import { IconPlus, IconRefresh } from '@arco-design/web-vue/es/icon'
+import {
+  createServerServiceMonitor,
+  deleteServerServiceMonitor,
+  fetchServerServiceMonitors,
+  updateServerServiceMonitor,
+  type ServerItem,
+  type ServiceMonitorDeleteConflict,
+  type ServerServiceMonitor,
+  type ServerServiceMonitorInput,
+} from '@/api/ops/server'
+
+const props = withDefaults(defineProps<{ visible: boolean; server?: ServerItem | null }>(), { server: null })
+const emit = defineEmits(['update:visible', 'success'])
+const rows = ref<ServerServiceMonitor[]>([])
+const loading = ref(false)
+const saving = ref(false)
+const editorVisible = ref(false)
+const editing = ref<ServerServiceMonitor | null>(null)
+const formRef = ref<FormInstance>()
+const form = reactive<ServerServiceMonitorInput>({ service_name: '', process_name: '', port: 80, enabled: true })
+const rules = {
+  service_name: [{ required: true, message: '请输入服务名称' }],
+  process_name: [{ required: true, message: '请输入进程名称' }],
+  port: [{ required: true, message: '请输入端口号' }],
+}
+const columns = [
+  { title: '服务名称', dataIndex: 'service_name', ellipsis: true, tooltip: true },
+  { title: '进程名称', dataIndex: 'process_name', ellipsis: true, tooltip: true },
+  { title: '端口', dataIndex: 'port', width: 90 },
+  { title: '配置状态', slotName: 'enabled', width: 100 },
+  { title: '最近可用性', slotName: 'last_available', width: 110 },
+  { title: '最近检查时间', slotName: 'last_checked_at', width: 180 },
+  { title: '操作', slotName: 'actions', width: 130, fixed: 'right' },
+]
+
+const unwrapError = (error: any, fallback: string) => error?.response?.data?.message || error?.message || fallback
+
+const loadRows = async () => {
+  if (!props.server?.id) return
+  loading.value = true
+  try {
+    const response = await fetchServerServiceMonitors(props.server.id)
+    rows.value = response.details?.list || []
+  } catch (error: any) {
+    Message.error(unwrapError(error, '加载服务监控项失败'))
+  } finally {
+    loading.value = false
+  }
+}
+
+const resetForm = (row?: ServerServiceMonitor) => {
+  Object.assign(form, {
+    service_name: row?.service_name || '',
+    process_name: row?.process_name || '',
+    port: row?.port || 80,
+    enabled: row?.enabled ?? true,
+  })
+  formRef.value?.clearValidate()
+}
+
+const openCreate = () => {
+  editing.value = null
+  resetForm()
+  editorVisible.value = true
+}
+
+const openEdit = (row: ServerServiceMonitor) => {
+  editing.value = row
+  resetForm(row)
+  editorVisible.value = true
+}
+
+const saveRow = async () => {
+  if (!props.server?.id) return
+  const errors = await formRef.value?.validate()
+  if (errors) return
+  saving.value = true
+  try {
+    const payload = {
+      service_name: form.service_name.trim(),
+      process_name: form.process_name.trim(),
+      port: Number(form.port),
+      enabled: form.enabled,
+    }
+    const response = editing.value
+      ? await updateServerServiceMonitor(props.server.id, editing.value.id, payload)
+      : await createServerServiceMonitor(props.server.id, payload)
+    if (response.code !== 0) throw new Error(response.message || '保存服务监控项失败')
+    Message.success(editing.value ? '服务监控项已更新' : '服务监控项已新增')
+    editorVisible.value = false
+    await loadRows()
+    emit('success')
+  } catch (error: any) {
+    Message.error(unwrapError(error, '保存服务监控项失败'))
+  } finally {
+    saving.value = false
+  }
+}
+
+const removeRow = (row: ServerServiceMonitor) => {
+  if (!props.server?.id) return
+  Modal.confirm({
+    title: '删除服务监控项',
+    content: `确认删除“${row.service_name} / ${row.process_name}:${row.port}”吗？系统会先检查它是否仍被业务系统使用。`,
+    onOk: () => deleteMonitor(row),
+  })
+}
+
+const deleteMonitor = async (
+  row: ServerServiceMonitor,
+  options?: { unlinkReferences: boolean; bindingVersion: number }
+) => {
+  try {
+    const response = await deleteServerServiceMonitor(props.server!.id, row.id, options)
+    if (response.code !== 0) throw new Error(response.message || '删除服务监控项失败')
+    Message.success(options ? '业务关联已解除，服务监控项已删除' : '服务监控项已删除')
+    await loadRows()
+    emit('success')
+  } catch (error: any) {
+    const details = error?.response?.data?.details as ServiceMonitorDeleteConflict | undefined
+    if (!options && error?.response?.status === 409 && details?.conflict_code === 'SERVICE_MONITOR_REFERENCED') {
+      confirmReferencedDelete(row, details)
+      return
+    }
+    if (details?.conflict_code === 'SERVICE_MONITOR_REFERENCE_CHANGED') {
+      Message.warning('业务关联已经变化，请查看最新关联后重新操作')
+      await loadRows()
+      return
+    }
+    Message.error(unwrapError(error, '删除服务监控项失败'))
+  }
+}
+
+const confirmReferencedDelete = (row: ServerServiceMonitor, details: ServiceMonitorDeleteConflict) => {
+  const businessNames = details.business_systems.map((item) => item.business_system_name).join('、')
+  Modal.warning({
+    title: '服务监控项正在被业务系统使用',
+    content: `当前关联业务：${businessNames || '未知业务'}。继续后会同时解除这些业务关联并删除监控项，业务健康度将不再使用该检查结果。`,
+    hideCancel: false,
+    okText: '解除关联并删除',
+    cancelText: '取消',
+    onOk: () => deleteMonitor(row, { unlinkReferences: true, bindingVersion: details.binding_version }),
+  })
+}
+
+const availabilityText = (row: ServerServiceMonitor) => {
+  if (!row.enabled) return '未监控'
+  if (row.last_state === 'available') return '可用'
+  if (row.last_state === 'unavailable') return '不可用'
+  return '状态未知'
+}
+
+const availabilityColor = (row: ServerServiceMonitor) => {
+  if (!row.enabled) return 'gray'
+  if (row.last_state === 'available') return 'green'
+  if (row.last_state === 'unavailable') return 'red'
+  return 'gray'
+}
+
+const formatTime = (value?: string | null) => {
+  if (!value) return '-'
+  const date = new Date(value)
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN')
+}
+
+const close = () => emit('update:visible', false)
+const updateVisible = (value: boolean) => emit('update:visible', value)
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) loadRows()
+    else {
+      rows.value = []
+      editorVisible.value = false
+    }
+  }
+)
+</script>
diff --git a/src/views/ops/pages/dc/server/index.vue b/src/views/ops/pages/dc/server/index.vue
index 550d649..f887b96 100644
--- a/src/views/ops/pages/dc/server/index.vue
+++ b/src/views/ops/pages/dc/server/index.vue
@@ -116,6 +116,12 @@
                 </template>
                 采集绑定
               </a-doption>
+			  <a-doption @click="handleServiceMonitor(record)">
+				服务监控
+			  </a-doption>
+			  <a-doption @click="handleFileLogMonitor(record)">
+				文件日志采集
+			  </a-doption>
 			  <a-doption @click="handleMonitorDetail(record)">
 				<template #icon><icon-dashboard /></template>
 				监控详情
@@ -143,13 +149,19 @@
 
     <HardwareDeviceConfigDialog v-model:visible="hardwareConfigVisible" :record="currentRecord" @success="handleHardwareConfigSuccess" />
 
+    <ServiceMonitorDialog v-model:visible="serviceMonitorVisible" :server="currentRecord" @success="handleServiceMonitorSuccess" />
+
+    <FileLogMonitorDialog v-model:visible="fileLogMonitorVisible" :server="currentRecord" />
+
 	<a-modal v-model:visible="monitorDetailVisible" :title="`${currentRecord?.name || ''} 监控详情`" width="1000px" :footer="false">
 	  <a-alert v-if="!latestMetrics?.has_data && !hardwareSnapshot?.has_data" type="info">暂无主机或带外硬件采集数据。</a-alert>
 	  <template v-else>
 		<a-descriptions :column="3" bordered size="small" style="margin-bottom: 16px">
 		  <a-descriptions-item label="主机采样时间">{{ formatDateTime(latestMetrics?.timestamp) }}</a-descriptions-item>
-		  <a-descriptions-item label="核心进程">{{ currentRecord?.monitored_processes?.join('、') || '未配置' }}</a-descriptions-item>
-		  <a-descriptions-item label="监听端口">{{ currentRecord?.monitored_ports?.join('、') || '未配置' }}</a-descriptions-item>
+		  <a-descriptions-item label="服务监控">
+			<a-button type="text" size="small" @click="handleServiceMonitor(currentRecord)">查看配置</a-button>
+		  </a-descriptions-item>
+		  <a-descriptions-item label="采集方式">Linux Agent</a-descriptions-item>
 		  <a-descriptions-item label="带外协议">{{ hardwareSnapshot?.protocol?.toUpperCase() || '未配置' }}</a-descriptions-item>
 		  <a-descriptions-item label="带外采样时间">{{ formatDateTime(hardwareSnapshot?.collected_at) }}</a-descriptions-item>
 		  <a-descriptions-item label="硬件异常">{{ hardwareSnapshot?.events?.length || 0 }} 项</a-descriptions-item>
@@ -184,10 +196,12 @@ import SearchTable from '@/components/search-table/index.vue'
 import { searchFormConfig } from './config/search-form'
 import ServerFormDialog from './components/ServerFormDialog.vue'
 import HardwareDeviceConfigDialog from './components/HardwareDeviceConfigDialog.vue'
+import ServiceMonitorDialog from './components/ServiceMonitorDialog.vue'
+import FileLogMonitorDialog from './components/FileLogMonitorDialog.vue'
 import ImportantInterfacesPanel from '../components/ImportantInterfacesPanel.vue'
 import { columns as columnsConfig } from './config/columns'
 import { fetchServerHardwareSnapshot, fetchServerLatestMetrics, fetchServerList, fetchServerMetricsSummary, type HardwareSnapshotPayload, type HostLatestMetricsPayload, type HostMetricsSummary } from '@/api/ops/server'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 import { collectResourceNow } from '@/api/ops/collection'
 
 // 状态管理
@@ -196,6 +210,8 @@ const tableData = ref<any[]>([])
 const formDialogVisible = ref(false)
 const hardwareConfigVisible = ref(false)
 const monitorDetailVisible = ref(false)
+const serviceMonitorVisible = ref(false)
+const fileLogMonitorVisible = ref(false)
 const latestMetrics = ref<HostLatestMetricsPayload>()
 const hardwareSnapshot = ref<HardwareSnapshotPayload>()
 const currentRecord = ref<any>(null)
@@ -251,7 +267,7 @@ const formatDateTime = (dateTime: string | null | undefined) => {
   }
   try {
     const date = new Date(dateTime)
-    if (isNaN(date.getTime())) {
+    if (isNaN(date.getTime()) || date.getUTCFullYear() <= 1) {
       return '-'
     }
     const year = date.getFullYear()
@@ -352,6 +368,22 @@ const handleHardwareConfigSuccess = () => {
   fetchServers()
 }
 
+const handleServiceMonitor = (record: any) => {
+  if (!record?.id) return
+  currentRecord.value = record
+  serviceMonitorVisible.value = true
+}
+
+const handleServiceMonitorSuccess = () => {
+  fetchServers()
+}
+
+const handleFileLogMonitor = (record: any) => {
+  if (!record?.id) return
+  currentRecord.value = record
+  fileLogMonitorVisible.value = true
+}
+
 const metricGroupDefinitions = [
 	{ key: 'load', title: '负载', types: ['load', 'cpu', 'memory', 'swap'] },
 	{ key: 'disk', title: '磁盘与 IO', types: ['disk', 'disk_io'] },
@@ -377,9 +409,9 @@ const handleMonitorDetail = async (record: any) => {
 	latestMetrics.value = undefined
 	hardwareSnapshot.value = undefined
 	monitorDetailVisible.value = true
-	if (!record.server_identity) return
+	if (!record.resource_uid) return
 	try {
-		const [metricsResponse, hardwareResponse] = await Promise.all([fetchServerLatestMetrics(record.server_identity), fetchServerHardwareSnapshot(record.server_identity)])
+		const [metricsResponse, hardwareResponse] = await Promise.all([fetchServerLatestMetrics(record.resource_uid), fetchServerHardwareSnapshot(record.resource_uid)])
 		latestMetrics.value = metricsResponse.details
 		hardwareSnapshot.value = hardwareResponse.details
 	} catch {
@@ -416,16 +448,16 @@ const handleDelete = async (record: any) => {
           Message.error('该服务器缺少统一设备标识，无法删除')
           return
         }
-        const res: any = await deleteAsset(record.resource_uid)
-        if (res.code === 0) {
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') {
           Message.success('删除成功')
-          fetchServers()
         } else {
-          Message.error(res.message || '删除失败')
+          Message.info('设备正在删除，系统将自动完成清理')
         }
-      } catch (error) {
+        await fetchServers()
+      } catch (error: any) {
         console.error('删除服务器失败:', error)
-        Message.error('删除失败')
+        Message.error(error?.response?.data?.message || error?.message || '删除失败')
       }
     },
   })
@@ -466,12 +498,12 @@ const applyMetricsSummary = (record: any, summary?: HostMetricsSummary) => {
 const getAllMetrics = async () => {
   try {
     const metricsPromises = tableData.value.map(async (record) => {
-      if (!record.server_identity) {
+		if (!record.resource_uid) {
         resetMetrics(record)
         return
       }
       try {
-        const response = await fetchServerMetricsSummary(record.server_identity)
+			const response = await fetchServerMetricsSummary(record.resource_uid)
         applyMetricsSummary(record, response.details)
       } catch (error) {
         console.warn(`获取服务器 ${record.name} 的监控指标失败:`, error)
diff --git a/src/views/ops/pages/dc/storage/components/StorageDetail.vue b/src/views/ops/pages/dc/storage/components/StorageDetail.vue
index 521d784..1a8db65 100644
--- a/src/views/ops/pages/dc/storage/components/StorageDetail.vue
+++ b/src/views/ops/pages/dc/storage/components/StorageDetail.vue
@@ -3,7 +3,7 @@
     :visible="visible"
     title="存储设备详情"
     placement="right"
-    width="860px"
+    width="min(1200px, 92vw)"
     @cancel="handleCancel"
     @update:visible="handleUpdateVisible"
   >
@@ -49,7 +49,32 @@
         <a-descriptions title="存储部件" :column="1" bordered style="margin-top: 20px">
           <a-descriptions-item label="说明">部件由存储设备只读发现，不能在本页面手工创建。</a-descriptions-item>
         </a-descriptions>
-        <a-table :data="components" :columns="componentColumns" row-key="id" :pagination="{ pageSize: 10 }" style="margin-top: 12px" />
+        <a-table
+          :data="components"
+          :columns="componentColumns"
+          row-key="id"
+          :pagination="{ pageSize: 10 }"
+          :scroll="{ x: 1120 }"
+          style="margin-top: 12px"
+        >
+          <template #status="{ record }">
+            <a-tag :color="getComponentStatusColor(record.status)">{{ getComponentStatusText(record.status) }}</a-tag>
+          </template>
+          <template #attributes="{ record }">
+            <div class="component-attributes-cell">
+              <span class="component-attributes">{{ componentAttributeText(record) }}</span>
+              <a-button
+                v-if="componentAttributeItems(record).length"
+                type="text"
+                size="mini"
+                class="component-detail-button"
+                @click="openComponentDetail(record)"
+              >
+                查看全部
+              </a-button>
+            </div>
+          </template>
+        </a-table>
 
         <important-interfaces-panel :resource-uid="detailData?.resource_uid" />
 
@@ -70,7 +95,7 @@
           <a-descriptions-item label="指标数量">{{ metricsData?.count || 0 }}</a-descriptions-item>
         </a-descriptions>
         <div v-if="metricsData?.metrics?.length" class="metrics-grid">
-          <div v-for="metric in metricsData?.metrics" :key="metric.metric_name" class="metric-item">
+          <div v-for="metric in metricsData?.metrics" :key="`${metric.metric_name}-${metric.series_key || 'default'}`" class="metric-item">
             <div class="metric-name">{{ metric.metric_name }}</div>
             <div class="metric-value">{{ metric.metric_value }} {{ metric.metric_unit }}</div>
           </div>
@@ -78,11 +103,24 @@
         <a-empty v-else-if="!loading" description="暂无指标数据" style="margin-top: 20px" />
       </a-spin>
     </a-drawer>
+
+    <a-modal v-model:visible="componentDetailVisible" title="采集详情" :footer="false" width="720px" unmount-on-close>
+      <div class="component-detail-summary">
+        {{ activeComponent?.name || activeComponent?.component_identity || '-' }}
+      </div>
+      <div class="component-detail-content">
+        <a-descriptions :column="1" bordered size="small">
+          <a-descriptions-item v-for="item in activeComponentAttributes" :key="item.key" :label="item.label">
+            <span class="component-detail-value">{{ item.value }}</span>
+          </a-descriptions-item>
+        </a-descriptions>
+      </div>
+    </a-modal>
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import ImportantInterfacesPanel from '../../components/ImportantInterfacesPanel.vue'
 import { fetchStorageComponents, fetchStorageDetail, fetchStorageMetricsLatest } from '@/api/ops/storage'
@@ -105,11 +143,63 @@ const metricsData = ref<StorageMetricsLatestResponse | null>(null)
 const metricsVisible = ref(false)
 const components = ref<StorageComponent[]>([])
 const componentColumns = [
-  { title: '部件类型', dataIndex: 'component_type', width: 120 }, { title: '名称', dataIndex: 'name' },
-  { title: '部件标识', dataIndex: 'component_identity' }, { title: '状态', dataIndex: 'status', width: 100 },
-  { title: '容量（字节）', dataIndex: 'capacity_bytes', width: 150 }, { title: '已用（字节）', dataIndex: 'used_bytes', width: 150 },
+  { title: '部件类型', dataIndex: 'component_type', width: 110 }, { title: '名称', dataIndex: 'name', width: 140 },
+  { title: '部件标识', dataIndex: 'component_identity', width: 150 }, { title: '状态', slotName: 'status', width: 90 },
+  { title: '容量（字节）', dataIndex: 'capacity_bytes', width: 150 }, { title: '已用（字节）', dataIndex: 'used_bytes', width: 130 },
+  { title: '采集详情', slotName: 'attributes', width: 350 },
 ]
 
+const componentAttributeLabels: Record<string, string> = {
+  host_name: '主机', disk_type: '磁盘类型', disk_category: '磁盘类别', usage_rate: '使用率',
+  temperature_status: '温度状态', bad_sector_status: '坏道状态', life_percent: '寿命百分比', serial_number: '序列号',
+  packet_loss_status: '丢包状态', packet_error_status: '错包状态', health_status: '健康状态',
+  cpu_temperature_status: 'CPU 温度状态', cpu_usage_rate: 'CPU 使用率', memory_usage_rate: '内存使用率',
+  nfs_status: 'NFS 状态', cifs_status: 'CIFS 状态', ftp_status: 'FTP 状态', object_status: '对象存储状态', raid_status: 'RAID 状态',
+}
+
+interface ComponentAttributeItem {
+  key: string
+  label: string
+  value: string
+}
+
+const componentDetailVisible = ref(false)
+const activeComponent = ref<StorageComponent | null>(null)
+
+const componentAttributeItems = (component: StorageComponent): ComponentAttributeItem[] => {
+  if (!component.attributes) return []
+  try {
+    const attributes = JSON.parse(component.attributes) as Record<string, unknown>
+    return Object.entries(attributes)
+      .filter(([, value]) => value !== null && value !== undefined && String(value).trim() !== '')
+      .map(([key, value]) => ({ key, label: componentAttributeLabels[key] || key, value: String(value) }))
+  } catch {
+    return []
+  }
+}
+
+const componentAttributeText = (component: StorageComponent) => {
+  const items = componentAttributeItems(component)
+  return items.length ? items.map((item) => `${item.label}：${item.value}`).join('；') : '-'
+}
+
+const activeComponentAttributes = computed(() => activeComponent.value ? componentAttributeItems(activeComponent.value) : [])
+
+const openComponentDetail = (component: StorageComponent) => {
+  activeComponent.value = component
+  componentDetailVisible.value = true
+}
+
+const getComponentStatusColor = (status?: string) => {
+  const map: Record<string, string> = { normal: 'green', warning: 'orange', error: 'red', unknown: 'gray' }
+  return map[status || 'unknown'] || 'gray'
+}
+
+const getComponentStatusText = (status?: string) => {
+  const map: Record<string, string> = { normal: '正常', warning: '警告', error: '异常', unknown: '未知' }
+  return map[status || 'unknown'] || status || '未知'
+}
+
 const getStatusColor = (status?: string) => {
   const colorMap: Record<string, string> = {
     online: 'green',
@@ -163,8 +253,8 @@ const fetchDetail = async () => {
       detailData.value = res.details
       components.value = componentResponse?.details || []
 
-      if (detailData.value?.service_identity) {
-        const metricsRes: any = await fetchStorageMetricsLatest(detailData.value.service_identity)
+      if (detailData.value?.resource_uid) {
+        const metricsRes: any = await fetchStorageMetricsLatest(detailData.value.resource_uid)
         if (metricsRes.code === 0) {
           metricsData.value = metricsRes.details
         }
@@ -189,6 +279,8 @@ watch(
       detailData.value = null
       metricsData.value = null
       components.value = []
+      activeComponent.value = null
+      componentDetailVisible.value = false
     }
   }
 )
@@ -240,6 +332,40 @@ const handleViewMetrics = () => {
   word-break: break-all;
 }
 
+.component-attributes {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.component-attributes-cell {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  gap: 4px;
+}
+
+.component-detail-button {
+  flex: none;
+}
+
+.component-detail-summary {
+  margin-bottom: 12px;
+  color: var(--color-text-2);
+}
+
+.component-detail-content {
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+.component-detail-value {
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
 .action-bar {
   margin-top: 20px;
   padding-top: 16px;
diff --git a/src/views/ops/pages/dc/storage/components/StorageFormDialog.vue b/src/views/ops/pages/dc/storage/components/StorageFormDialog.vue
index d2cfced..5157631 100644
--- a/src/views/ops/pages/dc/storage/components/StorageFormDialog.vue
+++ b/src/views/ops/pages/dc/storage/components/StorageFormDialog.vue
@@ -55,10 +55,17 @@
         <a-textarea v-model="formData.description" :rows="2" />
       </a-form-item>
 
+      <AlertPolicySelect
+        v-model="formData.policy_ids"
+        resource-category="storage"
+        :resource-uid="isEdit ? props.record?.resource_uid : ''"
+      />
+
       <PrimaryCollectionFields
         v-model="primaryCollection"
         resource-category="storage"
         :manufacturer-code="manufacturerCode"
+        :device-model="masterData.model"
         :editing="isEdit"
         :management-ip="formData.management_ip"
       />
@@ -73,6 +80,7 @@ import type { FormInstance } from '@arco-design/web-vue'
 import { createStorage, updateStorage, type StorageCreateData, type StorageItem } from '@/api/ops/storage'
 import DeviceMasterFields from '../../components/DeviceMasterFields.vue'
 import PrimaryCollectionFields from '../../components/PrimaryCollectionFields.vue'
+import AlertPolicySelect from '../../components/AlertPolicySelect.vue'
 import {
   createDeviceMasterState,
   createPrimaryCollectionDraft,
@@ -80,10 +88,7 @@ import {
   loadDeviceMasterContext,
   persistDeviceMaster,
   persistPrimaryCollectionBinding,
-  rollbackCreatedDeviceSetup,
   type DeviceMasterContext,
-  type PersistedDeviceMaster,
-  type PersistedPrimaryCollectionBinding,
 } from '../../components/deviceMaster'
 
 const props = withDefaults(defineProps<{ visible: boolean; record?: StorageItem | null }>(), { record: null })
@@ -100,7 +105,7 @@ const isEdit = computed(() => !!props.record?.id)
 const manufacturerCode = computed(
   () => masterContext.value?.manufacturers.find((item) => item.id === masterData.value.manufacturer_id)?.code || ''
 )
-const formData = reactive({ name: '', type: 'nas', management_ip: '', location: '', description: '', tags: '' })
+const formData = reactive({ name: '', type: 'nas', management_ip: '', location: '', description: '', tags: '', policy_ids: [] as number[] })
 const rules = {
   name: [{ required: true, message: '请输入设备名称' }],
   type: [{ required: true, message: '请选择存储类型' }],
@@ -145,7 +150,7 @@ watch(
         primaryCollection.value = createPrimaryCollectionDraft()
         existingAsset.value = null
         tagList.value = []
-        Object.assign(formData, { name: '', type: 'nas', management_ip: '', location: '', description: '', tags: '' })
+        Object.assign(formData, { name: '', type: 'nas', management_ip: '', location: '', description: '', tags: '', policy_ids: [] })
       }
     } catch (error: any) {
       Message.error(error?.message || '加载存储设备信息失败')
@@ -156,13 +161,11 @@ watch(
 )
 
 const handleOk = async () => {
-  let persistedMaster: PersistedDeviceMaster | undefined
-  let persistedBinding: PersistedPrimaryCollectionBinding | undefined
   try {
     await formRef.value?.validate()
     confirmLoading.value = true
     if (!masterContext.value) throw new Error('设备分类和生产厂商尚未加载完成')
-    persistedMaster = await persistDeviceMaster(masterContext.value, {
+    const persistedMaster = await persistDeviceMaster(masterContext.value, {
       categoryCode: 'STORAGE',
       state: masterData.value,
       assetName: formData.name,
@@ -174,7 +177,6 @@ const handleOk = async () => {
     const master = persistedMaster
     masterData.value = { ...masterData.value, asset_id: master.assetId, resource_uid: master.resourceUid }
     existingAsset.value = master.asset
-    if (!isEdit.value) persistedBinding = await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
     const payload: StorageCreateData = {
       resource_uid: master.resourceUid,
       asset_id: master.assetId,
@@ -188,25 +190,22 @@ const handleOk = async () => {
       description: formData.description.trim(),
       tags: formData.tags,
       enabled: true,
+      policy_ids: formData.policy_ids,
     }
     const response: any = isEdit.value && props.record ? await updateStorage(props.record.id, payload) : await createStorage(payload)
     if (response?.code !== 0) throw new Error(response?.message || '保存存储设备失败')
+    if (!isEdit.value) {
+      try {
+        await persistPrimaryCollectionBinding(master.resourceUid, formData.name, primaryCollection.value)
+      } catch (error: any) {
+        throw new Error(`存储设备已创建，${error?.response?.data?.message || error?.message || '采集绑定失败'}；可再次保存采集配置`)
+      }
+    }
     Message.success(isEdit.value ? '更新成功' : '创建成功')
     emit('success')
     handleCancel()
   } catch (error: any) {
-    let message = error?.response?.data?.message || error?.message || '保存失败'
-    if (!isEdit.value && persistedMaster) {
-      try {
-        await rollbackCreatedDeviceSetup(persistedMaster, persistedBinding)
-        if (persistedMaster.created) {
-          masterData.value = { ...masterData.value, asset_id: undefined, resource_uid: undefined }
-          existingAsset.value = null
-        }
-      } catch (cleanupError: any) {
-        message += `；自动清理失败：${cleanupError?.message || '请手动检查本次新增的资产和采集绑定'}`
-      }
-    }
+    const message = error?.response?.data?.message || error?.message || '保存失败'
     Message.error(message)
   } finally {
     confirmLoading.value = false
diff --git a/src/views/ops/pages/dc/storage/index.vue b/src/views/ops/pages/dc/storage/index.vue
index 85aa0c4..4d71cd1 100644
--- a/src/views/ops/pages/dc/storage/index.vue
+++ b/src/views/ops/pages/dc/storage/index.vue
@@ -94,7 +94,7 @@ import StorageFormDialog from './components/StorageFormDialog.vue'
 import StorageDetail from './components/StorageDetail.vue'
 import { columns as columnsConfig } from './config/columns'
 import { fetchStorageList } from '@/api/ops/storage'
-import { deleteAsset } from '@/api/ops/asset'
+import { deleteDeviceAndWait } from '@/api/ops/asset'
 
 const loading = ref(false)
 const tableData = ref<any[]>([])
@@ -264,16 +264,16 @@ const handleDelete = async (record: any) => {
           Message.error('该存储设备缺少统一设备标识，无法删除')
           return
         }
-        const res: any = await deleteAsset(record.resource_uid)
-        if (res.code === 0) {
+        const result = await deleteDeviceAndWait(record.resource_uid)
+        if (result.status === 'deleted') {
           Message.success('删除成功')
-          fetchStorages()
         } else {
-          Message.error(res.message || '删除失败')
+          Message.info('设备正在删除，系统将自动完成清理')
         }
-      } catch (error) {
+        await fetchStorages()
+      } catch (error: any) {
         console.error('删除存储设备失败:', error)
-        Message.error('删除失败')
+        Message.error(error?.response?.data?.message || error?.message || '删除失败')
       }
     },
   })
diff --git a/src/views/ops/pages/log-mgmt/syslog-rules/index.vue b/src/views/ops/pages/log-mgmt/syslog-rules/index.vue
index 5187bfd..b992d3c 100644
--- a/src/views/ops/pages/log-mgmt/syslog-rules/index.vue
+++ b/src/views/ops/pages/log-mgmt/syslog-rules/index.vue
@@ -133,7 +133,7 @@
 import { computed, reactive, ref } from 'vue'
 import { Message, Modal } from '@arco-design/web-vue'
 import { IconPlus } from '@arco-design/web-vue/es/icon'
-import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertTemplate'
+import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertPolicy'
 import { fetchPolicyList } from '@/api/ops/alertPolicy'
 import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
diff --git a/src/views/ops/pages/log-mgmt/trap-dictionary/index.vue b/src/views/ops/pages/log-mgmt/trap-dictionary/index.vue
index cd22752..6c686ce 100644
--- a/src/views/ops/pages/log-mgmt/trap-dictionary/index.vue
+++ b/src/views/ops/pages/log-mgmt/trap-dictionary/index.vue
@@ -112,7 +112,7 @@
 import { computed, reactive, ref } from 'vue'
 import { Message, Modal } from '@arco-design/web-vue'
 import { IconPlus } from '@arco-design/web-vue/es/icon'
-import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertTemplate'
+import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertPolicy'
 import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
diff --git a/src/views/ops/pages/log-mgmt/trap-rules/index.vue b/src/views/ops/pages/log-mgmt/trap-rules/index.vue
index bf12a32..78d462e 100644
--- a/src/views/ops/pages/log-mgmt/trap-rules/index.vue
+++ b/src/views/ops/pages/log-mgmt/trap-rules/index.vue
@@ -122,7 +122,7 @@ import { computed, reactive, ref } from 'vue'
 import { Message, Modal } from '@arco-design/web-vue'
 import { IconPlus } from '@arco-design/web-vue/es/icon'
 import { fetchPolicyList } from '@/api/ops/alertPolicy'
-import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertTemplate'
+import { fetchSeverityOptions, type AlertSeverity } from '@/api/ops/alertPolicy'
 import type { FormItem } from '@/components/search-form/types'
 import SearchTable from '@/components/search-table/index.vue'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
diff --git a/src/views/ops/pages/log-mgmt/trap-suppressions/index.vue b/src/views/ops/pages/log-mgmt/trap-suppressions/index.vue
index 224d09b..ac17855 100644
--- a/src/views/ops/pages/log-mgmt/trap-suppressions/index.vue
+++ b/src/views/ops/pages/log-mgmt/trap-suppressions/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="container">
+    <a-alert type="warning" show-icon class="trap-shield-warning">
+      Trap 屏蔽会在接收入口直接丢弃命中的 SNMP Trap；命中后不会保存原始 Trap，也不会生成日志事件、告警或工单。请仅屏蔽已确认的重复或无效 Trap，并准确限定来源设备、Trap 类型或接口，避免真实故障无法被发现。
+    </a-alert>
     <search-table
       :form-model="formModel"
       :form-items="formItems"
@@ -16,7 +19,7 @@
       @reset="handleReset"
       @page-change="handlePageChange"
       @page-size-change="handlePageSizeChange"
-      @refresh="fetchList"
+      @refresh="refreshPage"
     >
       <template #toolbar-left>
         <a-button type="primary" @click="openCreate">
@@ -27,6 +30,11 @@
       <template #enabled="{ record }">
         <a-tag :color="record.enabled ? 'green' : 'red'">{{ record.enabled ? '启用' : '禁用' }}</a-tag>
       </template>
+      <template #oid_prefixes="{ record }">
+        <a-tooltip :content="formatTrapTypeList(record.oid_prefixes)">
+          <span class="trap-type-summary">{{ formatTrapTypeSummary(record.oid_prefixes) }}</span>
+        </a-tooltip>
+      </template>
       <template #operations="{ record }">
         <a-space>
           <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
@@ -53,15 +61,42 @@
         <a-form-item field="source_ip_cidr" label="源 IP / CIDR">
           <a-input v-model="formData.source_ip_cidr" placeholder="如 192.168.1.0/24" />
         </a-form-item>
-        <a-form-item field="oid_prefix" label="OID 前缀">
-          <a-input v-model="formData.oid_prefix" />
+        <a-form-item
+          field="oid_prefixes"
+          label="Trap 类型"
+          extra="可从 Trap 字典和系统已接收的 Trap 中多选；多个类型之间为任一命中。"
+        >
+          <a-select
+            v-model="formData.oid_prefixes"
+            multiple
+            allow-search
+            allow-clear
+            :max-tag-count="3"
+            :loading="optionLoading"
+            placeholder="请选择一个或多个 Trap 类型"
+          >
+            <a-option v-for="option in trapTypeOptions" :key="option.oid_prefix" :value="option.oid_prefix">
+              {{ formatTrapTypeOption(option) }}
+            </a-option>
+          </a-select>
         </a-form-item>
         <a-form-item field="interface_hint" label="接口提示">
-          <a-input v-model="formData.interface_hint" />
+          <a-input v-model="formData.interface_hint" placeholder="如接口名称、线路编号或 VarBind 中的关键字" />
         </a-form-item>
-        <a-form-item field="time_windows_json" label="时间窗 JSON" extra="后端约定的 JSON 字符串，可为空">
-          <a-textarea v-model="formData.time_windows_json" :rows="4" placeholder="{}" />
+        <a-form-item
+          field="time_windows_json"
+          label="生效时间窗 JSON"
+          extra="留空表示始终生效；星期值 0 表示周日、1 至 6 表示周一至周六。"
+        >
+          <a-textarea
+            v-model="formData.time_windows_json"
+            :rows="4"
+            placeholder='[{"days":[1,2,3,4,5],"start":"00:00","end":"23:59"}]'
+          />
         </a-form-item>
+        <a-alert type="info">
+          同一规则内填写的来源 IP、Trap 类型、接口提示和生效时间窗需要同时满足；其中选择的多个 Trap 类型只需命中任意一个。
+        </a-alert>
       </a-form>
     </a-modal>
   </div>
@@ -78,15 +113,19 @@ import type { FormInstance } from '@arco-design/web-vue'
 import {
   createTrapSuppression,
   deleteTrapSuppression,
+  fetchTrapSuppressionOptions,
   fetchTrapSuppressions,
   unwrapLogsPayload,
   updateTrapSuppression,
   type TrapShield,
+  type TrapSuppressionOption,
 } from '@/api/ops/logs'
 
 const loading = ref(false)
+const optionLoading = ref(false)
 const tableData = ref<TrapShield[]>([])
 const allRows = ref<TrapShield[]>([])
+const trapTypeOptions = ref<TrapSuppressionOption[]>([])
 const formModel = ref({ keyword: '' })
 
 function handleFormModelUpdate(v: Record<string, unknown>) {
@@ -101,7 +140,7 @@ const emptyForm = (): TrapShield => ({
   name: '',
   enabled: true,
   source_ip_cidr: '',
-  oid_prefix: '',
+  oid_prefixes: [],
   interface_hint: '',
   time_windows_json: '',
 })
@@ -123,15 +162,44 @@ const columns = computed<TableColumnData[]>(() => [
   { title: '名称', dataIndex: 'name', ellipsis: true, tooltip: true },
   { title: '启用', dataIndex: 'enabled', slotName: 'enabled', width: 88 },
   { title: '源 IP/CIDR', dataIndex: 'source_ip_cidr', ellipsis: true, tooltip: true },
-  { title: 'OID 前缀', dataIndex: 'oid_prefix', ellipsis: true, tooltip: true },
+  { title: 'Trap 类型', dataIndex: 'oid_prefixes', slotName: 'oid_prefixes', ellipsis: true, tooltip: true },
   { title: '接口提示', dataIndex: 'interface_hint', ellipsis: true, tooltip: true },
   { title: '操作', slotName: 'operations', width: 160, fixed: 'right' },
 ])
 
+const trapTypeNameMap = computed(() => {
+  return new Map(trapTypeOptions.value.map((option) => [option.oid_prefix, option.name || option.oid_prefix]))
+})
+
+function trapTypeName(oid: string) {
+  return trapTypeNameMap.value.get(oid) || oid
+}
+
+function formatTrapTypeOption(option: TrapSuppressionOption) {
+  const source = option.source === 'dictionary' ? [option.vendor, option.name].filter(Boolean).join(' / ') : '已接收 Trap'
+  return `${source || option.oid_prefix}（${option.oid_prefix}）`
+}
+
+function formatTrapTypeList(oids?: string[]) {
+  if (!oids?.length) return '不限 Trap 类型'
+  return oids.map((oid) => `${trapTypeName(oid)}（${oid}）`).join('、')
+}
+
+function formatTrapTypeSummary(oids?: string[]) {
+  if (!oids?.length) return '不限'
+  const names = oids.slice(0, 2).map(trapTypeName)
+  return oids.length > 2 ? `${names.join('、')} 等 ${oids.length} 项` : names.join('、')
+}
+
 function applyFilter(list: TrapShield[]) {
   const kw = formModel.value.keyword?.trim()
   if (!kw) return list
-  return list.filter((r) => r.name?.includes(kw) || r.oid_prefix?.includes(kw) || r.source_ip_cidr?.includes(kw))
+  return list.filter(
+    (r) =>
+      r.name?.includes(kw) ||
+      r.oid_prefixes?.some((oid) => oid.includes(kw) || trapTypeName(oid).includes(kw)) ||
+      r.source_ip_cidr?.includes(kw),
+  )
 }
 
 function slicePage(list: TrapShield[]) {
@@ -162,6 +230,27 @@ async function fetchList() {
   }
 }
 
+async function fetchTrapTypes() {
+  optionLoading.value = true
+  try {
+    const res: any = await fetchTrapSuppressionOptions()
+    const payload = unwrapLogsPayload(res)
+    trapTypeOptions.value = (payload?.items ?? []) as TrapSuppressionOption[]
+    if (typeof res.code === 'number' && res.code !== 0) {
+      Message.error(res.message || res.msg || '加载 Trap 类型失败')
+    }
+  } catch (e: any) {
+    Message.error(e?.message || '加载 Trap 类型失败')
+    trapTypeOptions.value = []
+  } finally {
+    optionLoading.value = false
+  }
+}
+
+async function refreshPage() {
+  await Promise.all([fetchList(), fetchTrapTypes()])
+}
+
 function handleSearch() {
   clientPagination.current = 1
   const filtered = applyFilter(allRows.value)
@@ -201,7 +290,7 @@ function openEdit(row: TrapShield) {
     name: row.name,
     enabled: row.enabled,
     source_ip_cidr: row.source_ip_cidr ?? '',
-    oid_prefix: row.oid_prefix ?? '',
+    oid_prefixes: [...(row.oid_prefixes ?? [])],
     interface_hint: row.interface_hint ?? '',
     time_windows_json: row.time_windows_json ?? '',
   })
@@ -211,6 +300,10 @@ function openEdit(row: TrapShield) {
 async function submitForm() {
   const err = await formRef.value?.validate()
   if (err) return
+  if (!formData.source_ip_cidr?.trim() && !formData.oid_prefixes.length && !formData.interface_hint?.trim()) {
+    Message.warning('来源 IP、Trap 类型和接口提示至少填写一项')
+    return
+  }
   const tw = formData.time_windows_json?.trim()
   if (tw) {
     try {
@@ -222,15 +315,19 @@ async function submitForm() {
   }
   submitting.value = true
   try {
+    const payload: TrapShield = {
+      ...formData,
+      oid_prefixes: [...formData.oid_prefixes],
+    }
     if (editingId.value != null) {
-      const res: any = await updateTrapSuppression(editingId.value, { ...formData })
+      const res: any = await updateTrapSuppression(editingId.value, payload)
       if (typeof res.code === 'number' && res.code !== 0) {
         Message.error(res.message || res.msg || '保存失败')
         return
       }
       Message.success('已保存')
     } else {
-      const res: any = await createTrapSuppression({ ...formData })
+      const res: any = await createTrapSuppression(payload)
       if (typeof res.code === 'number' && res.code !== 0) {
         Message.error(res.message || res.msg || '创建失败')
         return
@@ -238,7 +335,7 @@ async function submitForm() {
       Message.success('已创建')
     }
     modalVisible.value = false
-    await fetchList()
+    await refreshPage()
   } catch (e: any) {
     Message.error(e?.message || '请求失败')
   } finally {
@@ -259,7 +356,7 @@ function handleDelete(row: TrapShield) {
           return
         }
         Message.success('已删除')
-        await fetchList()
+        await refreshPage()
       } catch (e: any) {
         Message.error(e?.message || '删除失败')
       }
@@ -267,7 +364,7 @@ function handleDelete(row: TrapShield) {
   })
 }
 
-fetchList()
+refreshPage()
 </script>
 
 <script lang="ts">
@@ -278,4 +375,17 @@ export default { name: 'LogMgmtTrapSuppressions' }
 .container {
   padding: 16px;
 }
+
+.trap-shield-warning {
+  margin-bottom: 16px;
+}
+
+.trap-type-summary {
+  display: inline-block;
+  max-width: 320px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: middle;
+}
 </style>
diff --git a/src/views/ops/pages/monitor/environment/index.vue b/src/views/ops/pages/monitor/environment/index.vue
index 9f4dfd5..1c3bc38 100644
--- a/src/views/ops/pages/monitor/environment/index.vue
+++ b/src/views/ops/pages/monitor/environment/index.vue
@@ -413,7 +413,7 @@ async function loadMetricsForFirstDevices() {
       await Promise.all(
         batch.map(async (d) => {
           try {
-            const res = await fetchLatestMetrics(d.service_identity)
+            const res = await fetchLatestMetrics(d.resource_uid)
             const metrics = res?.code === 0 && res.details?.metrics && Array.isArray(res.details.metrics) ? res.details.metrics : []
             metricsByIdentity.value = { ...metricsByIdentity.value, [d.service_identity]: metrics }
           } catch {
diff --git a/src/views/ops/pages/monitor/host-hardware/index.vue b/src/views/ops/pages/monitor/host-hardware/index.vue
index 74766b4..be81ed3 100644
--- a/src/views/ops/pages/monitor/host-hardware/index.vue
+++ b/src/views/ops/pages/monitor/host-hardware/index.vue
@@ -4,165 +4,167 @@
       <div class="toolbar-left">
         <span class="toolbar-label">当前服务器</span>
         <a-select
-          v-model="selectedServerIdentity"
+          v-model="selectedResourceUID"
           class="server-select"
           placeholder="输入名称或地址搜索"
           allow-search
-          allow-clear
           :loading="serverListLoading"
           :filter-option="filterServerOption"
         >
           <a-option
             v-for="item in serverOptions"
-            :key="item.server_identity"
-            :value="item.server_identity"
-            :label="`${item.name} ${item.host} ${item.ip}`"
+            :key="item.resource_uid"
+            :value="item.resource_uid"
+            :label="`${item.name} ${item.host} ${item.ip_address}`"
           >
             <div class="server-option">
-              <span class="server-option-name">{{ item.name }}</span>
-              <span class="server-option-ip">{{ item.ip }}</span>
+              <span>{{ item.name }}</span>
+              <span class="text-muted">{{ item.ip_address || item.host }}</span>
             </div>
           </a-option>
         </a-select>
       </div>
-      <div v-if="activeServer" class="toolbar-meta text-muted">{{ activeServer.os }} · {{ activeServer.location }}</div>
+      <div v-if="activeServer" class="text-muted">
+        {{ [activeServer.os, activeServer.os_version].filter(Boolean).join(' ') || '操作系统待采集' }}
+        · {{ activeServer.location || '位置未填写' }}
+      </div>
     </div>
 
     <a-spin :loading="loading" style="width: 100%">
-      <div v-if="!selectedServerIdentity" class="hw-empty">
+      <div v-if="!selectedResourceUID" class="hardware-empty">
         <a-empty description="请先选择服务器" />
       </div>
 
-      <div v-else-if="notConfigured" class="hw-empty">
-        <a-empty :description="notConfiguredHint">
-          <template v-if="hardwareError" #extra>
-            <span class="text-muted">{{ hardwareError }}</span>
-          </template>
-        </a-empty>
-      </div>
-
-      <template v-else>
-        <a-alert v-if="statusSnapshot?.error_message" type="warning" :title="statusSnapshot.error_message" style="margin-bottom: 16px" />
-
-        <a-card title="带外设备与采集摘要" :bordered="false" class="hw-card">
-          <a-descriptions :column="{ xs: 1, sm: 2, md: 3 }" size="small" layout="horizontal">
-            <a-descriptions-item label="设备名称">
-              {{ deviceMeta?.name || '-' }}
+      <template v-else-if="snapshot">
+        <a-card title="服务器与硬件监测状态" :bordered="false" class="hardware-card">
+          <a-descriptions :column="{ xs: 1, sm: 2, md: 3 }" size="small">
+            <a-descriptions-item label="服务器">{{ activeServer?.name || '—' }}</a-descriptions-item>
+            <a-descriptions-item label="管理地址">{{ activeServer?.ip_address || activeServer?.host || '—' }}</a-descriptions-item>
+            <a-descriptions-item label="服务器类型">{{ serverTypeLabel(activeServer?.server_type) }}</a-descriptions-item>
+            <a-descriptions-item label="带外采集">
+              <a-tag :color="snapshot.configured ? 'green' : 'orange'">{{ snapshot.configured ? '已配置' : '未配置' }}</a-tag>
             </a-descriptions-item>
-            <a-descriptions-item label="管理 IP">
-              {{ deviceMeta?.ip || '-' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="协议">
-              {{ deviceMeta?.protocol || '-' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="类型">
-              {{ deviceTypeLabel(deviceMeta?.type) }}
-            </a-descriptions-item>
-            <a-descriptions-item label="厂商">
-              {{ deviceMeta?.manufacturer || '—' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="型号">
-              {{ deviceMeta?.model || '—' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="序列号">
-              {{ deviceMeta?.serial_number || '—' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="采集间隔(秒)">
-              {{ intervalLabel }}
-            </a-descriptions-item>
-            <a-descriptions-item label="启用">
-              <a-tag v-if="deviceMeta" size="small" :color="deviceMeta.enabled ? 'green' : 'red'">
-                {{ deviceMeta.enabled ? '是' : '否' }}
-              </a-tag>
-              <span v-else>—</span>
-            </a-descriptions-item>
-            <a-descriptions-item label="最近采集时间">
-              {{ collectedAtLabel }}
+            <a-descriptions-item label="最近采集">
+              {{ snapshot.collected_at ? dayjs(snapshot.collected_at).format('YYYY-MM-DD HH:mm:ss') : '暂无数据' }}
             </a-descriptions-item>
             <a-descriptions-item label="整体健康">
-              <a-tag v-if="statusSnapshot?.status" size="small" :color="healthColor(statusSnapshot.status)">
-                {{ statusSnapshot.status }}
-              </a-tag>
-              <span v-else>—</span>
-            </a-descriptions-item>
-            <a-descriptions-item label="时序库">
-              <a-tag size="small" :color="timescaledb ? 'arcoblue' : 'gray'">
-                {{ timescaledb ? '已配置' : '未配置' }}
-              </a-tag>
+              <a-tag :color="healthColor(snapshot.overall_status)">{{ healthLabel(snapshot.overall_status) }}</a-tag>
             </a-descriptions-item>
           </a-descriptions>
         </a-card>
 
-        <a-card title="健康分项" :bordered="false" class="hw-card">
-          <a-row :gutter="[12, 12]">
-            <a-col v-for="item in subStatusItems" :key="item.key" :xs="12" :sm="8" :md="6" :lg="4">
-              <div class="hw-sub-item">
-                <div class="hw-sub-label">{{ item.label }}</div>
-                <a-tag v-if="item.value" size="small" :color="healthColor(item.value)">
-                  {{ item.value }}
-                </a-tag>
-                <span v-else class="hw-sub-dash">—</span>
-              </div>
-            </a-col>
-          </a-row>
+        <a-alert
+          v-if="!snapshot.configured"
+          type="info"
+          class="hardware-card"
+          title="尚未配置带外采集"
+          content="请在服务器管理中打开“采集绑定”，选择 Redfish 或 IPMI 模板、统一凭证和采集节点。服务器不需要在本页重复创建。"
+        />
+        <a-alert
+          v-else-if="!snapshot.has_data"
+          type="warning"
+          class="hardware-card"
+          title="采集链路已配置，暂未收到硬件数据"
+          content="请检查采集绑定是否启用、采集节点是否在线，以及带外管理地址和只读凭证是否正确。"
+        />
+
+        <a-card v-if="snapshot.bindings.length" title="带外采集绑定" :bordered="false" class="hardware-card">
+          <a-table :columns="bindingColumns" :data="snapshot.bindings" :pagination="false" row-key="id" size="small">
+            <template #protocol="{ record }">{{ String(record.protocol).toUpperCase() }}</template>
+            <template #target="{ record }">{{ record.target }}:{{ record.port }}</template>
+            <template #template="{ record }">{{ record.template_name }} / v{{ record.template_version }}</template>
+            <template #state="{ record }">
+              <a-tag :color="record.enabled && record.state === 'active' ? 'green' : 'orange'">
+                {{ record.enabled && record.state === 'active' ? '运行中' : '未运行' }}
+              </a-tag>
+            </template>
+          </a-table>
         </a-card>
 
-        <a-card v-if="statisticsSummary" title="近 7 日汇总（最新日）" :bordered="false" class="hw-card">
-          <a-row :gutter="16">
-            <a-col v-for="cell in statisticsSummary" :key="cell.label" :xs="12" :sm="8" :md="6">
-              <div class="hw-stat-cell">
-                <div class="hw-stat-label">{{ cell.label }}</div>
-                <div class="hw-stat-value">{{ cell.value }}</div>
-              </div>
-            </a-col>
-          </a-row>
+        <a-card title="硬件传感器指标" :bordered="false" class="hardware-card">
+          <a-table
+            v-if="metricRows.length"
+            :columns="metricColumns"
+            :data="metricRows"
+            :pagination="false"
+            row-key="key"
+            size="small"
+          >
+            <template #value="{ record }">{{ formatMetricValue(record.value) }} {{ record.unit }}</template>
+            <template #status="{ record }">
+              <a-tag :color="healthColor(record.status)">{{ healthLabel(record.status) }}</a-tag>
+            </template>
+          </a-table>
+          <a-empty v-else description="暂无硬件传感器指标" />
         </a-card>
 
-        <template v-if="groupedMetrics.length">
-          <a-card v-for="g in groupedMetrics" :key="g.type" :title="g.title" :bordered="false" class="hw-card">
-            <a-table :columns="metricColumns" :data="g.rows" :pagination="false" row-key="__key" size="small" :bordered="{ cell: true }">
-              <template #status="{ record }">
-                <a-tag size="small" :color="healthColor(record.status)">
-                  {{ record.status || '—' }}
-                </a-tag>
-              </template>
-            </a-table>
-          </a-card>
-        </template>
-        <a-card v-else title="指标明细" :bordered="false" class="hw-card">
-          <a-empty description="暂无指标数据（请确认采集成功或查看原始 JSON）" />
-        </a-card>
-
-        <a-card v-if="timescaledb && deviceId && metricNameOptions.length" title="单指标趋势" :bordered="false" class="hw-card">
-          <div class="hw-chart-toolbar">
+        <a-card v-if="metricOptions.length" title="硬件指标趋势" :bordered="false" class="hardware-card">
+          <div class="trend-toolbar">
             <a-select
-              v-model="selectedMetricName"
+              v-model="selectedMetricKey"
+              :options="metricOptions"
               allow-search
-              :style="{ width: '280px' }"
-              placeholder="选择指标"
-              :options="metricNameOptions"
+              placeholder="选择指标和传感器"
+              :style="{ width: '360px' }"
             />
-            <span class="text-muted">默认最近 24 小时</span>
+            <span class="text-muted">最近 24 小时，展示原始采样值</span>
           </div>
           <a-spin :loading="historyLoading" style="width: 100%">
-            <div class="hw-chart-wrap">
-              <Chart v-if="historyChartOptions" :options="historyChartOptions" height="280px" width="100%" />
-              <a-empty v-else description="暂无曲线数据" />
-            </div>
+            <Chart v-if="historyChartOptions" :options="historyChartOptions" height="280px" width="100%" />
+            <a-empty v-else description="暂无趋势数据" />
           </a-spin>
         </a-card>
-        <a-card v-else-if="deviceId && !timescaledb" title="单指标趋势" :bordered="false" class="hw-card">
-          <p class="text-muted">未配置 TimescaleDB，时序曲线不可用；可查看上方指标表或下方原始 JSON。</p>
+
+        <a-card title="硬件库存" :bordered="false" class="hardware-card">
+          <a-table
+            v-if="inventoryRows.length"
+            :columns="inventoryColumns"
+            :data="inventoryRows"
+            :pagination="false"
+            row-key="key"
+            size="small"
+          >
+            <template #status="{ record }">
+              <a-tag :color="healthColor(record.status)">{{ healthLabel(record.status) }}</a-tag>
+            </template>
+          </a-table>
+          <a-empty v-else description="暂无硬件库存数据" />
         </a-card>
 
-        <a-card title="原始采集 JSON" :bordered="false" class="hw-card">
-          <a-collapse>
-            <a-collapse-item key="raw" header="展开查看 raw_data（排障）">
-              <pre class="hw-raw-pre">{{ rawDataFormatted }}</pre>
-            </a-collapse-item>
-          </a-collapse>
-        </a-card>
+        <a-row :gutter="16">
+          <a-col :xs="24" :lg="12">
+            <a-card title="硬件事件" :bordered="false" class="hardware-card">
+              <a-table v-if="eventRows.length" :columns="eventColumns" :data="eventRows" :pagination="false" row-key="key" size="small">
+                <template #severity="{ record }">
+                  <a-tag :color="healthColor(record.severity)">{{ healthLabel(record.severity) }}</a-tag>
+                </template>
+              </a-table>
+              <a-empty v-else description="暂无硬件事件" />
+            </a-card>
+          </a-col>
+          <a-col :xs="24" :lg="12">
+            <a-card title="采集诊断" :bordered="false" class="hardware-card">
+              <a-table
+                v-if="diagnosticRows.length"
+                :columns="diagnosticColumns"
+                :data="diagnosticRows"
+                :pagination="false"
+                row-key="key"
+                size="small"
+              >
+                <template #level="{ record }">
+                  <a-tag :color="healthColor(record.level)">{{ healthLabel(record.level) }}</a-tag>
+                </template>
+              </a-table>
+              <a-empty v-else description="暂无采集诊断信息" />
+            </a-card>
+          </a-col>
+        </a-row>
       </template>
+
+      <div v-else-if="loadError" class="hardware-empty">
+        <a-result status="error" title="硬件监测数据加载失败" :subtitle="loadError" />
+      </div>
     </a-spin>
   </div>
 </template>
@@ -172,237 +174,227 @@ import { computed, onMounted, ref, watch } from 'vue'
 import dayjs from 'dayjs'
 import { Message } from '@arco-design/web-vue'
 import Chart from '@/components/chart/index.vue'
-import { fetchServerList, type ServerItem } from '@/api/ops/server'
+import { fetchControlMetricDefinitionOptions, type ControlMetricDefinition } from '@/api/ops/dcControl'
 import {
-  fetchHostHardwareDevice,
-  fetchHostHardwareLatestCollection,
-  fetchHostHardwareMetricHistory,
-  fetchHostHardwareStatistics,
-  isHostHardwareApiSuccess,
-  normalizeHostHardwareMetrics,
-  unwrapHostHardwareDetails,
-  type HostHardwareDevice,
-  type HostHardwareLatestCollectionPayload,
-  type HostHardwareStatisticsRow,
-  type HostHardwareStatus,
-  type NormalizedHostHardwareMetric,
-} from '@/api/ops/host-hardware'
-
-interface ServerOption {
-  server_identity: string
-  name: string
-  host: string
-  ip: string
-  os: string
-  location: string
-}
+  fetchServerHardwareMetricHistory,
+  fetchServerHardwareSnapshot,
+  fetchServerList,
+  type HardwareSnapshotPayload,
+  type ServerItem,
+} from '@/api/ops/server'
 
 const serverListLoading = ref(false)
 const loading = ref(false)
-const notConfigured = ref(false)
-const hardwareError = ref('')
-const collection = ref<HostHardwareLatestCollectionPayload | null>(null)
-const deviceMeta = ref<HostHardwareDevice | null>(null)
 const historyLoading = ref(false)
-const statisticsRows = ref<HostHardwareStatisticsRow[]>([])
-const selectedMetricName = ref<string>('')
+const serverOptions = ref<ServerItem[]>([])
+const metricDefinitions = ref<ControlMetricDefinition[]>([])
+const selectedResourceUID = ref<string>()
+const snapshot = ref<HardwareSnapshotPayload>()
+const selectedMetricKey = ref('')
 const historyChartOptions = ref<Record<string, unknown> | null>(null)
+const loadError = ref('')
 
-const serverOptions = ref<ServerOption[]>([])
-const selectedServerIdentity = ref<string | undefined>(undefined)
+const activeServer = computed(() => serverOptions.value.find((item) => item.resource_uid === selectedResourceUID.value))
 
-const activeServer = computed(() => serverOptions.value.find((s) => s.server_identity === selectedServerIdentity.value))
+const metricDefinitionMap = computed(() => new Map(metricDefinitions.value.map((item) => [item.metric_code, item])))
 
-/** 与 hardware_devices.type 一致：server/switch/storage 等 */
-function deviceTypeLabel(t?: string) {
-  if (t === undefined || t === null || String(t).trim() === '') return '—'
-  const raw = String(t).trim()
-  const map: Record<string, string> = {
-    server: '服务器',
-    switch: '交换机',
-    storage: '存储',
-    other: '其它',
-  }
-  return map[raw] || raw
-}
-
-const statusSnapshot = computed(() => collection.value?.status ?? null)
-const deviceId = computed(() => collection.value?.device_id ?? '')
-const timescaledb = computed(() => collection.value?.timescaledb === true)
-
-const normalizedMetrics = computed<NormalizedHostHardwareMetric[]>(() =>
-  normalizeHostHardwareMetrics(statusSnapshot.value, collection.value?.metrics)
+const metricRows = computed(() =>
+  (snapshot.value?.metrics || []).map((item, index) => ({
+    key: `${item.code}-${item.labels?.sensor || ''}-${index}`,
+    code: item.code,
+    name: metricDefinitionMap.value.get(item.code)?.metric_name || item.code,
+    sensor: item.labels?.sensor || '—',
+    location: item.labels?.location || '—',
+    value: item.value,
+    unit: item.unit || '',
+    status: item.labels?.status || 'unknown',
+  }))
 )
 
-const metricNameOptions = computed(() => {
-  const names = [...new Set(normalizedMetrics.value.map((m) => m.name).filter(Boolean))]
-  return names.sort().map((n) => ({ label: n, value: n }))
-})
+const metricOptions = computed(() =>
+  metricRows.value
+    .filter((item) => item.sensor !== '—' && metricDefinitionMap.value.has(item.code))
+    .map((item) => ({
+      label: `${item.name} · ${item.sensor}`,
+      value: item.key,
+      metricCode: item.code,
+      sensor: item.sensor,
+      unit: item.unit,
+    }))
+)
 
-const collectedAtLabel = computed(() => {
-  const t = collection.value?.collected_at || statusSnapshot.value?.last_check_time
-  if (!t) return '—'
-  return dayjs(t).format('YYYY-MM-DD HH:mm:ss')
-})
-
-const intervalLabel = computed(() => {
-  const n = deviceMeta.value?.collect_interval
-  if (n === undefined || n === null) return '—'
-  if (n <= 0) return '默认（服务端 YAML）'
-  return String(n)
-})
-
-const notConfiguredHint = computed(() => {
-  if (hardwareError.value) return '无法加载服务器硬件监控数据'
-  return '未配置带外监控：请在 DC-Hardware 中创建设备并填写与当前主机一致的 server_identity'
-})
-
-const subStatusItems = computed(() => {
-  const s = statusSnapshot.value
-  const fields: { key: keyof HostHardwareStatus; label: string }[] = [
-    { key: 'power_status', label: '电源' },
-    { key: 'temperature_status', label: '温度' },
-    { key: 'fan_status', label: '风扇' },
-    { key: 'psu_status', label: 'PSU' },
-    { key: 'cpu_status', label: 'CPU' },
-    { key: 'memory_status', label: '内存' },
-    { key: 'disk_status', label: '磁盘' },
-  ]
-  return fields.map((f) => ({
-    key: String(f.key),
-    label: f.label,
-    value: (s?.[f.key] as string | undefined) || '',
+const inventoryRows = computed(() =>
+  (snapshot.value?.inventory || []).map((item, index) => ({
+    key: `${item.type}-${item.identity}-${index}`,
+    type: item.type,
+    identity: item.identity,
+    name: item.name || '—',
+    status: item.status || 'unknown',
+    attributes: formatAttributes(item.attributes),
   }))
-})
+)
 
-const GROUP_ORDER = ['temperature', 'fan_speed', 'voltage', 'current', 'power', 'power_status', 'network', 'system', 'uptime']
-
-function groupTitle(t: string): string {
-  const map: Record<string, string> = {
-    temperature: '温度',
-    fan_speed: '风扇',
-    voltage: '电压',
-    current: '电流',
-    power: '功耗',
-    power_status: '电源状态',
-    network: '网络',
-    system: '系统',
-    uptime: '运行时间',
-    other: '其它',
-  }
-  return map[t] || t || '其它'
-}
-
-const groupedMetrics = computed(() => {
-  const rows = normalizedMetrics.value
-  const map = new Map<string, NormalizedHostHardwareMetric[]>()
-  for (const r of rows) {
-    const t = r.type || 'other'
-    const list = map.get(t) ?? []
-    list.push(r)
-    map.set(t, list)
-  }
-  const keys = [...map.keys()].sort((a, b) => {
-    const ia = GROUP_ORDER.indexOf(a)
-    const ib = GROUP_ORDER.indexOf(b)
-    if (ia === -1 && ib === -1) return a.localeCompare(b)
-    if (ia === -1) return 1
-    if (ib === -1) return -1
-    return ia - ib
-  })
-  return keys.map((k) => ({
-    type: k,
-    title: groupTitle(k),
-    rows: map.get(k)!.map((m, idx) => ({
-      __key: `${k}-${idx}-${m.name}-${m.location ?? ''}`,
-      name: m.name,
-      type: m.type,
-      value: formatMetricValue(m.value),
-      unit: m.unit || '—',
-      location: m.location || '—',
-      threshold: m.threshold !== undefined && m.threshold !== 0 ? String(m.threshold) : '—',
-      status: m.status,
-    })),
+const eventRows = computed(() =>
+  (snapshot.value?.events || []).map((item, index) => ({
+    key: `${item.code}-${index}`,
+    code: item.code,
+    severity: item.severity || 'unknown',
+    summary: item.summary,
   }))
-})
+)
 
-const metricColumns = [
-  { title: '名称', dataIndex: 'name', ellipsis: true, tooltip: true, width: 200 },
-  { title: '类型', dataIndex: 'type', width: 120 },
-  { title: '位置', dataIndex: 'location', ellipsis: true, width: 140 },
-  { title: '数值', dataIndex: 'value', width: 120 },
-  { title: '单位', dataIndex: 'unit', width: 80 },
-  { title: '阈值', dataIndex: 'threshold', width: 110 },
-  { title: '状态', dataIndex: 'status', width: 100, slotName: 'status' },
+const diagnosticRows = computed(() =>
+  (snapshot.value?.diagnostics || []).map((item, index) => ({
+    key: `${item.code}-${index}`,
+    code: item.code,
+    level: item.level || 'unknown',
+    message: item.message,
+  }))
+)
+
+const bindingColumns = [
+  { title: '名称', dataIndex: 'name', ellipsis: true, tooltip: true },
+  { title: '协议', slotName: 'protocol', width: 100 },
+  { title: '目标', slotName: 'target', width: 180 },
+  { title: '采集节点', dataIndex: 'collector_node_name', width: 140 },
+  { title: '凭证', dataIndex: 'credential_name', width: 160 },
+  { title: '厂商模板', slotName: 'template', width: 200 },
+  { title: '间隔（秒）', dataIndex: 'interval_seconds', width: 110 },
+  { title: '状态', slotName: 'state', width: 100 },
 ]
 
-function formatMetricValue(v: number): string {
-  if (Number.isInteger(v)) return String(v)
-  if (Number.isNaN(v)) return '-'
-  return v.toFixed(2)
+const metricColumns = [
+  { title: '指标', dataIndex: 'name', width: 180 },
+  { title: '传感器', dataIndex: 'sensor', ellipsis: true, tooltip: true },
+  { title: '位置', dataIndex: 'location', ellipsis: true, tooltip: true },
+  { title: '采样值', slotName: 'value', width: 150 },
+  { title: '状态', slotName: 'status', width: 100 },
+]
+
+const inventoryColumns = [
+  { title: '类型', dataIndex: 'type', width: 130 },
+  { title: '名称', dataIndex: 'name', width: 180, ellipsis: true, tooltip: true },
+  { title: '标识', dataIndex: 'identity', width: 180, ellipsis: true, tooltip: true },
+  { title: '状态', slotName: 'status', width: 100 },
+  { title: '属性', dataIndex: 'attributes', ellipsis: true, tooltip: true },
+]
+
+const eventColumns = [
+  { title: '事件', dataIndex: 'code', width: 150, ellipsis: true, tooltip: true },
+  { title: '级别', slotName: 'severity', width: 90 },
+  { title: '内容', dataIndex: 'summary', ellipsis: true, tooltip: true },
+]
+
+const diagnosticColumns = [
+  { title: '诊断项', dataIndex: 'code', width: 150, ellipsis: true, tooltip: true },
+  { title: '级别', slotName: 'level', width: 90 },
+  { title: '说明', dataIndex: 'message', ellipsis: true, tooltip: true },
+]
+
+function serverTypeLabel(value?: string) {
+  if (value === 'physical') return '物理服务器'
+  if (value === 'virtual') return '虚拟机'
+  return value || '—'
 }
 
-function healthColor(s: string): string {
-  const x = (s || '').toLowerCase()
-  if (x === 'ok' || x === 'online' || x === 'on') return 'green'
-  if (x === 'warning') return 'orange'
-  if (x === 'critical' || x === 'offline' || x === 'error') return 'red'
-  if (x === 'unknown') return 'gray'
-  return 'arcoblue'
+function healthLabel(value?: string) {
+  const normalized = String(value || '').toLowerCase()
+  if (['ok', 'healthy', 'online', 'on', 'normal', 'info'].includes(normalized)) return '正常'
+  if (['warning', 'warn', 'degraded', 'degrade'].includes(normalized)) return '警告'
+  if (['critical', 'fatal', 'error', 'failed', 'failure', 'unhealthy', 'offline'].includes(normalized)) return '严重'
+  return '未知'
 }
 
-const rawDataFormatted = computed(() => {
-  const raw = statusSnapshot.value?.raw_data
-  if (!raw) return '—'
-  try {
-    const o = JSON.parse(raw)
-    return JSON.stringify(o, null, 2)
-  } catch {
-    return raw
-  }
-})
+function healthColor(value?: string) {
+  const label = healthLabel(value)
+  if (label === '正常') return 'green'
+  if (label === '警告') return 'orange'
+  if (label === '严重') return 'red'
+  return 'gray'
+}
 
-const statisticsSummary = computed(() => {
-  const rows = statisticsRows.value
-  if (!rows.length) return null
-  const latest = [...rows].sort((a, b) => {
-    const ta = new Date(a.stat_date).getTime()
-    const tb = new Date(b.stat_date).getTime()
-    return tb - ta
-  })[0]
-  const cells: { label: string; value: string }[] = []
-  const push = (label: string, v: number | undefined) => {
-    if (v === undefined || v === null || Number.isNaN(v)) return
-    cells.push({ label, value: String(v) })
-  }
-  push('平均温度', latest.avg_temperature)
-  push('最高温度', latest.max_temperature)
-  push('最低温度', latest.min_temperature)
-  push('平均风扇转速', latest.avg_fan_speed)
-  push('平均功耗', latest.avg_power_usage)
-  push('最大功耗', latest.max_power_usage)
-  push('可用率(%)', latest.availability)
-  push('告警次数', latest.warning_count)
-  push('严重次数', latest.critical_count)
-  return cells.length ? cells : null
-})
+function formatMetricValue(value: number) {
+  if (!Number.isFinite(value)) return '—'
+  return Number.isInteger(value) ? String(value) : value.toFixed(2)
+}
 
-async function loadStatistics(id: string) {
+function formatAttributes(attributes?: Record<string, string>) {
+  if (!attributes) return '—'
+  const values = Object.entries(attributes).map(([key, value]) => `${key}: ${value}`)
+  return values.length ? values.join('；') : '—'
+}
+
+function filterServerOption(input: string, option: { label?: string }) {
+  return !input || String(option.label || '').toLowerCase().includes(input.trim().toLowerCase())
+}
+
+async function loadServerOptions() {
+  serverListLoading.value = true
   try {
-    const end = dayjs().format('YYYY-MM-DD')
-    const start = dayjs().subtract(6, 'day').format('YYYY-MM-DD')
-    const res = await fetchHostHardwareStatistics(id, start, end)
-    const rows = unwrapHostHardwareDetails(res)
-    statisticsRows.value = Array.isArray(rows) ? rows : []
-  } catch {
-    statisticsRows.value = []
+    const result: ServerItem[] = []
+    let page = 1
+    let total = 0
+    do {
+      const response: any = await fetchServerList({ page, size: 100 })
+      if (response.code !== 0) throw new Error(response.message || '加载服务器列表失败')
+      const current: ServerItem[] = response.details?.data || []
+      total = Number(response.details?.total || 0)
+      result.push(...current)
+      page += 1
+    } while (result.length < total)
+    serverOptions.value = result
+    if (!selectedResourceUID.value && result.length) {
+      selectedResourceUID.value = result[0].resource_uid
+    }
+  } catch (error: any) {
+    serverOptions.value = []
+    Message.error(error?.message || '加载服务器列表失败')
+  } finally {
+    serverListLoading.value = false
+  }
+}
+
+async function loadMetricDefinitions() {
+  try {
+    const response: any = await fetchControlMetricDefinitionOptions({
+      resource_category: 'host',
+      resource_subtype: 'server_hardware',
+      data_source: 'dc-host',
+    })
+    if (response.code !== 0) throw new Error(response.message || '加载服务器硬件指标目录失败')
+    metricDefinitions.value = response.details?.list || []
+  } catch (error: any) {
+    metricDefinitions.value = []
+    Message.error(error?.message || '加载服务器硬件指标目录失败')
+  }
+}
+
+async function loadHardware() {
+  if (!selectedResourceUID.value) {
+    snapshot.value = undefined
+    return
+  }
+  loading.value = true
+  loadError.value = ''
+  historyChartOptions.value = null
+  selectedMetricKey.value = ''
+  try {
+    const response: any = await fetchServerHardwareSnapshot(selectedResourceUID.value)
+    if (response.code !== 0 || !response.details) throw new Error(response.message || '加载硬件监测数据失败')
+    snapshot.value = response.details
+    const first = metricOptions.value[0]
+    if (first) selectedMetricKey.value = first.value
+  } catch (error: any) {
+    snapshot.value = undefined
+    loadError.value = error?.message || '加载硬件监测数据失败'
+  } finally {
+    loading.value = false
   }
 }
 
 async function loadHistory() {
-  const id = deviceId.value
-  const name = selectedMetricName.value
-  if (!id || !name || !timescaledb.value) {
+  const option = metricOptions.value.find((item) => item.value === selectedMetricKey.value)
+  if (!selectedResourceUID.value || !option) {
     historyChartOptions.value = null
     return
   }
@@ -410,31 +402,24 @@ async function loadHistory() {
   try {
     const end = dayjs()
     const start = end.subtract(24, 'hour')
-    const res = await fetchHostHardwareMetricHistory(id, name, start.toISOString(), end.toISOString())
-    const payload = unwrapHostHardwareDetails(res)
-    const points = payload?.data ?? []
-    if (!points.length) {
-      historyChartOptions.value = null
-      return
-    }
-    const labels = points.map((p) => dayjs(p.collection_time).format('MM-DD HH:mm'))
-    const vals = points.map((p) => p.metric_value / 100)
-    historyChartOptions.value = {
-      tooltip: { trigger: 'axis' },
-      grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
-      xAxis: { type: 'category', boundaryGap: false, data: labels },
-      yAxis: { type: 'value', name: points[0]?.unit || '' },
-      series: [
-        {
-          name,
-          type: 'line',
-          smooth: true,
-          data: vals,
-          lineStyle: { width: 2, color: '#165DFF' },
-          itemStyle: { color: '#165DFF' },
-        },
-      ],
-    }
+    const response: any = await fetchServerHardwareMetricHistory(
+      selectedResourceUID.value,
+      option.metricCode,
+      option.sensor,
+      start.toISOString(),
+      end.toISOString()
+    )
+    if (response.code !== 0) throw new Error(response.message || '加载趋势失败')
+    const points = response.details?.points || []
+    historyChartOptions.value = points.length
+      ? {
+          tooltip: { trigger: 'axis' },
+          grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+          xAxis: { type: 'category', boundaryGap: false, data: points.map((item: any) => dayjs(item.timestamp).format('MM-DD HH:mm')) },
+          yAxis: { type: 'value', name: points[0]?.unit || option.unit },
+          series: [{ name: option.label, type: 'line', smooth: true, data: points.map((item: any) => item.value) }],
+        }
+      : null
   } catch {
     historyChartOptions.value = null
   } finally {
@@ -442,125 +427,10 @@ async function loadHistory() {
   }
 }
 
-function resetState() {
-  notConfigured.value = false
-  hardwareError.value = ''
-  collection.value = null
-  deviceMeta.value = null
-  statisticsRows.value = []
-  historyChartOptions.value = null
-  selectedMetricName.value = ''
-}
-
-async function loadHostHardware() {
-  const sid = selectedServerIdentity.value
-  if (!sid) {
-    resetState()
-    return
-  }
-  loading.value = true
-  hardwareError.value = ''
-  try {
-    const res = await fetchHostHardwareLatestCollection(sid)
-    if (!isHostHardwareApiSuccess(res)) {
-      notConfigured.value = true
-      collection.value = null
-      deviceMeta.value = null
-      hardwareError.value = (res as { message?: string })?.message || ''
-      return
-    }
-    const data = unwrapHostHardwareDetails(res)
-    if (!data) {
-      notConfigured.value = true
-      return
-    }
-    notConfigured.value = false
-    collection.value = data
-    if (data.device_id) {
-      const devRes = await fetchHostHardwareDevice(data.device_id)
-      if (isHostHardwareApiSuccess(devRes)) {
-        const devPayload = unwrapHostHardwareDetails(devRes)
-        deviceMeta.value = devPayload?.device ?? null
-      } else {
-        deviceMeta.value = null
-      }
-      await loadStatistics(data.device_id)
-    } else {
-      deviceMeta.value = null
-      statisticsRows.value = []
-    }
-    const names = [
-      ...new Set(
-        normalizeHostHardwareMetrics(data.status, data.metrics)
-          .map((m) => m.name)
-          .filter(Boolean)
-      ),
-    ]
-    selectedMetricName.value = names.sort()[0] || ''
-  } catch (e: unknown) {
-    const err = e as { response?: { data?: { message?: string } }; message?: string }
-    notConfigured.value = true
-    collection.value = null
-    deviceMeta.value = null
-    hardwareError.value = err?.response?.data?.message || err?.message || '请求失败'
-  } finally {
-    loading.value = false
-  }
-}
-
-function filterServerOption(input: string, option: { label?: string }) {
-  if (!input) return true
-  const q = input.trim().toLowerCase()
-  return String(option?.label ?? '')
-    .toLowerCase()
-    .includes(q)
-}
-
-async function loadServerOptions() {
-  serverListLoading.value = true
-  try {
-    const res: any = await fetchServerList({ page: 1, size: 500 })
-    if (res.code !== 0) {
-      Message.error(res.message || '加载服务器列表失败')
-      serverOptions.value = []
-      return
-    }
-    const list: ServerItem[] = res.details?.data ?? []
-    serverOptions.value = list.map((r) => ({
-      server_identity: r.server_identity,
-      name: r.name,
-      host: r.host,
-      ip: r.ip_address || r.host,
-      os: [r.os, r.os_version].filter(Boolean).join(' ') || '-',
-      location: r.location || '-',
-    }))
-    if (selectedServerIdentity.value && !serverOptions.value.some((s) => s.server_identity === selectedServerIdentity.value)) {
-      selectedServerIdentity.value = undefined
-    }
-    if (!selectedServerIdentity.value && serverOptions.value.length > 0) {
-      selectedServerIdentity.value = serverOptions.value[0].server_identity
-    }
-  } catch (e: any) {
-    Message.error(e?.message || '加载服务器列表失败')
-    serverOptions.value = []
-  } finally {
-    serverListLoading.value = false
-  }
-}
-
-watch(
-  selectedServerIdentity,
-  () => {
-    loadHostHardware()
-  },
-  { immediate: true }
-)
-
-watch([selectedMetricName, timescaledb, deviceId], () => {
-  loadHistory()
-})
-
+watch(selectedResourceUID, loadHardware)
+watch(selectedMetricKey, loadHistory)
 onMounted(async () => {
+  await loadMetricDefinitions()
   await loadServerOptions()
 })
 </script>
@@ -576,127 +446,59 @@ export default {
   padding: 16px;
 }
 
-.page-toolbar {
+.page-toolbar,
+.toolbar-left,
+.server-option,
+.trend-toolbar {
   display: flex;
-  flex-wrap: wrap;
   align-items: center;
+}
+
+.page-toolbar {
   justify-content: space-between;
+  flex-wrap: wrap;
   gap: 12px;
   margin-bottom: 16px;
 }
 
-.toolbar-left {
-  display: flex;
-  align-items: center;
+.toolbar-left,
+.trend-toolbar {
   gap: 12px;
 }
 
 .toolbar-label {
-  font-size: 14px;
   color: var(--color-text-2);
   white-space: nowrap;
 }
 
 .server-select {
-  min-width: 260px;
-  max-width: 360px;
+  width: 360px;
 }
 
 .server-option {
-  display: flex;
-  justify-content: space-between;
-  gap: 12px;
   width: 100%;
+  justify-content: space-between;
+  gap: 16px;
 }
 
-.server-option-name {
-  font-size: 14px;
-  color: var(--color-text-1);
+.hardware-card {
+  margin-bottom: 16px;
 }
 
-.server-option-ip {
-  font-size: 13px;
-  color: var(--color-text-3);
-  font-family: var(--font-family-mono);
-}
-
-.toolbar-meta {
-  font-size: 13px;
-}
-
-.hw-empty {
-  min-height: 220px;
+.hardware-empty {
+  min-height: 240px;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-.hw-card {
-  margin-bottom: 16px;
-}
-
-.hw-sub-item {
-  padding: 8px 10px;
-  border-radius: 8px;
-  background: var(--color-fill-1);
-  border: 1px solid var(--color-border-1);
-}
-
-.hw-sub-label {
-  font-size: 12px;
-  color: var(--color-text-3);
-  margin-bottom: 6px;
-}
-
-.hw-sub-dash {
-  color: var(--color-text-4);
-  font-size: 13px;
-}
-
-.hw-stat-cell {
-  padding: 12px;
-  border-radius: 8px;
-  background: var(--color-fill-1);
-  border: 1px solid var(--color-border-1);
-}
-
-.hw-stat-label {
-  font-size: 12px;
-  color: var(--color-text-3);
-  margin-bottom: 4px;
-}
-
-.hw-stat-value {
-  font-size: 18px;
-  font-weight: 600;
-  color: var(--color-text-1);
-}
-
-.hw-chart-toolbar {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  margin-bottom: 12px;
+.trend-toolbar {
   flex-wrap: wrap;
-}
-
-.hw-chart-wrap {
-  width: 100%;
-  min-height: 280px;
-}
-
-.hw-raw-pre {
-  margin: 0;
-  max-height: 360px;
-  overflow: auto;
-  font-size: 12px;
-  line-height: 1.45;
-  white-space: pre-wrap;
-  word-break: break-all;
+  margin-bottom: 12px;
 }
 
 .text-muted {
-  font-size: 12px;
   color: var(--color-text-3);
+  font-size: 12px;
 }
 </style>
diff --git a/src/views/ops/pages/monitor/os/index.vue b/src/views/ops/pages/monitor/os/index.vue
index 9561130..25fabdc 100644
--- a/src/views/ops/pages/monitor/os/index.vue
+++ b/src/views/ops/pages/monitor/os/index.vue
@@ -4,7 +4,7 @@
       <div class="toolbar-left">
         <span class="toolbar-label">当前服务器</span>
         <a-select
-          v-model="selectedServerIdentity"
+          v-model="selectedResourceUID"
           class="server-select"
           placeholder="输入名称或地址搜索"
           allow-search
@@ -14,8 +14,8 @@
         >
           <a-option
             v-for="item in serverOptions"
-            :key="item.server_identity"
-            :value="item.server_identity"
+            :key="item.resource_uid"
+            :value="item.resource_uid"
             :label="`${item.name} ${item.host} ${item.ip}`"
           >
             <div class="server-option">
@@ -155,6 +155,7 @@ import {
 import { fetchAlertRecords } from '@/api/ops/alertRecord'
 
 interface ServerOption {
+  resource_uid: string
   server_identity: string
   name: string
   host: string
@@ -191,12 +192,12 @@ const alertsLoading = ref(false)
 const recentAlerts = ref<any[]>([])
 
 const serverOptions = ref<ServerOption[]>([])
-const selectedServerIdentity = ref<string | undefined>(undefined)
+const selectedResourceUID = ref<string | undefined>(undefined)
 
 const summaryPayload = ref<HostMetricsSummary | null>(null)
 const trafficPayload = ref<HostNetworkTrafficPayload | null>(null)
 
-const activeServer = computed(() => serverOptions.value.find((s) => s.server_identity === selectedServerIdentity.value))
+const activeServer = computed(() => serverOptions.value.find((s) => s.resource_uid === selectedResourceUID.value))
 
 const emptyPieOptions = (): Record<string, unknown> => ({
   graphic: [
@@ -547,17 +548,17 @@ async function loadRecentAlertsForServer(server: ServerOption | undefined) {
     recentAlerts.value = []
     return
   }
-  const targetSid = server.server_identity
+  const targetResourceUID = server.resource_uid
   try {
     const res: any = await fetchAlertRecords({
       page: 1,
       page_size: 5,
       sort: 'starts_at',
       order: 'desc',
-      server_identity: targetSid,
+      resource_uid: targetResourceUID,
     })
     /** 切换主机后丢弃过期响应，避免空结果仍显示上一台主机的列表 */
-    if (selectedServerIdentity.value !== targetSid) {
+    if (selectedResourceUID.value !== targetResourceUID) {
       return
     }
     const code = res?.code
@@ -570,7 +571,7 @@ async function loadRecentAlertsForServer(server: ServerOption | undefined) {
     const rows = normalizeAlertRecordList(res).slice(0, 5)
     recentAlerts.value = rows
   } catch (e: any) {
-    if (selectedServerIdentity.value === targetSid) {
+    if (selectedResourceUID.value === targetResourceUID) {
       recentAlerts.value = []
       Message.error(e?.message || '加载最近告警失败')
     }
@@ -679,6 +680,7 @@ async function loadServerOptions() {
     }
     const list: ServerItem[] = res.details?.data ?? []
     serverOptions.value = list.map((r) => ({
+      resource_uid: r.resource_uid,
       server_identity: r.server_identity,
       name: r.name,
       host: r.host,
@@ -686,11 +688,11 @@ async function loadServerOptions() {
       os: [r.os, r.os_version].filter(Boolean).join(' ') || '-',
       location: r.location || '-',
     }))
-    if (selectedServerIdentity.value && !serverOptions.value.some((s) => s.server_identity === selectedServerIdentity.value)) {
-      selectedServerIdentity.value = undefined
+    if (selectedResourceUID.value && !serverOptions.value.some((s) => s.resource_uid === selectedResourceUID.value)) {
+      selectedResourceUID.value = undefined
     }
-    if (!selectedServerIdentity.value && serverOptions.value.length > 0) {
-      selectedServerIdentity.value = serverOptions.value[0].server_identity
+    if (!selectedResourceUID.value && serverOptions.value.length > 0) {
+      selectedResourceUID.value = serverOptions.value[0].resource_uid
     }
   } catch (e: any) {
     Message.error(e?.message || '加载服务器列表失败')
@@ -701,22 +703,22 @@ async function loadServerOptions() {
 }
 
 async function refreshDashboard() {
-  const sid = selectedServerIdentity.value
-  if (!sid) {
+  const resourceUID = selectedResourceUID.value
+  if (!resourceUID) {
     summaryPayload.value = null
     trafficPayload.value = null
     recentAlerts.value = []
     return
   }
-  const server = serverOptions.value.find((s) => s.server_identity === sid)
+  const server = serverOptions.value.find((s) => s.resource_uid === resourceUID)
   statsLoading.value = true
   chartLoading.value = true
   alertsLoading.value = true
   recentAlerts.value = []
   try {
     const [sumRes, trafRes]: any[] = await Promise.all([
-      fetchServerMetricsSummary(sid),
-      fetchServerNetworkTraffic(sid, 6),
+      fetchServerMetricsSummary(resourceUID),
+      fetchServerNetworkTraffic(resourceUID, 6),
       loadRecentAlertsForServer(server),
     ])
     if (sumRes.code === 0) {
@@ -743,8 +745,8 @@ async function refreshDashboard() {
   }
 }
 
-watch(selectedServerIdentity, (sid) => {
-  if (!sid) {
+watch(selectedResourceUID, (resourceUID) => {
+  if (!resourceUID) {
     summaryPayload.value = null
     trafficPayload.value = null
     recentAlerts.value = []
@@ -755,7 +757,7 @@ watch(selectedServerIdentity, (sid) => {
 
 onMounted(async () => {
   await loadServerOptions()
-  // 首次选中由 loadServerOptions 设置，watch(selectedServerIdentity) 会拉取指标
+  // 首次选中由 loadServerOptions 设置，watch(selectedResourceUID) 会拉取指标
 })
 </script>
 
diff --git a/src/views/ops/pages/monitor/security/index.vue b/src/views/ops/pages/monitor/security/index.vue
index df6cf3e..fafeb64 100644
--- a/src/views/ops/pages/monitor/security/index.vue
+++ b/src/views/ops/pages/monitor/security/index.vue
@@ -283,7 +283,7 @@ const fetchData = async () => {
     }
     const metricsRespList = await Promise.all(
       baseList.map((item) =>
-        fetchSecurityMetricsLatest(item.service_identity).catch(() => ({
+        fetchSecurityMetricsLatest(item.resource_uid).catch(() => ({
           code: -1,
           details: { metrics: [] as SecurityMetric[] },
         }))
diff --git a/src/views/ops/pages/monitor/storage/index.vue b/src/views/ops/pages/monitor/storage/index.vue
index 757881f..58b971c 100644
--- a/src/views/ops/pages/monitor/storage/index.vue
+++ b/src/views/ops/pages/monitor/storage/index.vue
@@ -4,7 +4,7 @@
       <div class="toolbar-left">
         <span class="toolbar-label">当前设备</span>
         <a-select
-          v-model="selectedServiceIdentity"
+          v-model="selectedResourceUID"
           class="server-select"
           placeholder="选择存储设备"
           allow-search
@@ -16,8 +16,8 @@
         >
           <a-option
             v-for="item in storageOptions"
-            :key="item.service_identity"
-            :value="item.service_identity"
+            :key="item.resource_uid"
+            :value="item.resource_uid"
             :label="`${item.name} ${item.type} ${item.service_identity}`"
           >
             <div class="server-option">
@@ -222,7 +222,7 @@ const chartLoading = ref(false)
 
 const storageList = ref<StorageItem[]>([])
 const storageOptions = ref<StorageMonitorOptionItem[]>([])
-const selectedServiceIdentity = ref<string | undefined>(undefined)
+const selectedResourceUID = ref<string | undefined>(undefined)
 
 const monitorSummary = ref<StorageMonitorSummaryPayload | null>(null)
 
@@ -230,7 +230,7 @@ const chartSeriesPoints = ref<{ time: string; value: number }[]>([])
 
 let pollTimer: ReturnType<typeof setInterval> | null = null
 
-const activeStorage = computed(() => storageList.value.find((s) => s.service_identity === selectedServiceIdentity.value))
+const activeStorage = computed(() => storageList.value.find((s) => s.resource_uid === selectedResourceUID.value))
 
 const globalHint = computed(() => {
   const m = monitorSummary.value
@@ -275,7 +275,7 @@ const controllerStatusColor = computed(() => {
 })
 
 const chartHint = computed(() => {
-  if (!selectedServiceIdentity.value) return ''
+  if (!selectedResourceUID.value) return ''
   if (!trendMetricOptions.value.length) {
     return '该设备暂无已上报的指标批次，无法选择指标；请确认采集已写入。'
   }
@@ -332,6 +332,7 @@ const ioChartOptions = computed(() => {
 
 function syncOptionsFromList() {
   storageOptions.value = storageList.value.map((r) => ({
+    resource_uid: r.resource_uid,
     service_identity: r.service_identity,
     name: r.name,
     type: r.type,
@@ -343,10 +344,10 @@ function syncOptionsFromList() {
 }
 
 function mergeMonitorOptionAsRow(opt: StorageMonitorOptionItem) {
-  if (storageList.value.some((s) => s.service_identity === opt.service_identity)) return
+  if (storageList.value.some((s) => s.resource_uid === opt.resource_uid)) return
   storageList.value.push({
     id: 0,
-    resource_uid: '',
+    resource_uid: opt.resource_uid,
     asset_id: 0,
     created_at: '',
     updated_at: '',
@@ -377,10 +378,10 @@ function mergeMonitorOptionAsRow(opt: StorageMonitorOptionItem) {
   })
 }
 
-function onDeviceSelectChange(sid: string | undefined) {
-  if (!sid) return
-  if (!storageList.value.some((s) => s.service_identity === sid)) {
-    const opt = storageOptions.value.find((o) => o.service_identity === sid)
+function onDeviceSelectChange(resourceUID: string | undefined) {
+  if (!resourceUID) return
+  if (!storageList.value.some((s) => s.resource_uid === resourceUID)) {
+    const opt = storageOptions.value.find((o) => o.resource_uid === resourceUID)
     if (opt) mergeMonitorOptionAsRow(opt)
   }
 }
@@ -419,11 +420,11 @@ async function loadStorageList() {
     }
     storageList.value = list
     syncOptionsFromList()
-    if (selectedServiceIdentity.value && !list.some((s) => s.service_identity === selectedServiceIdentity.value)) {
-      selectedServiceIdentity.value = undefined
+    if (selectedResourceUID.value && !list.some((s) => s.resource_uid === selectedResourceUID.value)) {
+      selectedResourceUID.value = undefined
     }
-    if (!selectedServiceIdentity.value && list.length > 0) {
-      selectedServiceIdentity.value = list[0].service_identity
+    if (!selectedResourceUID.value && list.length > 0) {
+      selectedResourceUID.value = list[0].resource_uid
     }
   } catch (e: any) {
     Message.error(e?.message || '加载存储列表失败')
@@ -434,8 +435,8 @@ async function loadStorageList() {
 
 async function refreshCollectedMetricNames() {
   trendMetricOptions.value = []
-  const sid = selectedServiceIdentity.value?.trim()
-  if (!sid) {
+  const resourceUID = selectedResourceUID.value?.trim()
+  if (!resourceUID) {
     trendSelectedMetric.value = ''
     return
   }
@@ -451,7 +452,7 @@ async function refreshCollectedMetricNames() {
       }
     }
     if (!list.length) {
-      const res: any = await fetchStorageMetricsLatest(sid)
+      const res: any = await fetchStorageMetricsLatest(resourceUID)
       if (res.code === 0 && res.details?.metrics?.length) {
         list = res.details.metrics
       }
@@ -482,8 +483,8 @@ async function refreshCollectedMetricNames() {
 async function refreshMonitorSummary() {
   summaryLoading.value = true
   try {
-    const sid = selectedServiceIdentity.value?.trim() || undefined
-    const res: any = await fetchStorageMonitorSummary(sid)
+    const resourceUID = selectedResourceUID.value?.trim() || undefined
+    const res: any = await fetchStorageMonitorSummary(resourceUID)
     if (res.code === 0) {
       monitorSummary.value = res.details ?? null
     } else {
@@ -514,18 +515,13 @@ function bucketStorageMetricsHourlyMax(metrics: Array<{ timestamp: string; metri
 
 async function refreshTimeseries() {
   chartSeriesPoints.value = []
-  const svc = selectedServiceIdentity.value
-  if (!svc) return
+  const resourceUID = selectedResourceUID.value
+  if (!resourceUID) return
   const metric = trendSelectedMetric.value.trim()
   if (!metric) return
-  const end = dayjs()
-  const start = end.subtract(24, 'hour')
-  const startStr = start.toISOString()
-  const endStr = end.toISOString()
   chartLoading.value = true
   try {
-    const q = { start_time: startStr, end_time: endStr, metric_name: metric }
-    const r: any = await fetchStorageMetricsTimeseries(svc, q)
+    const r: any = await fetchStorageMetricsTimeseries(resourceUID, { metric_name: metric })
     if (r.code === 0 && r.details?.metrics?.length) {
       chartSeriesPoints.value = bucketStorageMetricsHourlyMax(r.details.metrics)
     }
@@ -541,7 +537,7 @@ async function refreshSelectionDetails() {
   await Promise.all([refreshMonitorSummary(), refreshTimeseries()])
 }
 
-watch(selectedServiceIdentity, () => {
+watch(selectedResourceUID, () => {
   void refreshSelectionDetails()
 })
 
diff --git a/src/views/ops/pages/monitor/virtualization/index.vue b/src/views/ops/pages/monitor/virtualization/index.vue
index ee62f06..71d8b22 100644
--- a/src/views/ops/pages/monitor/virtualization/index.vue
+++ b/src/views/ops/pages/monitor/virtualization/index.vue
@@ -130,7 +130,7 @@
 
     <!-- 宿主机状态 -->
     <a-row :gutter="16" class="host-row">
-      <a-col v-for="host in hostStatus" :key="host.name" :xs="12" :sm="6">
+      <a-col v-for="host in hostStatus" :key="host.assetId" :xs="12" :sm="6">
         <a-card class="host-card" :bordered="false">
           <div class="host-header">
             <span class="host-name">{{ host.name }}</span>
@@ -142,16 +142,16 @@
             <div class="metric-item">
               <div class="metric-header">
                 <span class="metric-label">CPU</span>
-                <span class="metric-value">{{ host.cpu }}%</span>
+                <span class="metric-value">{{ formatUsage(host.cpu) }}</span>
               </div>
-              <a-progress :percent="host.cpu / 100" :stroke-width="6" :show-text="false" />
+              <a-progress v-if="host.cpu !== null" :percent="host.cpu / 100" :stroke-width="6" :show-text="false" />
             </div>
             <div class="metric-item">
               <div class="metric-header">
                 <span class="metric-label">内存</span>
-                <span class="metric-value">{{ host.memory }}%</span>
+                <span class="metric-value">{{ formatUsage(host.memory) }}</span>
               </div>
-              <a-progress :percent="host.memory / 100" :stroke-width="6" :show-text="false" />
+              <a-progress v-if="host.memory !== null" :percent="host.memory / 100" :stroke-width="6" :show-text="false" />
             </div>
             <div class="metric-item metric-vm">
               <span class="metric-label">虚拟机数</span>
@@ -197,9 +197,10 @@ const loading = ref(true)
 // 宿主机状态
 const hostStatus = ref<
   Array<{
+    assetId: number
     name: string
-    cpu: number
-    memory: number
+    cpu: number | null
+    memory: number | null
     vmCount: number
     physicalCount: number
   }>
@@ -324,6 +325,8 @@ const memoryPhysicalText = computed(() => formatMaxTwoDecimals(memPhysicalGb.val
 const showVirtualEmptyTip = computed(() => !loading.value && stats.value.total === 0)
 const toGb = (bytes: number) => bytes / 1024 / 1024 / 1024
 const safeNum = (v: number | null | undefined) => (typeof v === 'number' ? v : 0)
+const usageValue = (value: number | null) => (typeof value === 'number' ? Number(value.toFixed(2)) : null)
+const formatUsage = (value: number | null) => (value === null ? '--' : `${value}%`)
 const hourLabel = (v: string) => {
   const d = new Date(v)
   if (Number.isNaN(d.getTime())) return v
@@ -378,9 +381,10 @@ const fetchData = async () => {
 
     if (mixedRes.code === 0 && mixedRes.details?.data) {
       hostStatus.value = (mixedRes.details.data as AssetMixedSummaryItem[]).map((item) => ({
-        name: `Asset-${item.asset_id}`,
-        cpu: Number(safeNum(item.physical_latest_cpu_usage).toFixed(2)),
-        memory: Number(safeNum(item.physical_latest_mem_usage).toFixed(2)),
+        assetId: item.asset_id,
+        name: item.name,
+        cpu: usageValue(item.virtual_latest_cpu_usage),
+        memory: usageValue(item.virtual_latest_mem_usage),
         vmCount: item.virtual_count || 0,
         physicalCount: item.physical_count || 0,
       }))
@@ -388,7 +392,7 @@ const fetchData = async () => {
       hostStatus.value = []
     }
   } catch (e: any) {
-    Message.error(e?.message || '加载虚拟化监控数据失败')
+    Message.error(e?.message || '加载虚拟机监控数据失败')
   } finally {
     loading.value = false
   }
diff --git a/src/views/ops/pages/netarch/topo-group/components/TopologyListDialog.vue b/src/views/ops/pages/netarch/topo-group/components/TopologyListDialog.vue
index 91fdbdb..68a5b6e 100644
--- a/src/views/ops/pages/netarch/topo-group/components/TopologyListDialog.vue
+++ b/src/views/ops/pages/netarch/topo-group/components/TopologyListDialog.vue
@@ -64,15 +64,28 @@
                 </a-tag>
               </template>
             </a-table-column>
+            <a-table-column title="网络大屏" :width="100" align="center">
+              <template #cell="{ record }">
+                <a-tag :color="record.published_to_network_screen ? 'green' : 'gray'">
+                  {{ record.published_to_network_screen ? '已发布' : '未发布' }}
+                </a-tag>
+              </template>
+            </a-table-column>
             <a-table-column title="创建时间" data-index="created_at" :width="160" align="center">
               <template #cell="{ record }">
                 {{ formatTime(record.created_at) }}
               </template>
             </a-table-column>
-            <a-table-column title="操作" :width="200" align="center" fixed="right">
+            <a-table-column title="操作" :width="290" align="center" fixed="right">
               <template #cell="{ record }">
                 <a-space>
                   <a-button type="text" size="small" @click="handleViewTopology(record)">拓扑</a-button>
+                  <a-button
+                    type="text"
+                    size="small"
+                    :disabled="record.published_to_network_screen || !record.enable"
+                    @click="handlePublish(record)"
+                  >设为网络大屏</a-button>
                   <a-button v-if="!record.auto_discovery" type="text" size="small" @click="handleOpenEdit(record)">编辑</a-button>
                   <a-button v-if="!record.auto_discovery" type="text" size="small" status="danger" @click="handleDelete(record)">删除</a-button>
                 </a-space>
@@ -100,7 +113,14 @@ import { Message, Modal } from '@arco-design/web-vue'
 import { IconPlus } from '@arco-design/web-vue/es/icon'
 import dayjs from 'dayjs'
 import type { Topology } from '@/api/ops/netarchTopo'
-import { fetchTopologies, createTopology, updateTopology, deleteTopology, fetchTopologyDetail } from '@/api/ops/netarchTopo'
+import {
+  fetchTopologies,
+  createTopology,
+  updateTopology,
+  deleteTopology,
+  fetchTopologyDetail,
+  publishTopologyToNetworkScreen,
+} from '@/api/ops/netarchTopo'
 import TopologyFormDialog from './TopologyFormDialog.vue'
 
 interface Props {
@@ -239,6 +259,23 @@ const handleDelete = (topology: Topology) => {
   })
 }
 
+const handlePublish = (topology: Topology) => {
+  Modal.confirm({
+    title: '设为网络大屏',
+    content: `将拓扑「${topology.name}」的当前布局、样式和背景发布到固定网络大屏。后续编辑需要再次发布才会更新大屏，是否继续？`,
+    onOk: async () => {
+      try {
+        await publishTopologyToNetworkScreen(topology.id)
+        Message.success('网络大屏拓扑已更新')
+        await loadData()
+      } catch (err: any) {
+        Message.error(err.message || '发布失败')
+        throw err
+      }
+    },
+  })
+}
+
 // 表单提交
 const handleFormSubmit = async (values: any) => {
   try {
diff --git a/src/views/ops/pages/netarch/topo/components/CustomNode.vue b/src/views/ops/pages/netarch/topo/components/CustomNode.vue
index 9402502..25d56ba 100644
--- a/src/views/ops/pages/netarch/topo/components/CustomNode.vue
+++ b/src/views/ops/pages/netarch/topo/components/CustomNode.vue
@@ -4,12 +4,13 @@
 
     <div class="node-content">
       <div class="icon-wrapper" :style="iconWrapperStyle">
-        <component :is="iconComponent" :size="32" :stroke-width="1.5" />
+        <component :is="iconComponent" :size="iconSize" :stroke-width="1.5" />
       </div>
 
-      <div class="node-info">
-        <div class="node-label" :title="data.label">{{ data.label }}</div>
-        <div v-if="data.ip" class="node-ip" :title="data.ip">{{ data.ip }}</div>
+      <div v-if="showNodeInfo" class="node-info">
+        <div v-if="showName" class="node-label" :title="data.label">{{ data.label }}</div>
+        <div v-if="showIP && data.ip" class="node-ip" :title="data.ip">{{ data.ip }}</div>
+        <div v-if="showManufacturer && deviceIdentity" class="node-device-identity" :title="deviceIdentity">{{ deviceIdentity }}</div>
       </div>
 
       <div v-if="data.alerts && data.alerts > 0" class="alert-badge">
@@ -24,7 +25,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { Handle, Position, type NodeProps } from '@vue-flow/core'
-import { DEVICE_TYPE_CONFIG } from '../config'
+import { resolveDeviceTypeConfig } from '../config'
 import type { NodeData } from '../types'
 import { IconServer } from '@tabler/icons-vue'
 
@@ -33,8 +34,15 @@ const props = defineProps<NodeProps<NodeData>>()
 const data = computed(() => props.data)
 const selected = computed(() => props.selected)
 
-const config = computed(() => DEVICE_TYPE_CONFIG[data.value.type] || DEVICE_TYPE_CONFIG.server)
+const config = computed(() => resolveDeviceTypeConfig(data.value))
 const iconComponent = computed(() => config.value.icon)
+const deviceIdentity = computed(() => [data.value.manufacturer_code, data.value.model].filter(Boolean).join(' / '))
+const nodeSize = computed(() => Math.min(120, Math.max(40, Number(data.value.presentation?.node_size || 64))))
+const iconSize = computed(() => Math.round(nodeSize.value * 0.5))
+const showName = computed(() => data.value.presentation?.show_node_name !== false)
+const showIP = computed(() => data.value.presentation?.show_node_ip !== false)
+const showManufacturer = computed(() => data.value.presentation?.show_node_manufacturer === true)
+const showNodeInfo = computed(() => showName.value || showIP.value && Boolean(data.value.ip) || showManufacturer.value && Boolean(deviceIdentity.value))
 
 const statusColors: Record<string, { border: string; bg: string; glow: string }> = {
   normal: { border: '#E5E7EB', bg: '#FFFFFF', glow: 'rgba(59, 130, 246, 0.1)' },
@@ -49,12 +57,15 @@ const nodeStyle = computed(() => ({
   '--bg-color': statusConfig.value.bg,
   '--node-color': config.value.color,
   '--glow-color': selected.value ? 'rgba(59, 130, 246, 0.3)' : statusConfig.value.glow,
+  minWidth: `${Math.max(100, nodeSize.value * 2.5)}px`,
 }))
 
 const iconWrapperStyle = computed(() => ({
   background: `linear-gradient(135deg, ${config.value.color}15 0%, ${config.value.color}25 100%)`,
   color: config.value.color,
   boxShadow: `0 2px 8px ${config.value.color}30`,
+  width: `${nodeSize.value}px`,
+  height: `${nodeSize.value}px`,
 }))
 </script>
 
@@ -161,6 +172,15 @@ const iconWrapperStyle = computed(() => ({
     line-height: 1.4;
   }
 
+  .node-device-identity {
+    overflow: hidden;
+    color: var(--color-text-3);
+    font-size: 11px;
+    line-height: 1.4;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
   .alert-badge {
     position: absolute;
     top: -6px;
diff --git a/src/views/ops/pages/netarch/topo/components/EdgeActionDialog.vue b/src/views/ops/pages/netarch/topo/components/EdgeActionDialog.vue
index 2e69e48..f98878f 100644
--- a/src/views/ops/pages/netarch/topo/components/EdgeActionDialog.vue
+++ b/src/views/ops/pages/netarch/topo/components/EdgeActionDialog.vue
@@ -8,13 +8,18 @@
     width="400px"
   >
     <div class="edge-actions">
-      <a-descriptions v-if="edge?.data?.discovery_source !== 'manual'" :column="1" bordered size="small">
+      <a-descriptions :column="1" bordered size="small">
         <a-descriptions-item label="来源">{{ edge?.data?.discovery_source || '邻接发现' }}</a-descriptions-item>
         <a-descriptions-item label="本端接口">{{ edge?.data?.source_interface_identity || '-' }}</a-descriptions-item>
         <a-descriptions-item label="对端接口">{{ edge?.data?.target_interface_identity || '-' }}</a-descriptions-item>
         <a-descriptions-item label="状态">{{ edge?.data?.status || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="入向速率">{{ trafficText(edge?.data?.in_bps) }}</a-descriptions-item>
+        <a-descriptions-item label="出向速率">{{ trafficText(edge?.data?.out_bps) }}</a-descriptions-item>
+        <a-descriptions-item label="利用率">{{ utilizationText(edge?.data) }}</a-descriptions-item>
+        <a-descriptions-item label="显示区间">{{ bandText(edge?.data?.traffic_band) }}</a-descriptions-item>
+        <a-descriptions-item label="数据时间">{{ timeText(edge?.data?.data_time) }}</a-descriptions-item>
       </a-descriptions>
-      <template v-else>
+      <template v-if="edge?.data?.discovery_source === 'manual'">
         <a-button long @click="handleEdit">编辑人工确认链路</a-button>
         <a-button long status="danger" @click="handleDelete">删除人工确认链路</a-button>
       </template>
@@ -37,6 +42,26 @@ interface Emits {
 defineProps<Props>()
 const emit = defineEmits<Emits>()
 
+const trafficText = (value?: number) => {
+  const amount = Number(value || 0)
+  if (amount < 1000) return `${Math.round(amount)} bps`
+  const units = ['Kbps', 'Mbps', 'Gbps', 'Tbps']
+  let current = amount / 1000
+  let index = 0
+  while (current >= 1000 && index < units.length - 1) {
+    current /= 1000
+    index++
+  }
+  return `${current.toFixed(current >= 100 ? 0 : 1)} ${units[index]}`
+}
+
+const utilizationText = (data?: Record<string, any>) => data?.data_status === 'available' && Number.isFinite(Number(data?.utilization_percent))
+  ? `${Number(data?.utilization_percent).toFixed(2)}%`
+  : '数据不足'
+const bandLabels: Record<string, string> = { low: '低负载', medium: '中负载', high: '高负载', down: '链路中断', insufficient: '数据不足' }
+const bandText = (value?: string) => bandLabels[String(value || '')] || '数据不足'
+const timeText = (value?: string) => value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '-'
+
 const handleEdit = () => {
   emit('edit')
   emit('update:visible', false)
diff --git a/src/views/ops/pages/netarch/topo/components/NodeActionDialog.vue b/src/views/ops/pages/netarch/topo/components/NodeActionDialog.vue
index 199da71..4789f82 100644
--- a/src/views/ops/pages/netarch/topo/components/NodeActionDialog.vue
+++ b/src/views/ops/pages/netarch/topo/components/NodeActionDialog.vue
@@ -96,6 +96,9 @@ const iconMap: Record<DeviceType, any> = {
   switch: IconSafe,
   firewall: IconSafe,
   storage: IconStorage,
+  database: IconStorage,
+  middleware: IconCloud,
+  environment: IconCloud,
   desktop: IconDesktop,
   cloud: IconCloud,
   text: IconMore,
diff --git a/src/views/ops/pages/netarch/topo/components/PresentationDialog.vue b/src/views/ops/pages/netarch/topo/components/PresentationDialog.vue
new file mode 100644
index 0000000..7b4cb30
--- /dev/null
+++ b/src/views/ops/pages/netarch/topo/components/PresentationDialog.vue
@@ -0,0 +1,107 @@
+<template>
+  <a-modal :visible="visible" title="拓扑显示设置" width="760px" :footer="false" @cancel="close">
+    <a-alert type="info" style="margin-bottom: 16px">
+      流量阈值和颜色只控制拓扑显示，不会产生告警、通知或事件；告警仍由告警策略独立判断。
+    </a-alert>
+    <a-form :model="form" layout="vertical">
+      <a-divider orientation="left">设备节点</a-divider>
+      <a-row :gutter="16">
+        <a-col :span="8"><a-form-item label="节点尺寸（像素）"><a-input-number v-model="form.node_size" :min="40" :max="120" /></a-form-item></a-col>
+        <a-col :span="16">
+          <a-space :size="20">
+            <a-checkbox v-model="form.show_node_name">显示名称</a-checkbox>
+            <a-checkbox v-model="form.show_node_ip">显示 IP</a-checkbox>
+            <a-checkbox v-model="form.show_node_manufacturer">显示厂商及型号</a-checkbox>
+          </a-space>
+        </a-col>
+      </a-row>
+
+      <a-divider orientation="left">链路</a-divider>
+      <a-row :gutter="16">
+        <a-col :span="8">
+          <a-form-item label="线型">
+            <a-select v-model="form.link_shape">
+              <a-option value="straight">直线</a-option>
+              <a-option value="curve">曲线</a-option>
+              <a-option value="step">折线</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8"><a-form-item label="线宽（像素）"><a-input-number v-model="form.link_width" :min="1" :max="10" /></a-form-item></a-col>
+        <a-col :span="8"><a-form-item label="流动动画"><a-switch v-model="form.link_animated" /></a-form-item></a-col>
+        <a-col :span="12"><a-checkbox v-model="form.show_port_label">显示端口名称</a-checkbox></a-col>
+        <a-col :span="12"><a-checkbox v-model="form.show_traffic_label">显示实时流量</a-checkbox></a-col>
+      </a-row>
+
+      <a-divider orientation="left">链路流量色阶</a-divider>
+      <a-row :gutter="16">
+        <a-col :span="8"><a-form-item label="低阈值（%）"><a-input-number v-model="form.traffic_low_threshold" :min="1" :max="98" /></a-form-item></a-col>
+        <a-col :span="8"><a-form-item label="高阈值（%）"><a-input-number v-model="form.traffic_high_threshold" :min="2" :max="99" /></a-form-item></a-col>
+      </a-row>
+      <a-row :gutter="16">
+        <a-col :span="8"><a-form-item label="低负载颜色"><input v-model="form.traffic_low_color" class="color-input" type="color" /></a-form-item></a-col>
+        <a-col :span="8"><a-form-item label="中负载颜色"><input v-model="form.traffic_medium_color" class="color-input" type="color" /></a-form-item></a-col>
+        <a-col :span="8"><a-form-item label="高负载颜色"><input v-model="form.traffic_high_color" class="color-input" type="color" /></a-form-item></a-col>
+      </a-row>
+
+      <a-divider orientation="left">画布背景</a-divider>
+      <a-row :gutter="16">
+        <a-col :span="8">
+          <a-form-item label="背景类型">
+            <a-select v-model="form.background_type">
+              <a-option value="transparent">透明</a-option>
+              <a-option value="solid">单色</a-option>
+              <a-option value="gradient">渐变</a-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col v-if="form.background_type === 'solid'" :span="8"><a-form-item label="背景颜色"><input v-model="form.background_color" class="color-input" type="color" /></a-form-item></a-col>
+        <template v-if="form.background_type === 'gradient'">
+          <a-col :span="8"><a-form-item label="起始颜色"><input v-model="form.gradient_start_color" class="color-input" type="color" /></a-form-item></a-col>
+          <a-col :span="8"><a-form-item label="结束颜色"><input v-model="form.gradient_end_color" class="color-input" type="color" /></a-form-item></a-col>
+          <a-col :span="8">
+            <a-form-item label="渐变方向">
+              <a-select v-model="form.gradient_direction">
+                <a-option value="top_to_bottom">从上到下</a-option>
+                <a-option value="left_to_right">从左到右</a-option>
+                <a-option value="diagonal_down_right">从左上到右下</a-option>
+                <a-option value="diagonal_down_left">从右上到左下</a-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </template>
+      </a-row>
+    </a-form>
+    <div class="dialog-footer">
+      <a-button @click="close">取消</a-button>
+      <a-button type="primary" :loading="saving" @click="save">保存</a-button>
+    </div>
+  </a-modal>
+</template>
+
+<script setup lang="ts">
+import { reactive, watch } from 'vue'
+import type { TopologyPresentation } from '@/api/ops/netarchTopo'
+
+const props = defineProps<{ visible: boolean; modelValue: TopologyPresentation; saving?: boolean }>()
+const emit = defineEmits<{
+  (event: 'update:visible', value: boolean): void
+  (event: 'save', value: TopologyPresentation): void
+}>()
+
+const form = reactive<TopologyPresentation>({ ...props.modelValue })
+
+watch(
+  () => props.modelValue,
+  (value) => Object.assign(form, value),
+  { deep: true, immediate: true },
+)
+
+const close = () => emit('update:visible', false)
+const save = () => emit('save', { ...form })
+</script>
+
+<style scoped>
+.color-input { width: 100%; height: 32px; padding: 2px; border: 1px solid var(--color-border-2); border-radius: 4px; background: transparent; cursor: pointer; }
+.dialog-footer { display: flex; justify-content: flex-end; gap: 8px; margin-top: 16px; }
+</style>
diff --git a/src/views/ops/pages/netarch/topo/components/Toolbar.vue b/src/views/ops/pages/netarch/topo/components/Toolbar.vue
index 3682d22..1e11a3a 100644
--- a/src/views/ops/pages/netarch/topo/components/Toolbar.vue
+++ b/src/views/ops/pages/netarch/topo/components/Toolbar.vue
@@ -54,21 +54,14 @@
       </a-dropdown>
     </a-button-group>
 
-    <!-- 链路样式 -->
-    <a-button-group type="outline" size="small">
-      <a-dropdown trigger="click" @select="props.onEdgeStyle">
-        <a-button>
-          <icon-minus :size="18" />
-          <span class="btn-text">链路</span>
-        </a-button>
-        <template #content>
-          <a-doption value="default">默认</a-doption>
-          <a-doption value="straight">直线</a-doption>
-          <a-doption value="step">阶梯</a-doption>
-          <a-doption value="smoothstep">平滑阶梯</a-doption>
-        </template>
-      </a-dropdown>
-    </a-button-group>
+    <a-button type="outline" size="small" @click="props.onPresentation">
+      <icon-settings :size="18" />
+      <span class="btn-text">显示设置</span>
+    </a-button>
+
+    <a-button type="primary" size="small" :loading="props.publishing" @click="props.onPublish">
+      {{ props.published ? '更新网络大屏' : '设为网络大屏' }}
+    </a-button>
 
     <div class="spacer" />
 
@@ -100,7 +93,7 @@ import {
   IconFullscreen,
   IconPlus,
   IconApps,
-  IconMinus,
+  IconSettings,
   IconRefresh,
   IconDownload,
   IconRotateLeft,
@@ -114,7 +107,10 @@ interface Props {
   onAddExistingDevice: () => void
   onAddNode: (value: string | number | Record<string, any> | undefined) => void
   onLayout: (value: string | number | Record<string, any> | undefined) => void
-  onEdgeStyle: (value: string | number | Record<string, any> | undefined) => void
+  onPresentation: () => void
+  onPublish: () => void
+  published: boolean
+  publishing: boolean
   onRefresh: () => void
   onExport: () => void
   onReset?: () => void
diff --git a/src/views/ops/pages/netarch/topo/config.ts b/src/views/ops/pages/netarch/topo/config.ts
index 0fd7298..60e8324 100644
--- a/src/views/ops/pages/netarch/topo/config.ts
+++ b/src/views/ops/pages/netarch/topo/config.ts
@@ -18,6 +18,9 @@ export const DEVICE_TYPE_CONFIG: Record<DeviceType, { icon: any; label: string;
   switch: { icon: IconDeviceDesktop, label: '交换机', color: '#10B981' },
   firewall: { icon: IconShield, label: '安全设备', color: '#EF4444' },
   storage: { icon: IconDatabase, label: '存储设备', color: '#8B5CF6' },
+  database: { icon: IconDatabase, label: '数据库', color: '#7C3AED' },
+  middleware: { icon: IconCloud, label: '中间件', color: '#0891B2' },
+  environment: { icon: IconCloud, label: '动环设备', color: '#0F766E' },
   desktop: { icon: IconDeviceDesktop, label: '终端', color: '#8B5CF6' },
   cloud: { icon: IconCloud, label: '云端节点', color: '#06B6D4' },
   text: { icon: IconNotes, label: '文本标注', color: '#6B7280' },
@@ -31,5 +34,40 @@ export const EXTENDED_DEVICE_CONFIG = {
   mobile: { icon: IconDeviceMobile, label: '移动设备', color: '#EC4899' },
 }
 
+interface DeviceVisualInput {
+  type: DeviceType
+  manufacturer_code?: string
+  model?: string
+}
+
+interface DeviceVisualRule {
+  manufacturer: string
+  types: DeviceType[]
+  modelPrefix?: string
+  color: string
+}
+
+// 厂商和型号只决定节点外观，设备身份及分类仍由统一资源维护。
+const DEVICE_VISUAL_RULES: DeviceVisualRule[] = [
+  { manufacturer: 'H3C', types: ['switch', 'router'], modelPrefix: 'S', color: '#0067B1' },
+  { manufacturer: 'LENOVO', types: ['server'], color: '#E2231A' },
+  { manufacturer: 'BEIDOU_HONGTUO', types: ['server'], color: '#0E7490' },
+  { manufacturer: 'SANGFOR', types: ['firewall'], color: '#C81E1E' },
+  { manufacturer: 'SANGFOR', types: ['storage'], modelPrefix: 'ASTOR', color: '#A21CAF' },
+]
+
+export const resolveDeviceTypeConfig = (input: DeviceVisualInput) => {
+  const base = DEVICE_TYPE_CONFIG[input.type] || DEVICE_TYPE_CONFIG.server
+  const manufacturer = input.manufacturer_code?.trim().toUpperCase() || ''
+  const model = input.model?.trim().toUpperCase() || ''
+  const rule = DEVICE_VISUAL_RULES.find(
+    (item) =>
+      item.manufacturer === manufacturer &&
+      item.types.includes(input.type) &&
+      (!item.modelPrefix || model.startsWith(item.modelPrefix)),
+  )
+  return rule ? { ...base, color: rule.color } : base
+}
+
 /** 侧边栏宽度 */
 export const DRAWER_WIDTH = 280
diff --git a/src/views/ops/pages/netarch/topo/hooks/useEdgeStyles.ts b/src/views/ops/pages/netarch/topo/hooks/useEdgeStyles.ts
index 9cceef9..e2a3332 100644
--- a/src/views/ops/pages/netarch/topo/hooks/useEdgeStyles.ts
+++ b/src/views/ops/pages/netarch/topo/hooks/useEdgeStyles.ts
@@ -1,47 +1,62 @@
-import { computed, ComputedRef, unref, Ref } from 'vue'
-import { Edge } from '@vue-flow/core'
-import type { EdgeType } from '../types'
+import { computed, type ComputedRef, type Ref, unref } from 'vue'
+import type { Edge } from '@vue-flow/core'
+import type { TopologyPresentation } from '@/api/ops/netarchTopo'
 
-/**
- * 边样式计算Hook
- * 根据边类型、链路类型、标签等计算最终样式
- */
-export function useEdgeStyles(edges: Ref<Edge[]> | Edge[], edgeType: Ref<EdgeType> | EdgeType): ComputedRef<Edge[]> {
-  const styledEdges = computed(() => {
-    const edgesValue = unref(edges)
-    const edgeTypeValue = unref(edgeType)
+const formatBps = (value: number) => {
+  if (value < 1000) return `${Math.round(value)} bps`
+  const units = ['Kbps', 'Mbps', 'Gbps', 'Tbps']
+  let amount = value / 1000
+  let index = 0
+  while (amount >= 1000 && index < units.length - 1) {
+    amount /= 1000
+    index++
+  }
+  return `${amount.toFixed(amount >= 100 ? 0 : 1)} ${units[index]}`
+}
 
-    return edgesValue.map((edge) => {
+const edgeLabel = (edge: Edge, presentation: TopologyPresentation) => {
+  const parts: string[] = []
+  if (presentation.show_port_label) {
+    const sourcePort = edge.data?.source_interface_identity || edge.data?.source_port
+    const targetPort = edge.data?.target_interface_identity || edge.data?.target_port
+    if (sourcePort || targetPort) parts.push(`${sourcePort || '-'} ↔ ${targetPort || '-'}`)
+  }
+  if (presentation.show_traffic_label) {
+    if (edge.data?.data_status === 'available') {
+      const utilization = Number(edge.data?.utilization_percent)
+      const utilizationText = Number.isFinite(utilization) ? ` · ${utilization.toFixed(1)}%` : ''
+      parts.push(`入 ${formatBps(Number(edge.data?.in_bps || 0))} / 出 ${formatBps(Number(edge.data?.out_bps || 0))}${utilizationText}`)
+    } else {
+      parts.push('数据不足')
+    }
+  }
+  if (!parts.length && edge.data?.label) parts.push(String(edge.data.label))
+  return parts.join(' | ')
+}
+
+export function useEdgeStyles(edges: Ref<Edge[]> | Edge[], presentation: Ref<TopologyPresentation>): ComputedRef<Edge[]> {
+  return computed(() => {
+    const settings = unref(presentation)
+    const edgeType = settings.link_shape === 'curve' ? 'simplebezier' : settings.link_shape
+    return unref(edges).map((edge) => {
       const isVirtual = edge.data?.type === 'virtual'
       const isDown = edge.data?.status === 'down'
-      const hasLabel = edge.data?.label && edge.data.label.trim() !== ''
-
+      const hasAlert = Boolean(edge.data?.has_alert)
+      const label = edgeLabel(edge, settings)
+      const color = isDown || hasAlert ? '#ef4444' : edge.data?.display_color || '#94a3b8'
       return {
         ...edge,
-        type: edgeTypeValue,
-        label: hasLabel ? edge.data?.label : undefined,
-        animated: !isDown,
+        type: edgeType,
+        label: label || undefined,
+        animated: settings.link_animated && !isDown,
         style: {
-          stroke: isDown ? '#EF4444' : isVirtual ? '#F57C00' : '#1976D2',
-          strokeWidth: 2,
+          stroke: color,
+          strokeWidth: isDown || hasAlert ? Math.max(settings.link_width, 3) : settings.link_width,
           strokeDasharray: isVirtual ? '5,5' : undefined,
         },
-        labelStyle: hasLabel
-          ? {
-              fill: '#333',
-              fontWeight: 600,
-              fontSize: 12,
-            }
-          : undefined,
-        labelBgStyle: hasLabel
-          ? {
-              fill: '#fff',
-              fillOpacity: 0.9,
-            }
-          : undefined,
+        labelStyle: label ? { fill: '#334155', fontWeight: 600, fontSize: 11 } : undefined,
+        labelBgStyle: label ? { fill: '#fff', fillOpacity: 0.9 } : undefined,
       }
     })
   })
-
-  return styledEdges
 }
diff --git a/src/views/ops/pages/netarch/topo/index.vue b/src/views/ops/pages/netarch/topo/index.vue
index 98a68fa..1889cba 100644
--- a/src/views/ops/pages/netarch/topo/index.vue
+++ b/src/views/ops/pages/netarch/topo/index.vue
@@ -25,14 +25,17 @@
         @add-existing-device="openAddExistingDevice"
         @add-node="handleAddNode"
         @layout="handleLayout"
-        @edge-style="setEdgeType"
+        @presentation="presentationDialogOpen = true"
+        :published="publishedToNetworkScreen"
+        :publishing="publishingToNetworkScreen"
+        @publish="handlePublishToNetworkScreen"
         @refresh="refreshTopology"
         @export="exportTopology"
         @reset="resetTopology"
       />
 
       <!-- Vue Flow 画布 -->
-      <div ref="reactFlowWrapper" class="flow-wrapper">
+      <div ref="reactFlowWrapper" class="flow-wrapper" :style="canvasBackgroundStyle">
         <vue-flow
           v-model:nodes="nodes"
           :edges="styledEdges"
@@ -45,7 +48,7 @@
           @edge-click="onEdgeClick"
           @connect="onConnect"
         >
-          <background pattern-color="#aaa" :gap="16" />
+          <background pattern-color="rgba(100,116,139,.45)" :gap="16" />
           <mini-map :node-color="getNodeColor" node-stroke-color="#555" />
           <!-- <controls /> -->
         </vue-flow>
@@ -161,6 +164,13 @@
     />
 
     <delete-confirm-dialog v-model:visible="deleteEdgeDialogOpen" node-name="链路" @confirm="handleDeleteEdgeConfirm" />
+
+    <presentation-dialog
+      v-model:visible="presentationDialogOpen"
+      :model-value="presentation"
+      :saving="presentationSaving"
+      @save="handleSavePresentation"
+    />
   </div>
 </template>
 
@@ -172,12 +182,12 @@ import { Background } from '@vue-flow/background'
 import { MiniMap } from '@vue-flow/minimap'
 import '@vue-flow/core/dist/style.css'
 import '@vue-flow/core/dist/theme-default.css'
-import { Message } from '@arco-design/web-vue'
+import { Message, Modal } from '@arco-design/web-vue'
 import * as TopoAPI from '@/api/ops/netarchTopo'
 import { fetchActiveAlertsByResources } from '@/api/ops/alertRecord'
 import { fetchControlResourceOptions, type OptionItem } from '@/api/ops/dcControl'
 
-import { NodeData, DeviceType, EdgeType } from './types'
+import { NodeData, DeviceType } from './types'
 import { DEVICE_TYPE_CONFIG } from './config'
 import { CustomNode } from './components'
 import { useTopoLayout, useEdgeStyles } from './hooks'
@@ -192,6 +202,7 @@ import NodeEditDialog from './components/NodeEditDialog.vue'
 import DeleteConfirmDialog from './components/DeleteConfirmDialog.vue'
 import EdgeActionDialog from './components/EdgeActionDialog.vue'
 import EdgeEditDialog from './components/EdgeEditDialog.vue'
+import PresentationDialog from './components/PresentationDialog.vue'
 
 // 注册自定义节点类型
 const nodeTypes = {
@@ -219,7 +230,33 @@ const topology = ref<TopoAPI.Topology | null>(null)
 // UI控制状态
 const selectedGroup = ref<string | null>(null)
 const expandedGroups = ref<Set<string>>(new Set())
-const edgeType = ref<EdgeType>('default')
+const defaultPresentation = (topologyId = 0): TopoAPI.TopologyPresentation => ({
+  topology_id: topologyId,
+  node_size: 64,
+  show_node_name: true,
+  show_node_ip: true,
+  show_node_manufacturer: false,
+  link_shape: 'straight',
+  link_width: 2,
+  show_port_label: true,
+  show_traffic_label: true,
+  link_animated: false,
+  traffic_low_threshold: 60,
+  traffic_high_threshold: 80,
+  traffic_low_color: '#22c55e',
+  traffic_medium_color: '#f59e0b',
+  traffic_high_color: '#ef4444',
+  background_type: 'transparent',
+  background_color: '#ffffff',
+  gradient_start_color: '#0f172a',
+  gradient_end_color: '#1e3a8a',
+  gradient_direction: 'top_to_bottom',
+})
+const presentation = ref<TopoAPI.TopologyPresentation>(defaultPresentation())
+const presentationDialogOpen = ref(false)
+const presentationSaving = ref(false)
+const publishedToNetworkScreen = ref(false)
+const publishingToNetworkScreen = ref(false)
 
 // 节点操作状态
 const selectedNode = ref<any>(null)
@@ -268,7 +305,9 @@ const isAutoTopo = computed(() => {
   return route.path.includes('/netarch/auto-topo')
 })
 
-const canManageResourceReferences = computed(() => topology.value?.auto_discovery === false)
+const canManageResourceReferences = computed(
+  () => topology.value?.auto_discovery === false && !topology.value?.business_system_id,
+)
 
 const deleteNodeMessage = computed(() => {
   if (selectedNode.value?.data?.ref_type === 'resource') {
@@ -297,7 +336,22 @@ const displayNodes = computed(() => filteredResult.value.nodes)
 const displayEdges = computed(() => filteredResult.value.edges)
 
 // 计算边样式
-const styledEdges = useEdgeStyles(displayEdges, edgeType)
+const styledEdges = useEdgeStyles(displayEdges, presentation)
+
+const gradientDirection = computed(() => ({
+  top_to_bottom: 'to bottom',
+  left_to_right: 'to right',
+  diagonal_down_right: 'to bottom right',
+  diagonal_down_left: 'to bottom left',
+}[presentation.value.gradient_direction]))
+
+const canvasBackgroundStyle = computed(() => {
+  if (presentation.value.background_type === 'solid') return { background: presentation.value.background_color }
+  if (presentation.value.background_type === 'gradient') {
+    return { background: `linear-gradient(${gradientDirection.value}, ${presentation.value.gradient_start_color}, ${presentation.value.gradient_end_color})` }
+  }
+  return { background: 'transparent' }
+})
 
 // 是否为新边
 const isNewEdge = computed(() => {
@@ -319,13 +373,16 @@ const loadData = async () => {
     let edgesData: any[] = []
 
     // 从 graph 接口获取节点和边数据
-    const [graphResponse, topologyResponse]: any[] = await Promise.all([
+    const [graphResponse, topologyResponse, publicationResponse]: any[] = await Promise.all([
       TopoAPI.fetchTopologyGraph(currentTopologyId.value),
       TopoAPI.fetchTopologyDetail(currentTopologyId.value),
+      TopoAPI.fetchNetworkScreenPublication(),
     ])
     topology.value = topologyResponse?.details || null
+    publishedToNetworkScreen.value = Number(publicationResponse?.details?.topology_id || 0) === currentTopologyId.value
 
     if (graphResponse.code === 0) {
+      presentation.value = { ...defaultPresentation(currentTopologyId.value), ...(graphResponse.details?.presentation || {}) }
       // 获取边数据 - res.details.edges
       const edgesFromGraph = graphResponse.details?.edges || graphResponse.data?.edges || []
       edgesData =
@@ -360,6 +417,9 @@ const loadData = async () => {
             ref_type: node.ref_type,
             ref_id: node.ref_id,
             sub_topology_id: node.sub_topology_id,
+            manufacturer_code: node.manufacturer_code,
+            model: node.model,
+            presentation: presentation.value,
           },
         }))
       }
@@ -396,6 +456,15 @@ const loadData = async () => {
       }
     }
 
+    const alertedResources = new Set(nodesData.filter((node) => Number(node.data?.alerts || 0) > 0).map((node) => node.data.resource_uid))
+    edgesData = edgesData.map((edge) => ({
+      ...edge,
+      data: {
+        ...edge.data,
+        has_alert: alertedResources.has(edge.data?.source_resource_uid) || alertedResources.has(edge.data?.target_resource_uid),
+      },
+    }))
+
     // 设置数据
     nodes.value = nodesData.map((node) => ({
       ...node,
@@ -513,10 +582,50 @@ const handleLayout = (value: string | number | Record<string, any> | undefined)
   })
 }
 
-// 设置边类型
-const setEdgeType = (value: string | number | Record<string, any> | undefined) => {
-  const type = value as EdgeType
-  edgeType.value = type
+const handleSavePresentation = async (value: TopoAPI.TopologyPresentation) => {
+  if (!currentTopologyId.value) return
+  if (value.traffic_low_threshold >= value.traffic_high_threshold) {
+    Message.error('低阈值必须小于高阈值')
+    return
+  }
+  presentationSaving.value = true
+  try {
+    const response: any = await TopoAPI.saveTopologyPresentation(currentTopologyId.value, value)
+    presentation.value = { ...value, ...(response?.details || {}) }
+    nodes.value = nodes.value.map((node) => ({ ...node, data: { ...node.data, presentation: presentation.value } }))
+    presentationDialogOpen.value = false
+    Message.success('拓扑显示设置已保存')
+  } catch (error: any) {
+    Message.error(error?.message || '保存拓扑显示设置失败')
+  } finally {
+    presentationSaving.value = false
+  }
+}
+
+const handlePublishToNetworkScreen = () => {
+  if (!currentTopologyId.value || !topology.value?.enable) {
+    Message.warning('停用的拓扑不能发布到网络大屏')
+    return
+  }
+  Modal.confirm({
+    title: publishedToNetworkScreen.value ? '更新网络大屏' : '设为网络大屏',
+    content: publishedToNetworkScreen.value
+      ? '将用当前节点、链路、位置和显示设置更新网络大屏快照，是否继续？'
+      : `网络大屏将切换为“${topology.value.name}”，后续编辑需再次发布才会生效，是否继续？`,
+    onOk: async () => {
+      publishingToNetworkScreen.value = true
+      try {
+        await TopoAPI.publishTopologyToNetworkScreen(currentTopologyId.value!)
+        publishedToNetworkScreen.value = true
+        Message.success('网络大屏已发布')
+      } catch (error: any) {
+        Message.error(error?.message || '发布网络大屏失败')
+        throw error
+      } finally {
+        publishingToNetworkScreen.value = false
+      }
+    },
+  })
 }
 
 // 添加注释、区域或子拓扑，设备节点只由统一资源投影生成。
@@ -959,7 +1068,7 @@ const getNodeColor = (node: any) => {
 }
 
 :deep(.vue-flow) {
-  background-color: var(--color-bg-2);
+  background: transparent;
 }
 
 :deep(.vue-flow__minimap) {
diff --git a/src/views/ops/pages/netarch/topo/types.ts b/src/views/ops/pages/netarch/topo/types.ts
index 7de3861..ec7c7d5 100644
--- a/src/views/ops/pages/netarch/topo/types.ts
+++ b/src/views/ops/pages/netarch/topo/types.ts
@@ -1,5 +1,20 @@
+import type { TopologyPresentation } from '@/api/ops/netarchTopo'
+
 // 设备类型定义
-export type DeviceType = 'server' | 'router' | 'switch' | 'firewall' | 'storage' | 'desktop' | 'cloud' | 'text' | 'region' | 'subtopology'
+export type DeviceType =
+  | 'server'
+  | 'router'
+  | 'switch'
+  | 'firewall'
+  | 'storage'
+  | 'database'
+  | 'middleware'
+  | 'environment'
+  | 'desktop'
+  | 'cloud'
+  | 'text'
+  | 'region'
+  | 'subtopology'
 
 // 设备状态类型
 export type DeviceStatus = 'normal' | 'warning' | 'error'
@@ -22,7 +37,10 @@ export interface NodeData {
   ref_type?: string
   ref_id?: number
   sub_topology_id?: number | null
+  manufacturer_code?: string
+  model?: string
   active_alerts?: any[]
+  presentation?: TopologyPresentation
 }
 
 // 拓扑分组类型(从节点自动生成)
@@ -44,6 +62,14 @@ export interface LinkData {
   discovery_source?: 'lldp' | 'manual' | string
   source_interface_identity?: string
   target_interface_identity?: string
+  in_bps?: number
+  out_bps?: number
+  bandwidth_bps?: number
+  utilization_percent?: number
+  traffic_band?: 'low' | 'medium' | 'high' | 'insufficient' | 'down'
+  display_color?: string
+  data_status?: 'available' | 'insufficient'
+  data_time?: string
 }
 
 // 链路类型（用于边样式）
diff --git a/src/views/ops/pages/netarch/traffic/index.vue b/src/views/ops/pages/netarch/traffic/index.vue
index df66526..a7a7543 100644
--- a/src/views/ops/pages/netarch/traffic/index.vue
+++ b/src/views/ops/pages/netarch/traffic/index.vue
@@ -7,14 +7,14 @@
         <p class="page-subtitle">实时监控和分析网络流量，识别异常流量模式</p>
       </div>
       <div class="page-actions">
-        <a-tag :color="trafficRuntimeStatus === 'running' ? 'green' : 'gray'" bordered style="margin-right: 12px">
-          流量采集器：{{ trafficRuntimeStatus === 'running' ? '运行中' : '已停止' }}
+        <a-tag :color="trafficRuntimeStatusColor" bordered style="margin-right: 12px">
+          流量采集器：{{ trafficRuntimeStatusText }}
         </a-tag>
         <a-button
           type="primary"
           size="small"
           :loading="runtimeActionLoading"
-          :disabled="trafficRuntimeStatus === 'running'"
+          :disabled="trafficRuntimeStatus !== 'stopped'"
           style="margin-right: 8px"
           @click="handleStartRuntime"
         >
@@ -259,7 +259,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { IconActivity, IconArrowDown, IconArrowUp, IconWorld, IconServer } from '@tabler/icons-vue'
 import Chart from '@/components/chart/index.vue'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
@@ -286,8 +286,18 @@ const activeSessions = ref('0')
 const inboundPercent = ref(0)
 const outboundPercent = ref(0)
 const trafficTrendData = ref<TrafficTrendPoint[]>([])
-const trafficRuntimeStatus = ref<'running' | 'stopped' | string>('stopped')
+const trafficRuntimeStatus = ref<'running' | 'stopped' | 'unavailable'>('unavailable')
 const runtimeActionLoading = ref(false)
+const trafficRuntimeStatusText = computed(() => {
+  if (trafficRuntimeStatus.value === 'running') return '运行中'
+  if (trafficRuntimeStatus.value === 'stopped') return '已停止'
+  return '状态不可用'
+})
+const trafficRuntimeStatusColor = computed(() => {
+  if (trafficRuntimeStatus.value === 'running') return 'green'
+  if (trafficRuntimeStatus.value === 'stopped') return 'gray'
+  return 'red'
+})
 
 // 流量趋势图表配置
 const trafficChartOptions = ref({
@@ -588,11 +598,15 @@ const loadTrafficData = async () => {
 const loadRuntimeStatus = async () => {
   try {
     const res = await fetchTrafficRuntimeStatus()
-    const status = String(res?.details?.status || 'stopped')
-    trafficRuntimeStatus.value = status === 'running' ? 'running' : 'stopped'
+    const status = res.details.status
+    if (status !== 'running' && status !== 'stopped') {
+      throw new Error(`未知的流量采集器状态: ${status}`)
+    }
+    trafficRuntimeStatus.value = status
   } catch (error) {
     console.error(error)
-    trafficRuntimeStatus.value = 'stopped'
+    trafficRuntimeStatus.value = 'unavailable'
+    Message.error('流量采集器状态不可用')
   }
 }
 
diff --git a/src/views/ops/pages/report/device/index.vue b/src/views/ops/pages/report/device/index.vue
index 130c0e2..820e506 100644
--- a/src/views/ops/pages/report/device/index.vue
+++ b/src/views/ops/pages/report/device/index.vue
@@ -76,7 +76,7 @@
       </template>
     </search-table>
 
-    <!-- 生成报表弹窗（与后端 network_device 参数一致：service_identities 或 network_device_service_ids） -->
+    <!-- 生成网络设备报表弹窗 -->
     <a-modal
       v-model:visible="generateModalVisible"
       title="生成网络设备报表"
@@ -96,39 +96,20 @@
           />
         </a-form-item>
 
-        <a-divider orientation="left">设备范围（二选一）</a-divider>
-        <a-row :gutter="16">
-          <a-col :span="12">
-            <a-form-item label="网络设备服务 ID" field="network_device_service_ids">
-              <a-select
-                v-model="generateForm.network_device_service_ids"
-                multiple
-                allow-clear
-                allow-search
-                :loading="networkDeviceOptionsLoading"
-                :options="networkDeviceIdOptions"
-                placeholder="按库表主键选择"
-                :max-tag-count="3"
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="服务标识 service_identity" field="service_identities">
-              <a-select
-                v-model="generateForm.service_identities"
-                multiple
-                allow-clear
-                allow-search
-                :loading="networkDeviceOptionsLoading"
-                :options="networkDeviceIdentityOptions"
-                placeholder="按采集标识选择"
-                :max-tag-count="3"
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
+        <a-divider orientation="left">设备范围</a-divider>
+        <a-form-item label="网络设备" field="resource_uids">
+          <a-select
+            v-model="generateForm.resource_uids"
+            multiple
+            allow-clear
+            allow-search
+            :loading="networkDeviceOptionsLoading"
+            :options="networkDeviceResourceOptions"
+            placeholder="请选择网络设备"
+            :max-tag-count="3"
+            style="width: 100%"
+          />
+        </a-form-item>
 
         <a-form-item label="包含每日告警统计" field="include_daily_alerts">
           <a-switch v-model="generateForm.include_daily_alerts" />
@@ -224,8 +205,7 @@ import { normalizeReportRows, reportStatusColor, reportStatusLabel } from '../us
 import { useReportNetworkDevicePickOptions } from '../useReportNetworkDevicePickOptions'
 
 const {
-  networkDeviceIdOptions,
-  networkDeviceIdentityOptions,
+  networkDeviceResourceOptions,
   networkDeviceOptionsLoading,
   loadNetworkDevicePickOptions,
 } = useReportNetworkDevicePickOptions()
@@ -329,14 +309,12 @@ const tableColumns = computed(() => [
 // 生成报表弹窗
 const generateModalVisible = ref(false)
 const generateForm = ref<{
-  network_device_service_ids: number[]
-  service_identities: string[]
+  resource_uids: string[]
   timeRange: string[]
   include_daily_alerts: boolean
   title: string
 }>({
-  network_device_service_ids: [],
-  service_identities: [],
+  resource_uids: [],
   timeRange: [],
   include_daily_alerts: false,
   title: '',
@@ -446,8 +424,7 @@ const handleRefresh = () => {
 // 打开生成报表弹窗
 const handleOpenGenerateModal = () => {
   generateForm.value = {
-    network_device_service_ids: [],
-    service_identities: [],
+    resource_uids: [],
     timeRange: [],
     include_daily_alerts: false,
     title: '',
@@ -468,15 +445,10 @@ const handleGenerate = async () => {
     return
   }
 
-  const ids = generateForm.value.network_device_service_ids || []
-  const idents = generateForm.value.service_identities || []
-  if (ids.length === 0 && idents.length === 0) {
-    Message.warning('请选择网络设备（服务 ID 或 service_identity）')
-    return
-  }
-  if (ids.length > 0 && idents.length > 0) {
-    Message.warning('服务 ID 与 service_identity 请勿同时选择')
-    return
+  const resourceUIDs = generateForm.value.resource_uids || []
+  if (resourceUIDs.length === 0) {
+	Message.warning('请选择网络设备')
+	return
   }
 
   generating.value = true
@@ -485,12 +457,7 @@ const handleGenerate = async () => {
     const params: NetworkDeviceReportParams = {
       start_time: generateForm.value.timeRange[0],
       end_time: generateForm.value.timeRange[1],
-    }
-    if (ids.length > 0) {
-      params.network_device_service_ids = ids
-    }
-    if (idents.length > 0) {
-      params.service_identities = idents
+      resource_uids: resourceUIDs,
     }
     if (generateForm.value.include_daily_alerts) {
       params.include_daily_alerts = true
diff --git a/src/views/ops/pages/report/host/index.vue b/src/views/ops/pages/report/host/index.vue
index 99e25f6..f418475 100644
--- a/src/views/ops/pages/report/host/index.vue
+++ b/src/views/ops/pages/report/host/index.vue
@@ -96,17 +96,17 @@
           />
         </a-form-item>
 
-        <a-divider orientation="left">服务器标识</a-divider>
+        <a-divider orientation="left">服务器</a-divider>
 
-        <a-form-item label="服务器标识" field="server_identities">
+        <a-form-item label="服务器" field="resource_uids">
           <a-select
-            v-model="generateForm.server_identities"
+            v-model="generateForm.resource_uids"
             multiple
             allow-clear
             allow-search
             :loading="serverOptionsLoading"
-            :options="serverIdentityOptions"
-            placeholder="请选择服务器标识（可多选）"
+            :options="serverResourceOptions"
+            placeholder="请选择服务器（可多选）"
             :max-tag-count="4"
             style="width: 100%"
           />
@@ -222,7 +222,7 @@ import { downloadReportFile } from '../useReportExport'
 import type { ReportExportFormat } from '@/api/ops/report'
 import { useReportServerPickOptions } from '../useReportServerPickOptions'
 
-const { serverIdentityOptions, serverOptionsLoading, loadServerPickOptions } = useReportServerPickOptions()
+const { serverResourceOptions, serverOptionsLoading, loadServerPickOptions } = useReportServerPickOptions()
 
 // 页面标题
 const pageTitle = '服务器报表'
@@ -324,14 +324,14 @@ const tableColumns = computed(() => [
 const generateModalVisible = ref(false)
 const generateForm = ref<{
   timeRange: string[]
-  server_identities: string[]
+  resource_uids: string[]
   columns: string[]
   availability_rule: string
   include_daily_alerts: boolean
   title: string
 }>({
   timeRange: [],
-  server_identities: [],
+  resource_uids: [],
   columns: ['availability', 'cpu', 'memory_phys', 'disk_usage'],
   availability_rule: 'metrics_presence',
   include_daily_alerts: false,
@@ -446,7 +446,7 @@ const handleRefresh = () => {
 const handleOpenGenerateModal = () => {
   generateForm.value = {
     timeRange: [],
-    server_identities: [],
+    resource_uids: [],
     columns: ['availability', 'cpu', 'memory_phys', 'disk_usage'],
     availability_rule: 'metrics_presence',
     include_daily_alerts: false,
@@ -469,8 +469,8 @@ const handleGenerate = async () => {
     return
   }
 
-  if (generateForm.value.server_identities.length === 0) {
-    Message.warning('请选择服务器标识')
+  if (generateForm.value.resource_uids.length === 0) {
+	Message.warning('请选择服务器')
     return
   }
 
@@ -480,7 +480,7 @@ const handleGenerate = async () => {
     const params: ServerReportParams = {
       start_time: generateForm.value.timeRange[0],
       end_time: generateForm.value.timeRange[1],
-      server_identities: generateForm.value.server_identities,
+		resource_uids: generateForm.value.resource_uids,
     }
 
     if (generateForm.value.columns.length > 0) {
diff --git a/src/views/ops/pages/report/statistics/index.vue b/src/views/ops/pages/report/statistics/index.vue
index cae24da..c381036 100644
--- a/src/views/ops/pages/report/statistics/index.vue
+++ b/src/views/ops/pages/report/statistics/index.vue
@@ -119,11 +119,11 @@
 
         <a-form-item
           label="目标标识"
-          field="target_identities"
+          field="resource_uids"
           :rules="[{ required: true, message: '请选择目标标识' }]"
         >
           <a-select
-            v-model="generateForm.target_identities"
+            v-model="generateForm.resource_uids"
             multiple
             allow-clear
             allow-search
@@ -368,7 +368,7 @@ const generateModalVisible = ref(false)
 const generateForm = ref<{
   data_source: string
   metric_id: string
-  target_identities: string[]
+  resource_uids: string[]
   timeRange: string[]
   output_mode: string
   scalar_aggregations: string[]
@@ -378,7 +378,7 @@ const generateForm = ref<{
 }>({
   data_source: '',
   metric_id: '',
-  target_identities: [],
+  resource_uids: [],
   timeRange: [],
   output_mode: 'scalar',
   scalar_aggregations: ['avg'],
@@ -390,7 +390,7 @@ const generateForm = ref<{
 watch(
   () => generateForm.value.data_source,
   (ds) => {
-    generateForm.value.target_identities = []
+    generateForm.value.resource_uids = []
     generateForm.value.metric_id = ''
     loadTargetIdentityOptions(ds)
     loadMetricRegistryOptions(ds)
@@ -408,12 +408,12 @@ const normalizedReportContent = computed(() => normalizeStatisticsReportContent(
 
 // 标量结果表格列配置
 const scalarTableColumns = computed(() =>
-  buildContentColumns(normalizedReportContent.value.scalarRows, ['target_identity', 'avg', 'max', 'min', 'sum', 'count']),
+  buildContentColumns(normalizedReportContent.value.scalarRows, ['resource_uid', 'service_identity', 'avg', 'max', 'min', 'sum', 'count']),
 )
 
 // 时间序列表格列配置
 const seriesTableColumns = computed(() =>
-  buildContentColumns(normalizedReportContent.value.seriesRows, ['target_identity', 'time', 'timestamp', 'value', 'count']),
+  buildContentColumns(normalizedReportContent.value.seriesRows, ['resource_uid', 'service_identity', 'time', 'timestamp', 'value', 'count']),
 )
 
 // 获取报表列表
@@ -493,7 +493,7 @@ const handleOpenGenerateModal = () => {
   generateForm.value = {
     data_source: '',
     metric_id: '',
-    target_identities: [],
+    resource_uids: [],
     timeRange: [],
     output_mode: 'scalar',
     scalar_aggregations: ['avg'],
@@ -522,7 +522,7 @@ const handleGenerate = async () => {
     return
   }
 
-  if (generateForm.value.target_identities.length === 0) {
+  if (generateForm.value.resource_uids.length === 0) {
     Message.warning('请选择目标标识')
     return
   }
@@ -554,7 +554,7 @@ const handleGenerate = async () => {
     const params: StatisticsReportParams = {
       data_source: generateForm.value.data_source as any,
       metric_id: generateForm.value.metric_id,
-      target_identities: generateForm.value.target_identities,
+      resource_uids: generateForm.value.resource_uids,
       start_time: generateForm.value.timeRange[0],
       end_time: generateForm.value.timeRange[1],
       output_mode: generateForm.value.output_mode as any,
@@ -671,7 +671,8 @@ function formatLabel(key: string) {
     min: '最小值',
     sum: '求和',
     count: '计数',
-    target_identity: '目标标识',
+    resource_uid: '资源标识',
+    service_identity: '业务标识',
     time: '时间',
     timestamp: '时间',
     value: '值',
diff --git a/src/views/ops/pages/report/topn/index.vue b/src/views/ops/pages/report/topn/index.vue
index 12662e0..27e7a47 100644
--- a/src/views/ops/pages/report/topn/index.vue
+++ b/src/views/ops/pages/report/topn/index.vue
@@ -114,9 +114,9 @@
           </a-col>
         </a-row>
 
-        <a-form-item label="目标标识" field="target_identities" :rules="[{ required: true, message: '请选择目标标识' }]">
+        <a-form-item label="监控资源" field="resource_uids" :rules="[{ required: true, message: '请选择监控资源' }]">
           <a-select
-            v-model="generateForm.target_identities"
+            v-model="generateForm.resource_uids"
             multiple
             allow-clear
             allow-search
@@ -312,7 +312,7 @@ const generateModalVisible = ref(false)
 const generateForm = ref<{
   data_source: string
   metric_id: string
-  target_identities: string[]
+  resource_uids: string[]
   timeRange: string[]
   n: number
   rank_aggregate: string
@@ -321,7 +321,7 @@ const generateForm = ref<{
 }>({
   data_source: '',
   metric_id: '',
-  target_identities: [],
+  resource_uids: [],
   timeRange: [],
   n: 10,
   rank_aggregate: 'avg',
@@ -332,7 +332,7 @@ const generateForm = ref<{
 watch(
   () => generateForm.value.data_source,
   (ds) => {
-    generateForm.value.target_identities = []
+    generateForm.value.resource_uids = []
     generateForm.value.metric_id = ''
     if (ds === 'alert') {
       generateForm.value.metric_id = 'alert_frequency'
@@ -357,7 +357,7 @@ const normalizedRankingRows = computed(() => {
   return raw.map((item: any, idx: number) => ({
     ...item,
     rank: item.rank ?? idx + 1,
-    target: item.target ?? item.identity ?? item.target_identity ?? '',
+    target: item.target ?? item.resource_uid ?? item.service_identity ?? item.identity ?? '',
     value: item.value,
   }))
 })
@@ -458,7 +458,7 @@ const handleOpenGenerateModal = () => {
   generateForm.value = {
     data_source: '',
     metric_id: '',
-    target_identities: [],
+    resource_uids: [],
     timeRange: [],
     n: 10,
     rank_aggregate: 'avg',
@@ -486,7 +486,7 @@ const handleGenerate = async () => {
     return
   }
 
-  if (generateForm.value.data_source !== 'alert' && generateForm.value.target_identities.length === 0) {
+  if (generateForm.value.data_source !== 'alert' && generateForm.value.resource_uids.length === 0) {
     Message.warning('请选择目标标识')
     return
   }
@@ -502,7 +502,7 @@ const handleGenerate = async () => {
     const params: TopNReportParams = {
       data_source: generateForm.value.data_source as any,
       metric_id: generateForm.value.data_source === 'alert' ? 'alert_frequency' : generateForm.value.metric_id,
-      target_identities: generateForm.value.data_source === 'alert' ? [] : generateForm.value.target_identities,
+      resource_uids: generateForm.value.data_source === 'alert' ? [] : generateForm.value.resource_uids,
       start_time: generateForm.value.timeRange[0],
       end_time: generateForm.value.timeRange[1],
     }
diff --git a/src/views/ops/pages/report/traffic/index.vue b/src/views/ops/pages/report/traffic/index.vue
index 6f9db49..d270e2b 100644
--- a/src/views/ops/pages/report/traffic/index.vue
+++ b/src/views/ops/pages/report/traffic/index.vue
@@ -94,11 +94,11 @@
         </a-form-item>
         <a-form-item
           v-if="generateForm.traffic_mode === 'snmp_devices'"
-          label="网络设备（service_identity）"
-          field="service_identities"
+          label="网络设备"
+          field="resource_uids"
         >
           <a-select
-            v-model="generateForm.service_identities"
+            v-model="generateForm.resource_uids"
             multiple
             allow-clear
             allow-search
@@ -465,7 +465,7 @@ const tableColumns = computed(() => [
 const generateModalVisible = ref(false)
 const generateForm = ref<{
   traffic_mode: 'topology' | 'snmp_devices'
-  service_identities: string[]
+  resource_uids: string[]
   topology_id: number | undefined
   link_id: number | undefined
   node_id: string
@@ -479,7 +479,7 @@ const generateForm = ref<{
   trend_granularity: string
 }>({
   traffic_mode: 'topology',
-  service_identities: [],
+  resource_uids: [],
   topology_id: undefined,
   link_id: undefined,
   node_id: '',
@@ -656,7 +656,7 @@ const handleRefresh = () => {
 const handleOpenGenerateModal = () => {
   generateForm.value = {
     traffic_mode: 'topology',
-    service_identities: [],
+    resource_uids: [],
     topology_id: undefined,
     link_id: undefined,
     node_id: '',
@@ -693,7 +693,7 @@ const handleGenerate = async () => {
     return
   }
   if (mode === 'snmp_devices') {
-    const ids = generateForm.value.service_identities || []
+	const ids = generateForm.value.resource_uids || []
     if (ids.length === 0) {
       Message.warning('请至少选择一个网络设备')
       return
@@ -712,8 +712,7 @@ const handleGenerate = async () => {
     if (mode === 'topology') {
       params.topology_id = generateForm.value.topology_id!
     } else {
-      params.service_identities = [...(generateForm.value.service_identities || [])]
-      params.topology_id = 1
+		params.resource_uids = [...(generateForm.value.resource_uids || [])]
       params.report_shape = 'summary'
     }
 
diff --git a/src/views/ops/pages/report/useReportNetworkDevicePickOptions.ts b/src/views/ops/pages/report/useReportNetworkDevicePickOptions.ts
index bed30da..90efe9f 100644
--- a/src/views/ops/pages/report/useReportNetworkDevicePickOptions.ts
+++ b/src/views/ops/pages/report/useReportNetworkDevicePickOptions.ts
@@ -1,8 +1,7 @@
 import { ref } from 'vue'
 import { fetchNetworkDeviceList } from '@/api/ops/network-device'
 
-export type LabeledNumberOption = { label: string; value: number }
-export type LabeledStringOption = { label: string; value: string }
+export type LabeledStringOption = { label: string; value: string }
 
 function unwrapListRes(res: unknown): { data: any[]; total: number } {
   const r = res as Record<string, any> | null | undefined
@@ -13,21 +12,18 @@ function unwrapListRes(res: unknown): { data: any[]; total: number } {
   }
 }
 
-/** 网络设备报表：按服务表 ID / 按 service_identity 下拉选项 */
-export function useReportNetworkDevicePickOptions() {
-  const networkDeviceIdOptions = ref<LabeledNumberOption[]>([])
-  const networkDeviceIdentityOptions = ref<LabeledStringOption[]>([])
+/** 网络设备报表统一资源下拉选项。 */
+export function useReportNetworkDevicePickOptions() {
+  const networkDeviceResourceOptions = ref<LabeledStringOption[]>([])
   const networkDeviceOptionsLoading = ref(false)
 
   async function loadNetworkDevicePickOptions() {
-    networkDeviceIdOptions.value = []
-    networkDeviceIdentityOptions.value = []
+    networkDeviceResourceOptions.value = []
     networkDeviceOptionsLoading.value = true
     try {
-      const pageSize = 500
+      const pageSize = 100
       let page = 1
-      const idAcc: LabeledNumberOption[] = []
-      const identAcc: LabeledStringOption[] = []
+      const resourceAcc: LabeledStringOption[] = []
 
       while (true) {
         const res = await fetchNetworkDeviceList({ page, size: pageSize })
@@ -35,40 +31,31 @@ export function useReportNetworkDevicePickOptions() {
         const chunk = u.data
         const total = u.total
         for (const s of chunk) {
-          const id = s?.id
-          const name = (s?.name as string) || ''
-          const ident = (s?.service_identity as string) || ''
-          if (typeof id === 'number') {
-            idAcc.push({
-              label: ident ? `${name || ident} (ID: ${id})` : `网络设备 #${id}`,
-              value: id,
-            })
-          }
-          if (ident) {
-            identAcc.push({
-              label: name ? `${name} (${ident})` : ident,
-              value: ident,
-            })
+          const name = (s?.name as string) || ''
+          const ident = (s?.service_identity as string) || ''
+          const resourceUID = (s?.resource_uid as string) || ''
+          if (resourceUID) {
+            resourceAcc.push({
+              label: name ? `${name} (${ident})` : ident,
+              value: resourceUID,
+            })
           }
         }
         if (chunk.length === 0 || chunk.length < pageSize) break
-        if (total > 0 && idAcc.length >= total) break
+        if (total > 0 && resourceAcc.length >= total) break
         page += 1
       }
-      networkDeviceIdOptions.value = idAcc
-      networkDeviceIdentityOptions.value = identAcc
+      networkDeviceResourceOptions.value = resourceAcc
     } catch (e) {
       console.error('加载网络设备选项失败:', e)
-      networkDeviceIdOptions.value = []
-      networkDeviceIdentityOptions.value = []
+      networkDeviceResourceOptions.value = []
     } finally {
       networkDeviceOptionsLoading.value = false
     }
   }
 
   return {
-    networkDeviceIdOptions,
-    networkDeviceIdentityOptions,
+    networkDeviceResourceOptions,
     networkDeviceOptionsLoading,
     loadNetworkDevicePickOptions,
   }
diff --git a/src/views/ops/pages/report/useReportServerPickOptions.ts b/src/views/ops/pages/report/useReportServerPickOptions.ts
index 3e51b2a..9b2ae7a 100644
--- a/src/views/ops/pages/report/useReportServerPickOptions.ts
+++ b/src/views/ops/pages/report/useReportServerPickOptions.ts
@@ -1,8 +1,7 @@
 import { ref } from 'vue'
 import { fetchServerList } from '@/api/ops/server'
 
-export type LabeledNumberOption = { label: string; value: number }
-export type LabeledStringOption = { label: string; value: string }
+export type LabeledStringOption = { label: string; value: string }
 
 function unwrapListRes(res: unknown): { data: any[]; total: number } {
   const r = res as Record<string, any> | null | undefined
@@ -13,21 +12,18 @@ function unwrapListRes(res: unknown): { data: any[]; total: number } {
   }
 }
 
-/** 服务器报表：按 ID / 按标识 下拉选项 */
-export function useReportServerPickOptions() {
-  const serverIdOptions = ref<LabeledNumberOption[]>([])
-  const serverIdentityOptions = ref<LabeledStringOption[]>([])
+/** 服务器报表统一资源下拉选项。 */
+export function useReportServerPickOptions() {
+  const serverResourceOptions = ref<LabeledStringOption[]>([])
   const serverOptionsLoading = ref(false)
 
   async function loadServerPickOptions() {
-    serverIdOptions.value = []
-    serverIdentityOptions.value = []
+    serverResourceOptions.value = []
     serverOptionsLoading.value = true
     try {
-      const pageSize = 500
+      const pageSize = 100
       let page = 1
-      const idAcc: LabeledNumberOption[] = []
-      const identAcc: LabeledStringOption[] = []
+      const resourceAcc: LabeledStringOption[] = []
 
       while (true) {
         const res = await fetchServerList({ page, size: pageSize })
@@ -35,40 +31,31 @@ export function useReportServerPickOptions() {
         const chunk = u.data
         const total = u.total
         for (const s of chunk) {
-          const id = s?.id
-          const name = (s?.name as string) || ''
-          const ident = (s?.server_identity as string) || ''
-          if (typeof id === 'number') {
-            idAcc.push({
-              label: ident ? `${name || ident} (ID: ${id})` : `服务器 #${id}`,
-              value: id,
-            })
-          }
-          if (ident) {
-            identAcc.push({
-              label: name ? `${name} (${ident})` : ident,
-              value: ident,
-            })
-          }
+          const name = (s?.name as string) || ''
+          const ident = (s?.server_identity as string) || ''
+          const resourceUID = (s?.resource_uid as string) || ''
+          if (resourceUID) {
+            resourceAcc.push({
+              label: name ? `${name} (${ident})` : ident,
+              value: resourceUID,
+            })
+          }
         }
         if (chunk.length === 0 || chunk.length < pageSize) break
-        if (total > 0 && idAcc.length >= total) break
+        if (total > 0 && resourceAcc.length >= total) break
         page += 1
       }
-      serverIdOptions.value = idAcc
-      serverIdentityOptions.value = identAcc
+      serverResourceOptions.value = resourceAcc
     } catch (e) {
       console.error('加载服务器选项失败:', e)
-      serverIdOptions.value = []
-      serverIdentityOptions.value = []
+      serverResourceOptions.value = []
     } finally {
       serverOptionsLoading.value = false
     }
   }
 
   return {
-    serverIdOptions,
-    serverIdentityOptions,
+    serverResourceOptions,
     serverOptionsLoading,
     loadServerPickOptions,
   }
diff --git a/src/views/ops/pages/report/useReportTargetIdentityOptions.ts b/src/views/ops/pages/report/useReportTargetIdentityOptions.ts
index 871401d..b5752e1 100644
--- a/src/views/ops/pages/report/useReportTargetIdentityOptions.ts
+++ b/src/views/ops/pages/report/useReportTargetIdentityOptions.ts
@@ -26,7 +26,7 @@ export function useReportTargetIdentityOptions() {
 
     targetOptionsLoading.value = true
     try {
-      const pageSize = 500
+      const pageSize = 100
       let page = 1
       const acc: ReportTargetIdentityOption[] = []
 
@@ -41,10 +41,10 @@ export function useReportTargetIdentityOptions() {
             chunk = u.data
             total = u.total
             for (const s of chunk) {
-              if (s?.server_identity) {
+              if (s?.resource_uid) {
                 acc.push({
                   label: `${s.name || s.server_identity} (${s.server_identity})`,
-                  value: s.server_identity,
+                  value: s.resource_uid,
                 })
               }
             }
@@ -56,10 +56,10 @@ export function useReportTargetIdentityOptions() {
             chunk = u.data
             total = u.total
             for (const s of chunk) {
-              if (s?.service_identity) {
+              if (s?.resource_uid) {
                 acc.push({
                   label: `${s.name || s.service_identity} (${s.service_identity})`,
-                  value: s.service_identity,
+                  value: s.resource_uid,
                 })
               }
             }
@@ -71,10 +71,10 @@ export function useReportTargetIdentityOptions() {
             chunk = u.data
             total = u.total
             for (const s of chunk) {
-              if (s?.service_identity) {
+              if (s?.resource_uid) {
                 acc.push({
                   label: `${s.name || s.service_identity} (${s.service_identity})`,
-                  value: s.service_identity,
+                  value: s.resource_uid,
                 })
               }
             }
@@ -86,10 +86,10 @@ export function useReportTargetIdentityOptions() {
             chunk = u.data
             total = u.total
             for (const s of chunk) {
-              if (s?.service_identity) {
+              if (s?.resource_uid) {
                 acc.push({
                   label: `${s.name || s.service_identity} (${s.service_identity})`,
-                  value: s.service_identity,
+                  value: s.resource_uid,
                 })
               }
             }
@@ -131,7 +131,7 @@ export function useFaultReportServiceIdentityOptions() {
     faultServiceIdentityOptions.value = []
     faultServiceOptionsLoading.value = true
     try {
-      const pageSize = 500
+      const pageSize = 100
       const seen = new Set<string>()
       const acc: ReportTargetIdentityOption[] = []
 
diff --git a/src/views/ops/pages/resource-context/components/ResponsibilityEditor.vue b/src/views/ops/pages/resource-context/components/ResponsibilityEditor.vue
new file mode 100644
index 0000000..20d520a
--- /dev/null
+++ b/src/views/ops/pages/resource-context/components/ResponsibilityEditor.vue
@@ -0,0 +1,170 @@
+<template>
+  <a-card :bordered="false" title="资源责任人">
+    <a-alert type="info" style="margin-bottom: 16px">
+      资源责任人优先于责任规则。外部联系人会收到短信或邮件，系统内工单同时派给默认超级管理员跟进。
+    </a-alert>
+    <a-form :model="form" layout="vertical">
+      <a-form-item field="responsibility_type" label="责任人类型">
+        <a-radio-group v-model="form.responsibility_type" type="button">
+          <a-radio value="none">不指定</a-radio>
+          <a-radio value="internal">系统用户</a-radio>
+          <a-radio value="external">外部联系人</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item v-if="form.responsibility_type === 'internal'" field="owner_user_id" label="系统用户" required>
+        <a-select v-model="form.owner_user_id" allow-search placeholder="请选择已启用的系统用户" :loading="loadingOptions">
+          <a-option v-for="user in users" :key="user.id" :value="user.id">
+            {{ user.name }}{{ user.username ? `（${user.username}）` : '' }}
+          </a-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item v-if="form.responsibility_type === 'external'" field="external_contact_id" label="外部联系人" required>
+        <a-space fill>
+          <a-select
+            v-model="form.external_contact_id"
+            allow-search
+            placeholder="请选择外部联系人"
+            :loading="loadingOptions"
+            style="flex: 1"
+          >
+            <a-option v-for="contact in contacts" :key="contact.id" :value="contact.id">
+              {{ contact.name }}（{{ contact.phone || contact.email }}）
+            </a-option>
+          </a-select>
+          <a-button @click="createVisible = true">新建联系人</a-button>
+        </a-space>
+      </a-form-item>
+      <a-button type="primary" :loading="saving" @click="save">保存责任人</a-button>
+    </a-form>
+
+    <a-modal v-model:visible="createVisible" title="新建外部联系人" :confirm-loading="creating" width="560px" @ok="createContact">
+      <a-form :model="contactForm" layout="vertical">
+        <a-form-item field="name" label="姓名" required>
+          <a-input v-model="contactForm.name" :max-length="100" />
+        </a-form-item>
+        <a-form-item field="phone" label="手机号">
+          <a-input v-model="contactForm.phone" />
+        </a-form-item>
+        <a-form-item field="email" label="邮箱">
+          <a-input v-model="contactForm.email" />
+        </a-form-item>
+        <a-form-item field="remarks" label="备注">
+          <a-textarea v-model="contactForm.remarks" :rows="2" />
+        </a-form-item>
+        <a-alert type="info">手机号和邮箱至少填写一项；填写两项时，已配置的短信和邮件渠道都会发送。</a-alert>
+      </a-form>
+    </a-modal>
+  </a-card>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from 'vue'
+import { Message } from '@arco-design/web-vue'
+import { createExternalContact, fetchExternalContactOptions, type ExternalContact } from '@/api/ops/externalContact'
+import { fetchUserList, type UserItem } from '@/api/ops/rbac2'
+import { saveControlResourceResponsibility, type ControlResource } from '@/api/ops/dcControl'
+
+const props = defineProps<{ resource: ControlResource }>()
+const emit = defineEmits<{ (event: 'saved', resource: ControlResource): void }>()
+const users = ref<UserItem[]>([])
+const contacts = ref<ExternalContact[]>([])
+const loadingOptions = ref(false)
+const saving = ref(false)
+const creating = ref(false)
+const createVisible = ref(false)
+const form = reactive({
+  responsibility_type: 'none' as 'none' | 'internal' | 'external',
+  owner_user_id: undefined as number | undefined,
+  external_contact_id: undefined as number | undefined,
+})
+const contactForm = reactive({ name: '', phone: '', email: '', remarks: '' })
+
+const loadOptions = async () => {
+  loadingOptions.value = true
+  try {
+    const [userResponse, contactResponse]: any[] = await Promise.all([
+      fetchUserList({ page: 1, size: 100, status: 1 }),
+      fetchExternalContactOptions(),
+    ])
+    const userRaw = userResponse.details ?? userResponse.data
+    users.value = Array.isArray(userRaw) ? userRaw : userRaw?.data || []
+    contacts.value = Array.isArray(contactResponse) ? contactResponse : contactResponse?.details || []
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载责任人选项失败')
+  } finally {
+    loadingOptions.value = false
+  }
+}
+
+const save = async () => {
+  if (form.responsibility_type === 'internal' && !form.owner_user_id) {
+    Message.warning('请选择系统用户')
+    return
+  }
+  if (form.responsibility_type === 'external' && !form.external_contact_id) {
+    Message.warning('请选择外部联系人')
+    return
+  }
+  saving.value = true
+  try {
+    const response = await saveControlResourceResponsibility(props.resource.resource_uid, {
+      responsibility_type: form.responsibility_type,
+      owner_user_id: form.responsibility_type === 'internal' ? form.owner_user_id : undefined,
+      external_contact_id: form.responsibility_type === 'external' ? form.external_contact_id : undefined,
+    })
+    if (response.code !== 0 || !response.details) throw new Error(response.message || '保存资源责任人失败')
+    Message.success('资源责任人已保存')
+    emit('saved', response.details)
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '保存资源责任人失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+const createContact = async () => {
+  if (!contactForm.name.trim()) {
+    Message.warning('请输入联系人姓名')
+    return
+  }
+  if (!contactForm.phone.trim() && !contactForm.email.trim()) {
+    Message.warning('手机号和邮箱至少填写一项')
+    return
+  }
+  creating.value = true
+  try {
+    const code = `external_${Date.now().toString(36)}`
+    const response: any = await createExternalContact({
+      code,
+      name: contactForm.name.trim(),
+      phone: contactForm.phone.trim(),
+      email: contactForm.email.trim(),
+      remarks: contactForm.remarks.trim(),
+      enabled: true,
+    })
+    if (response.code !== 0 || !response.details) throw new Error(response.message || '新建外部联系人失败')
+    contacts.value = [...contacts.value, response.details].sort((left, right) => left.name.localeCompare(right.name, 'zh-CN'))
+    form.responsibility_type = 'external'
+    form.external_contact_id = response.details.id
+    Object.assign(contactForm, { name: '', phone: '', email: '', remarks: '' })
+    createVisible.value = false
+    Message.success('外部联系人已新建并选中')
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '新建外部联系人失败')
+  } finally {
+    creating.value = false
+  }
+}
+
+watch(
+  () => props.resource,
+  (resource) => {
+    form.responsibility_type = resource.responsibility_type || 'none'
+    form.owner_user_id = resource.owner_user_id
+    form.external_contact_id = resource.external_contact_id
+  },
+  { immediate: true }
+)
+
+loadOptions()
+</script>
diff --git a/src/views/ops/pages/resource-context/index.vue b/src/views/ops/pages/resource-context/index.vue
index 23a7f69..26174bc 100644
--- a/src/views/ops/pages/resource-context/index.vue
+++ b/src/views/ops/pages/resource-context/index.vue
@@ -74,7 +74,7 @@
             {{ businessSystemName(record.business_system_id) }}
           </template>
           <template #owner_user_id="{ record }">
-            {{ record.owner_user_id || '-' }}
+            {{ responsibilityText(record) }}
           </template>
           <template #asset_id="{ record }">
             {{ record.asset_id || '-' }}
@@ -99,13 +99,20 @@
         <a-descriptions-item label="资源分类">{{ resourceTypeName(currentResource.resource_category) }}</a-descriptions-item>
         <a-descriptions-item label="服务标识">{{ currentResource.service_identity }}</a-descriptions-item>
         <a-descriptions-item label="业务系统">{{ businessSystemName(currentResource.business_system_id) }}</a-descriptions-item>
-        <a-descriptions-item label="责任人">{{ currentResource.owner_user_id || '-' }}</a-descriptions-item>
+        <a-descriptions-item label="责任人">{{ responsibilityText(currentResource) }}</a-descriptions-item>
         <a-descriptions-item label="责任部门">{{ currentResource.department_id || '-' }}</a-descriptions-item>
         <a-descriptions-item label="资产绑定">{{ currentResource.asset_id || '-' }}</a-descriptions-item>
         <a-descriptions-item label="位置引用" :span="2">{{ locationText(currentResource) }}</a-descriptions-item>
         <a-descriptions-item label="关联告警" :span="2">等待 alert incident 接口接入后按 resource_uid 聚合展示</a-descriptions-item>
       </a-descriptions>
 
+      <ResponsibilityEditor
+        v-if="currentResource"
+        :resource="currentResource"
+        style="margin-top: 16px"
+        @saved="handleResponsibilitySaved"
+      />
+
       <a-divider />
       <a-table row-key="id" :data="metricSeries" :columns="metricColumns" :loading="metricLoading" :pagination="false" />
     </a-drawer>
@@ -117,6 +124,9 @@ import { computed, onMounted, reactive, ref } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { IconEye, IconSearch } from '@arco-design/web-vue/es/icon'
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface'
+import ResponsibilityEditor from './components/ResponsibilityEditor.vue'
+import { fetchUserList, type UserItem } from '@/api/ops/rbac2'
+import { fetchExternalContactOptions, type ExternalContact } from '@/api/ops/externalContact'
 import {
   fetchControlBusinessSystems,
   fetchControlMetricSeries,
@@ -138,6 +148,8 @@ const resources = ref<ControlResource[]>([])
 const metricSeries = ref<ControlMetricSeries[]>([])
 const resourceTypes = ref<ControlResourceType[]>([])
 const businessSystems = ref<ControlBusinessSystem[]>([])
+const users = ref<UserItem[]>([])
+const externalContacts = ref<ExternalContact[]>([])
 const currentResource = ref<ControlResource | null>(null)
 const selectedMetricTotal = ref(0)
 
@@ -213,6 +225,16 @@ const businessSystemName = (id?: number) => {
   return item?.name || String(id)
 }
 
+const responsibilityText = (resource: ControlResource) => {
+  if (resource.responsibility_type === 'external' && resource.external_contact_id) {
+    return externalContacts.value.find((item) => item.id === resource.external_contact_id)?.name || `外部联系人 ${resource.external_contact_id}`
+  }
+  if (resource.responsibility_type === 'internal' && resource.owner_user_id) {
+    return users.value.find((item) => Number(item.id) === resource.owner_user_id)?.name || `系统用户 ${resource.owner_user_id}`
+  }
+  return '未指定'
+}
+
 const statusColor = (status?: string) => {
   const map: Record<string, string> = {
     online: 'green',
@@ -266,9 +288,11 @@ const fetchResources = async () => {
 
 const fetchDictionaries = async () => {
   partialMessage.value = ''
-  const [typeResult, systemResult] = await Promise.allSettled([
+  const [typeResult, systemResult, userResult, contactResult] = await Promise.allSettled([
     fetchControlResourceTypes({ page: 1, size: 100 }),
     fetchControlBusinessSystems({ page: 1, size: 100, status: 'active' }),
+    fetchUserList({ page: 1, size: 100, status: 1 }),
+    fetchExternalContactOptions(),
   ])
   if (typeResult.status === 'fulfilled') {
     resourceTypes.value = typeResult.value.details?.data || []
@@ -276,7 +300,15 @@ const fetchDictionaries = async () => {
   if (systemResult.status === 'fulfilled') {
     businessSystems.value = systemResult.value.details?.data || []
   }
-  if (typeResult.status === 'rejected' || systemResult.status === 'rejected') {
+  if (userResult.status === 'fulfilled') {
+    const raw = userResult.value.details ?? userResult.value.data
+    users.value = Array.isArray(raw) ? raw : raw?.data || []
+  }
+  if (contactResult.status === 'fulfilled') {
+    const raw: any = contactResult.value
+    externalContacts.value = Array.isArray(raw) ? raw : raw.details || []
+  }
+  if ([typeResult, systemResult, userResult, contactResult].some((result) => result.status === 'rejected')) {
     partialMessage.value = '字典数据部分加载失败，资源列表仍可继续使用。'
   }
 }
@@ -301,6 +333,12 @@ const openDetail = (record: ControlResource) => {
   fetchMetricSeries(record.resource_uid)
 }
 
+const handleResponsibilitySaved = (resource: ControlResource) => {
+  currentResource.value = resource
+  const index = resources.value.findIndex((item) => item.resource_uid === resource.resource_uid)
+  if (index >= 0) resources.value[index] = resource
+}
+
 const handlePageChange = (page: number) => {
   resourcePagination.current = page
   fetchResources()
diff --git a/src/views/ops/pages/system-settings/license-center/index.vue b/src/views/ops/pages/system-settings/license-center/index.vue
index 5260afe..e6266c9 100644
--- a/src/views/ops/pages/system-settings/license-center/index.vue
+++ b/src/views/ops/pages/system-settings/license-center/index.vue
@@ -17,8 +17,9 @@
 
       <a-spin :loading="loading" class="page-spin">
         <a-empty v-if="!loading && loadError && !license" description="加载失败，请稍后重试" />
+		<a-empty v-else-if="license && !license.enabled" description="当前运行模式未启用许可证" />
 
-        <template v-else-if="license">
+		<template v-else-if="license?.enabled">
           <a-card class="section-card" :bordered="false">
             <template #title>
               <span class="section-title">基本信息</span>
diff --git a/src/views/ops/pages/system-settings/parameters/index.vue b/src/views/ops/pages/system-settings/parameters/index.vue
index 838b2d6..6d7e4ca 100644
--- a/src/views/ops/pages/system-settings/parameters/index.vue
+++ b/src/views/ops/pages/system-settings/parameters/index.vue
@@ -1,22 +1,81 @@
 <template>
   <div class="page">
     <Breadcrumb :items="['系统设置', '系统参数']" />
+    <a-card :bordered="false" title="系统品牌" class="brand-card">
+      <a-form layout="vertical" :model="brandForm">
+        <a-form-item label="系统名称" required>
+          <a-input v-model="brandForm.systemName" :max-length="50" show-word-limit placeholder="请输入系统名称" />
+        </a-form-item>
+        <a-grid :cols="24" :col-gap="24" :row-gap="16">
+          <a-grid-item :span="8">
+            <a-form-item label="系统 Logo">
+              <div class="image-editor">
+                <img v-if="brandForm.logo" :src="brandForm.logo.url" alt="系统 Logo" class="logo-preview" />
+                <a-empty v-else description="尚未配置 Logo" />
+                <a-space>
+                  <a-button :loading="uploadingLogo" @click="selectLogo">选择图片</a-button>
+                  <a-button v-if="brandForm.logo" status="danger" @click="brandForm.logo = undefined">移除</a-button>
+                </a-space>
+              </div>
+            </a-form-item>
+          </a-grid-item>
+          <a-grid-item :span="16">
+            <a-form-item label="登录背景（最多 5 张，按顺序轮播）">
+              <div class="background-list">
+                <div v-for="(image, index) in brandForm.backgrounds" :key="image.file_id" class="background-item">
+                  <img :src="image.url" :alt="`登录背景 ${index + 1}`" />
+                  <a-button size="mini" status="danger" @click="removeBackground(index)">移除</a-button>
+                </div>
+                <a-button
+                  v-if="brandForm.backgrounds.length < 5"
+                  class="add-background"
+                  :loading="uploadingBackground"
+                  @click="selectBackground"
+                >
+                  添加背景
+                </a-button>
+              </div>
+            </a-form-item>
+          </a-grid-item>
+        </a-grid>
+        <a-button type="primary" :loading="savingBrand" @click="saveBrand">保存系统品牌</a-button>
+      </a-form>
+      <input ref="logoInput" type="file" accept="image/png,image/jpeg,image/webp,image/gif,image/svg+xml" hidden @change="uploadLogo" />
+      <input
+        ref="backgroundInput"
+        type="file"
+        accept="image/png,image/jpeg,image/webp,image/gif,image/svg+xml"
+        hidden
+        @change="uploadBackground"
+      />
+    </a-card>
     <a-alert type="info" class="tip">系统仅开放以下六项运行参数，修改后由相应模块在下一次读取时生效。</a-alert>
     <a-card :bordered="false" title="系统参数">
       <a-table :data="rows" :loading="loading" :pagination="false" row-key="code" :scroll="{ x: 900 }">
         <template #columns>
           <a-table-column title="参数" data-index="name" :width="190" />
-          <a-table-column title="当前值" :width="150"><template #cell="{ record }"><strong>{{ record.value }} {{ record.unit }}</strong></template></a-table-column>
-          <a-table-column title="允许范围" :width="170"><template #cell="{ record }">{{ record.minimum }} 至 {{ record.maximum }} {{ record.unit }}</template></a-table-column>
+          <a-table-column title="当前值" :width="150">
+            <template #cell="{ record }">
+              <strong>{{ record.value }} {{ record.unit }}</strong>
+            </template>
+          </a-table-column>
+          <a-table-column title="允许范围" :width="170">
+            <template #cell="{ record }">{{ record.minimum }} 至 {{ record.maximum }} {{ record.unit }}</template>
+          </a-table-column>
           <a-table-column title="说明" data-index="description" :width="360" />
-          <a-table-column title="操作" :width="90" fixed="right"><template #cell="{ record }"><a-button type="text" @click="open(record)">修改</a-button></template></a-table-column>
+          <a-table-column title="操作" :width="90" fixed="right">
+            <template #cell="{ record }"><a-button type="text" @click="open(record)">修改</a-button></template>
+          </a-table-column>
         </template>
       </a-table>
     </a-card>
     <a-modal v-model:visible="visible" title="修改系统参数" @before-ok="submit">
       <a-form v-if="current" layout="vertical">
         <a-form-item label="参数">{{ current.name }}</a-form-item>
-        <a-form-item label="参数值"><a-input-number v-model="value" :min="current.minimum" :max="current.maximum" /><span class="unit">{{ current.unit }}</span></a-form-item>
+        <a-form-item label="参数值">
+          <a-input-number v-model="value" :min="current.minimum" :max="current.maximum" />
+          <span class="unit">{{ current.unit }}</span>
+        </a-form-item>
         <a-form-item label="允许范围">{{ current.minimum }} 至 {{ current.maximum }} {{ current.unit }}</a-form-item>
       </a-form>
     </a-modal>
@@ -27,20 +86,51 @@
 import { onMounted, ref } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import Breadcrumb from '@/components/breadcrumb/index.vue'
-import { fetchSystemParameters, updateSystemParameter, unwrapSystemSettings, type SystemParameter } from '@/api/ops/systemSettings'
+import {
+  fetchSystemBranding,
+  fetchSystemParameters,
+  updateSystemBranding,
+  updateSystemParameter,
+  uploadSystemBrandingImage,
+  unwrapSystemSettings,
+  type BrandingImage,
+  type SystemBranding,
+  type SystemParameter,
+} from '@/api/ops/systemSettings'
 import { invalidateSystemParameters } from '@/composables/systemParameters'
+import { loadSystemBranding } from '@/composables/systemBranding'
 
 const loading = ref(false)
 const visible = ref(false)
 const rows = ref<SystemParameter[]>([])
 const current = ref<SystemParameter>()
 const value = ref(0)
+const logoInput = ref<HTMLInputElement>()
+const backgroundInput = ref<HTMLInputElement>()
+const uploadingLogo = ref(false)
+const uploadingBackground = ref(false)
+const savingBrand = ref(false)
+const brandForm = ref<{ systemName: string; logo?: BrandingImage; backgrounds: BrandingImage[] }>({ systemName: '', backgrounds: [] })
 async function load() {
   loading.value = true
-  try { rows.value = unwrapSystemSettings<SystemParameter[]>(await fetchSystemParameters()) || [] }
-  finally { loading.value = false }
+  try {
+    const [parametersResponse, brandingResponse] = await Promise.all([fetchSystemParameters(), fetchSystemBranding()])
+    rows.value = unwrapSystemSettings<SystemParameter[]>(parametersResponse) || []
+    const branding = unwrapSystemSettings<SystemBranding>(brandingResponse)
+    brandForm.value = {
+      systemName: branding.system_name,
+      logo: branding.logo,
+      backgrounds: branding.login_backgrounds || [],
+    }
+  } finally {
+    loading.value = false
+  }
+}
+function open(row: SystemParameter) {
+  current.value = row
+  value.value = row.value
+  visible.value = true
 }
-function open(row: SystemParameter) { current.value = row; value.value = row.value; visible.value = true }
 async function submit() {
   if (!current.value) return false
   await updateSystemParameter(current.value.code, value.value)
@@ -49,12 +139,111 @@ async function submit() {
   await load()
   return true
 }
+const selectLogo = () => logoInput.value?.click()
+const selectBackground = () => backgroundInput.value?.click()
+const selectedFile = (event: Event) => (event.target as HTMLInputElement).files?.[0]
+async function uploadLogo(event: Event) {
+  const file = selectedFile(event)
+  if (!file) return
+  uploadingLogo.value = true
+  try {
+    brandForm.value.logo = await uploadSystemBrandingImage(file)
+  } finally {
+    uploadingLogo.value = false
+    if (logoInput.value) logoInput.value.value = ''
+  }
+}
+async function uploadBackground(event: Event) {
+  const file = selectedFile(event)
+  if (!file) return
+  uploadingBackground.value = true
+  try {
+    const image = await uploadSystemBrandingImage(file)
+    brandForm.value.backgrounds.push(image)
+  } finally {
+    uploadingBackground.value = false
+    if (backgroundInput.value) backgroundInput.value.value = ''
+  }
+}
+function removeBackground(index: number) {
+  brandForm.value.backgrounds.splice(index, 1)
+}
+async function saveBrand() {
+  const name = brandForm.value.systemName.trim()
+  if (name.length < 2) {
+    Message.warning('系统名称至少需要 2 个字符')
+    return
+  }
+  savingBrand.value = true
+  try {
+    const response: any = await updateSystemBranding({
+      system_name: name,
+      logo_file_id: brandForm.value.logo?.file_id,
+      background_file_ids: brandForm.value.backgrounds.map((item) => item.file_id),
+    })
+    if (response.code !== 0) throw new Error(response.message || '系统品牌保存失败')
+    await loadSystemBranding(true)
+    Message.success('系统品牌已更新')
+    await load()
+  } finally {
+    savingBrand.value = false
+  }
+}
 onMounted(load)
 </script>
 
 <style scoped lang="less">
-.page { padding: 0 20px 20px; }
-.tip { margin-bottom: 16px; }
-.unit { margin-left: 8px; }
-@media (max-width: 768px) { .page { padding: 0 12px 12px; } }
+.page {
+  padding: 0 20px 20px;
+}
+.tip {
+  margin-bottom: 16px;
+}
+.brand-card {
+  margin-bottom: 16px;
+}
+.image-editor {
+  min-height: 180px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 12px;
+}
+.logo-preview {
+  width: 120px;
+  height: 120px;
+  object-fit: contain;
+  border: 1px solid var(--color-border-2);
+  border-radius: 6px;
+}
+.background-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+.background-item {
+  width: 180px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+.background-item img {
+  width: 180px;
+  height: 100px;
+  object-fit: cover;
+  border-radius: 6px;
+  border: 1px solid var(--color-border-2);
+}
+.add-background {
+  width: 180px;
+  height: 100px;
+}
+.unit {
+  margin-left: 8px;
+}
+@media (max-width: 768px) {
+  .page {
+    padding: 0 12px 12px;
+  }
+}
 </style>
diff --git a/src/views/ops/pages/user-permission/index.vue b/src/views/ops/pages/user-permission/index.vue
index 01acddc..e1206fe 100644
--- a/src/views/ops/pages/user-permission/index.vue
+++ b/src/views/ops/pages/user-permission/index.vue
@@ -2,7 +2,8 @@
   <AccountManagement v-if="section === 'users'" />
   <OrganizationManagement v-else-if="section === 'organization'" />
   <RoleManagement v-else-if="section === 'roles'" />
-  <NotificationGroupManagement v-else />
+  <NotificationGroupManagement v-else-if="section === 'notification-groups'" />
+  <ResponsibilityManagement v-else />
 </template>
 
 <script setup lang="ts">
@@ -12,6 +13,7 @@ import AccountManagement from '@/views/ops/pages/system-settings/account-managem
 import OrganizationManagement from './organization.vue'
 import RoleManagement from './roles.vue'
 import NotificationGroupManagement from './notification-groups.vue'
+import ResponsibilityManagement from './responsibility.vue'
 
 const route = useRoute()
 const section = computed(() => {
diff --git a/src/views/ops/pages/user-permission/responsibility.vue b/src/views/ops/pages/user-permission/responsibility.vue
new file mode 100644
index 0000000..93ca304
--- /dev/null
+++ b/src/views/ops/pages/user-permission/responsibility.vue
@@ -0,0 +1,240 @@
+<template>
+  <div class="responsibility-page">
+    <a-card :bordered="false" title="默认告警负责人" class="section-card">
+      <a-alert type="info" style="margin-bottom: 16px">
+        资源没有指定责任人且责任规则未匹配时，告警和工单由此处选择的超级管理员负责。初始化账号默认使用系统部署时配置的超级管理员。
+      </a-alert>
+      <a-space fill>
+        <a-select v-model="defaultReceiverId" allow-search :loading="receiverLoading" style="width: 420px; max-width: 100%">
+          <a-option v-for="item in receiverOptions" :key="item.id" :value="item.id">
+            {{ item.name }}（{{ item.account }}）
+          </a-option>
+        </a-select>
+        <a-button type="primary" :loading="receiverSaving" :disabled="!defaultReceiverId" @click="saveDefaultReceiver">保存</a-button>
+      </a-space>
+    </a-card>
+
+    <a-card :bordered="false" title="外部联系人">
+      <div class="toolbar">
+        <a-input-search v-model="keyword" allow-clear placeholder="姓名、手机号或邮箱" style="width: 320px" @search="loadContacts" />
+        <a-button type="primary" @click="openCreate">新增外部联系人</a-button>
+      </div>
+      <a-table
+        row-key="id"
+        :columns="columns"
+        :data="contacts"
+        :loading="contactLoading"
+        :pagination="pagination"
+        @page-change="changePage"
+      >
+        <template #contact="{ record }">
+          <div>{{ record.phone || '-' }}</div>
+          <div>{{ record.email || '-' }}</div>
+        </template>
+        <template #enabled="{ record }">
+          <a-tag :color="record.enabled ? 'green' : 'gray'">{{ record.enabled ? '已启用' : '已禁用' }}</a-tag>
+        </template>
+        <template #actions="{ record }">
+          <a-space>
+            <a-button type="text" size="small" @click="openEdit(record)">编辑</a-button>
+            <a-button type="text" status="danger" size="small" @click="removeContact(record)">删除</a-button>
+          </a-space>
+        </template>
+      </a-table>
+    </a-card>
+
+    <a-modal
+      v-model:visible="editorVisible"
+      :title="editing?.id ? '编辑外部联系人' : '新增外部联系人'"
+      :confirm-loading="contactSaving"
+      width="560px"
+      @ok="saveContact"
+    >
+      <a-form :model="form" layout="vertical">
+        <a-form-item field="name" label="姓名" required><a-input v-model="form.name" /></a-form-item>
+        <a-form-item field="phone" label="手机号"><a-input v-model="form.phone" /></a-form-item>
+        <a-form-item field="email" label="邮箱"><a-input v-model="form.email" /></a-form-item>
+        <a-form-item field="enabled" label="是否启用"><a-switch v-model="form.enabled" /></a-form-item>
+        <a-form-item field="remarks" label="备注"><a-textarea v-model="form.remarks" :rows="2" /></a-form-item>
+        <a-alert type="info">手机号和邮箱至少填写一项。被资源责任人引用的联系人不能禁用或删除。</a-alert>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue'
+import { Message, Modal } from '@arco-design/web-vue'
+import {
+  createExternalContact,
+  deleteExternalContact,
+  fetchExternalContacts,
+  updateExternalContact,
+  type ExternalContact,
+} from '@/api/ops/externalContact'
+import {
+  fetchAlertDefaultReceiver,
+  fetchAlertDefaultReceiverOptions,
+  updateAlertDefaultReceiver,
+  type AlertDefaultReceiver,
+} from '@/api/ops/rbac2'
+
+const receiverLoading = ref(false)
+const receiverSaving = ref(false)
+const defaultReceiverId = ref<number>()
+const receiverOptions = ref<AlertDefaultReceiver[]>([])
+const contactLoading = ref(false)
+const contactSaving = ref(false)
+const contacts = ref<ExternalContact[]>([])
+const keyword = ref('')
+const editorVisible = ref(false)
+const editing = ref<ExternalContact | null>(null)
+const form = reactive({ name: '', phone: '', email: '', enabled: true, remarks: '' })
+const pagination = reactive({ current: 1, pageSize: 20, total: 0 })
+const columns = [
+  { title: '姓名', dataIndex: 'name', width: 160 },
+  { title: '联系方式', slotName: 'contact', width: 240 },
+  { title: '备注', dataIndex: 'remarks', ellipsis: true, tooltip: true },
+  { title: '状态', slotName: 'enabled', width: 100 },
+  { title: '操作', slotName: 'actions', width: 130, fixed: 'right' },
+]
+
+const loadReceivers = async () => {
+  receiverLoading.value = true
+  try {
+    const [currentResponse, optionResponse]: any[] = await Promise.all([
+      fetchAlertDefaultReceiver(),
+      fetchAlertDefaultReceiverOptions(),
+    ])
+    receiverOptions.value = Array.isArray(optionResponse) ? optionResponse : optionResponse?.details || []
+    const current = currentResponse?.details || currentResponse
+    defaultReceiverId.value = current?.id
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载默认告警负责人失败')
+  } finally {
+    receiverLoading.value = false
+  }
+}
+
+const saveDefaultReceiver = async () => {
+  if (!defaultReceiverId.value) return
+  receiverSaving.value = true
+  try {
+    const response: any = await updateAlertDefaultReceiver(defaultReceiverId.value)
+    if (response.code !== 0) throw new Error(response.message || '保存默认告警负责人失败')
+    Message.success('默认告警负责人已保存')
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '保存默认告警负责人失败')
+  } finally {
+    receiverSaving.value = false
+  }
+}
+
+const loadContacts = async () => {
+  contactLoading.value = true
+  try {
+    const response: any = await fetchExternalContacts({
+      page: pagination.current,
+      page_size: pagination.pageSize,
+      keyword: keyword.value.trim() || undefined,
+    })
+    contacts.value = response.details?.data || []
+    pagination.total = response.details?.total || 0
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '加载外部联系人失败')
+  } finally {
+    contactLoading.value = false
+  }
+}
+
+const openCreate = () => {
+  editing.value = null
+  Object.assign(form, { name: '', phone: '', email: '', enabled: true, remarks: '' })
+  editorVisible.value = true
+}
+
+const openEdit = (row: ExternalContact) => {
+  editing.value = row
+  Object.assign(form, { name: row.name, phone: row.phone, email: row.email, enabled: row.enabled, remarks: row.remarks })
+  editorVisible.value = true
+}
+
+const saveContact = async () => {
+  if (!form.name.trim()) {
+    Message.warning('请输入联系人姓名')
+    return
+  }
+  if (!form.phone.trim() && !form.email.trim()) {
+    Message.warning('手机号和邮箱至少填写一项')
+    return
+  }
+  contactSaving.value = true
+  try {
+    const response: any = editing.value
+      ? await updateExternalContact({
+          id: editing.value.id,
+          code: editing.value.code,
+          name: form.name.trim(),
+          phone: form.phone.trim(),
+          email: form.email.trim(),
+          enabled: form.enabled,
+          remarks: form.remarks.trim(),
+        })
+      : await createExternalContact({
+          code: `external_${Date.now().toString(36)}`,
+          name: form.name.trim(),
+          phone: form.phone.trim(),
+          email: form.email.trim(),
+          enabled: form.enabled,
+          remarks: form.remarks.trim(),
+        })
+    if (response.code !== 0) throw new Error(response.message || '保存外部联系人失败')
+    Message.success(editing.value ? '外部联系人已更新' : '外部联系人已新增')
+    editorVisible.value = false
+    await loadContacts()
+  } catch (error: any) {
+    Message.error(error?.response?.data?.message || error?.message || '保存外部联系人失败')
+  } finally {
+    contactSaving.value = false
+  }
+}
+
+const removeContact = (row: ExternalContact) => {
+  Modal.confirm({
+    title: '删除外部联系人',
+    content: `确认删除“${row.name}”吗？被资源责任人引用时系统会阻止删除。`,
+    onOk: async () => {
+      try {
+        const response: any = await deleteExternalContact(row.id)
+        if (response.code !== 0) throw new Error(response.message || '删除外部联系人失败')
+        Message.success('外部联系人已删除')
+        await loadContacts()
+      } catch (error: any) {
+        Message.error(error?.response?.data?.message || error?.message || '删除外部联系人失败')
+      }
+    },
+  })
+}
+
+const changePage = (page: number) => {
+  pagination.current = page
+  loadContacts()
+}
+
+onMounted(() => Promise.all([loadReceivers(), loadContacts()]))
+</script>
+
+<style scoped>
+.responsibility-page {
+  padding: 16px;
+}
+.section-card {
+  margin-bottom: 16px;
+}
+.toolbar {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  margin-bottom: 16px;
+}
+</style>
diff --git a/src/views/visualization/ops-big-screen/index.vue b/src/views/visualization/ops-big-screen/index.vue
index 13589a4..bb14511 100644
--- a/src/views/visualization/ops-big-screen/index.vue
+++ b/src/views/visualization/ops-big-screen/index.vue
@@ -14,8 +14,8 @@
           <a-table-column title="项目 ID" data-index="identity" />
           <a-table-column title="状态" :width="110">
             <template #cell="{ record }">
-              <a-tag :color="record.state === 1 ? 'green' : 'gray'">
-                {{ record.state === 1 ? '已发布' : '草稿' }}
+              <a-tag :color="record.state === GoViewProjectState.Published ? 'green' : 'gray'">
+                {{ record.state === GoViewProjectState.Published ? '已发布' : '草稿' }}
               </a-tag>
             </template>
           </a-table-column>
@@ -40,7 +40,12 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { Message } from '@arco-design/web-vue'
-import { fetchProjectData, fetchProjectList, type GoViewProject } from '@/api/ops/goview'
+import {
+  fetchProjectData,
+  fetchProjectList,
+  GoViewProjectState,
+  type GoViewProject,
+} from '@/api/ops/goview'
 
 const loading = ref(false)
 const projects = ref<GoViewProject[]>([])
@@ -50,7 +55,7 @@ const previewContent = ref('')
 const loadProjects = async () => {
   loading.value = true
   try {
-    const res = await fetchProjectList({ page: 1, size: 50, state: 1 })
+    const res = await fetchProjectList({ page: 1, size: 50, state: GoViewProjectState.Published })
     projects.value = res.data?.list || []
   } catch (error: any) {
     Message.error(error.message || '加载已发布大屏失败')