From dbefaa087017ba2056ebc13bcd4d41de47ddb4e6 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 18:41:48 +0800
Subject: [PATCH] 设备管理按多对多关系展示关联测试
---
src/api/deviceCollectors.ts | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/api/deviceCollectors.ts b/src/api/deviceCollectors.ts
index ee68975..960697d 100644
--- a/src/api/deviceCollectors.ts
+++ b/src/api/deviceCollectors.ts
@@ -1,12 +1,12 @@
import type {
CollectorOnlineStatus,
CollectorStatus,
- CollectorTestStatus,
CollectorPayload,
DeviceCollectorRecord,
} from '@/stores/deviceCollectors'
import { request, type ApiResponse } from './request'
import { formatBusinessTime } from '@/utils/businessTime'
+import type { DeviceRelatedTest } from '@/stores/deviceRelatedTests'
export interface DeviceCollectorListParams {
pageNum: number
@@ -15,7 +15,6 @@
beginCreateTime?: string
endCreateTime?: string
onlineStatus?: string
- testStatus?: string
status?: string
}
@@ -29,8 +28,7 @@
model: string | null
channelCount: number | null
onlineStatus: string | null
- testStatus: string | null
- currentTest: string | null
+ relatedTests: DeviceRelatedTest[]
status: string | null
remark: string | null
createTime: number | null
@@ -54,8 +52,6 @@
model: string
channelCount: number
onlineStatus: CollectorOnlineStatus
- testStatus: CollectorTestStatus
- currentTest: string
}
interface DiscoveredCollectorListResponse extends ApiResponse {
@@ -99,7 +95,6 @@
}
const onlineStatusMap: Record<string, CollectorOnlineStatus> = { '0': '离线', '1': '在线' }
-const testStatusMap: Record<string, CollectorTestStatus> = { '0': '空闲', '1': '测试中' }
const statusMap: Record<string, CollectorStatus> = { '0': '启用', '1': '禁用' }
function mapCollector(item: CollectorDto): DeviceCollectorRecord {
@@ -114,8 +109,7 @@
channelCount: item.channelCount ?? 0,
remark: item.remark || '',
onlineStatus: onlineStatusMap[item.onlineStatus || ''] || '离线',
- testStatus: testStatusMap[item.testStatus || ''] || '空闲',
- currentTest: item.currentTest || '',
+ relatedTests: item.relatedTests || [],
status: statusMap[item.status || ''] || '禁用',
createdAt: formatBusinessTime(item.createTime),
}
@@ -169,8 +163,7 @@
model: item.model || '',
channelCount: item.channelCount || 1,
onlineStatus: item.onlineStatus || '离线',
- testStatus: item.testStatus || '空闲',
- currentTest: item.currentTest || '-',
+ relatedTests: [],
status: '启用',
remark: '',
})),
--
Gitblit v1.7.1