diff --git a/src/utils/AuthManager.ts b/src/utils/AuthManager.ts index 85ed278..53a56f0 100644 --- a/src/utils/AuthManager.ts +++ b/src/utils/AuthManager.ts @@ -10,6 +10,7 @@ import { TutorialClient, UDPClient, LogicAnalyzerClient, + NetConfigClient, } from "@/APIClient"; // 支持的客户端类型联合类型 @@ -24,7 +25,8 @@ type SupportedClient = | RemoteUpdateClient | TutorialClient | LogicAnalyzerClient - | UDPClient; + | UDPClient + | NetConfigClient; export class AuthManager { // 存储token到localStorage @@ -156,6 +158,10 @@ export class AuthManager { public static createAuthenticatedLogicAnalyzerClient(): LogicAnalyzerClient { return AuthManager.createAuthenticatedClient(LogicAnalyzerClient); } + + public static createAuthenticatedNetConfigClient(): NetConfigClient { + return AuthManager.createAuthenticatedClient(NetConfigClient); + } // 登录函数 public static async login( diff --git a/src/utils/BoardManager.ts b/src/utils/BoardManager.ts index 8f8abd8..755a853 100644 --- a/src/utils/BoardManager.ts +++ b/src/utils/BoardManager.ts @@ -74,8 +74,6 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { // 新增板卡（管理员权限） async function addBoard( name: string, - ipAddr: string, - port: number, ): Promise<{ success: boolean; error?: string; boardId?: string }> { try { // 验证管理员权限 @@ -86,19 +84,19 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { } // 验证输入参数 - if (!name || !ipAddr || !port) { - console.error("参数验证失败", { name, ipAddr, port }); + if (!name) { + console.error("参数验证失败", { name }); return { success: false, error: "参数不完整" }; } const client = AuthManager.createAuthenticatedDataClient(); - const boardId = await client.addBoard(name, ipAddr, port); + const boardId = await client.addBoard(name); if (boardId) { - console.log("新增板卡成功", { boardId, name, ipAddr, port }); + console.log("新增板卡成功", { boardId, name}); // 刷新板卡列表 await getAllBoards(); - return { success: true}; + return { success: true }; } else { console.error("新增板卡失败：返回ID为空"); return { success: false, error: "新增板卡失败" }; @@ -116,7 +114,9 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { } // 删除板卡（管理员权限） - async function deleteBoard(boardId: string): Promise<{ success: boolean; error?: string }> { + async function deleteBoard( + boardId: string, + ): Promise<{ success: boolean; error?: string }> { try { // 验证管理员权限 const hasAdminAuth = await AuthManager.verifyAdminAuth(); @@ -167,7 +167,7 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { if (!isUndefined(appBitstream1)) cnt++; if (!isUndefined(appBitstream2)) cnt++; if (!isUndefined(appBitstream3)) cnt++; - + if (cnt === 0) { console.error("未选择比特流文件"); return { success: false, error: "未选择比特流文件" }; @@ -175,7 +175,7 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { try { console.log("开始上传比特流", { boardIp: board.ipAddr, fileCount: cnt }); - + const uploadResult = await remoteUpdater.uploadBitstreams( board.ipAddr, toFileParameterOrNull(goldBitstream), @@ -198,7 +198,10 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { ); if (downloadResult != cnt) { - console.error("固化比特流失败", { expected: cnt, actual: downloadResult }); + console.error("固化比特流失败", { + expected: cnt, + actual: downloadResult, + }); return { success: false, error: "固化比特流失败" }; } else { console.log("固化比特流成功", { count: downloadResult }); @@ -212,18 +215,18 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { // 热启动位流 async function hotresetBitstream( - board: BoardData, - bitstreamNum: number + board: BoardData, + bitstreamNum: number, ): Promise<{ success: boolean; error?: string }> { try { console.log("开始热启动比特流", { boardIp: board.ipAddr, bitstreamNum }); - + const ret = await remoteUpdater.hotResetBitstream( board.ipAddr, board.port, bitstreamNum, ); - + if (ret) { console.log("热启动比特流成功"); return { success: true }; @@ -253,7 +256,11 @@ const [useProvideBoardManager, useBoardManager] = createInjectionState(() => { const file = target.files?.[0]; if (file) { (board as any)[fileKey] = file; - console.log(`文件选择成功`, { boardIp: board.ipAddr, fileKey, fileName: file.name }); + console.log(`文件选择成功`, { + boardIp: board.ipAddr, + fileKey, + fileName: file.name, + }); } } diff --git a/src/views/User/AddBoardDialog.vue b/src/views/User/AddBoardDialog.vue index 24854f4..f5863f9 100644 --- a/src/views/User/AddBoardDialog.vue +++ b/src/views/User/AddBoardDialog.vue @@ -2,62 +2,74 @@

新增实验板

- -
- -
- - - -
- -
- - - -
+ +
+ + +
+ + + +
- -
- - - + +
+ + +
+ +
+ + +
+
+
+
+ + + + 请打开实验板配对模式 +
+
@@ -65,23 +77,84 @@
- +
+ + +
+
+
+
+ + 正在分配网络... +
+
+
+
+ + +
+
+
+
+ + + + 实验板配置成功 +
+
+
+ + +
+

网络配置信息：

+
+
+
主机IP: {{ networkConfig.hostIP }}
+
板卡IP: {{ networkConfig.boardIP }}
+
主机MAC: {{ networkConfig.hostMAC }}
+
板卡MAC: {{ networkConfig.boardMAC }}
+
+
+
+ + +
+ +
+
- +
@@ -90,8 +163,10 @@ \ No newline at end of file + +.alert { + @apply rounded-lg p-4; +} + +.alert-info { + @apply bg-blue-50 text-blue-800 border border-blue-200; +} + +.alert-warning { + @apply bg-yellow-50 text-yellow-800 border border-yellow-200; +} + +.alert-success { + @apply bg-green-50 text-green-800 border border-green-200; +} + diff --git a/src/views/User/BoardTableManager.ts b/src/views/User/BoardTableManager.ts index d0c36b3..166f595 100644 --- a/src/views/User/BoardTableManager.ts +++ b/src/views/User/BoardTableManager.ts @@ -37,7 +37,9 @@ const [useProvideBoardTableManager, useBoardTableManager] = port: false, id: false, status: false, - version: false, + firmVersion: false, + macAddr: false, + occupiedUserName: false, }); const rowSelection = ref({}); const expanded = ref({}); @@ -88,20 +90,12 @@ const [useProvideBoardTableManager, useBoardTableManager] = enableHiding: true, }, { - accessorKey: "devAddr", + accessorKey: "ipAddr", header: "IP 地址", cell: ({ row }) => { const device = row.original; - return isEditMode.value - ? h("input", { - type: "text", - class: "input input-sm w-full", - value: device.ipAddr, - onInput: (e: Event) => { - device.ipAddr = (e.target as HTMLInputElement).value; - }, - }) - : h("span", { class: "font-medium" }, device.ipAddr); + // IP地址设置为不可更改 + return h("span", { class: "font-mono" }, device.ipAddr); }, }, { @@ -109,16 +103,28 @@ const [useProvideBoardTableManager, useBoardTableManager] = header: "端口", cell: ({ row }) => { const device = row.original; - return isEditMode.value - ? h("input", { - type: "number", - class: "input input-sm w-full", - value: device.port, - onInput: (e: Event) => { - device.port = parseInt((e.target as HTMLInputElement).value); - }, - }) - : h("span", { class: "font-mono" }, device.port.toString()); + // 端口设置为不可更改 + return h("span", { class: "font-mono" }, device.port.toString()); + }, + enableHiding: true, + }, + { + accessorKey: "macAddr", + header: "MAC 地址", + cell: ({ row }) => { + const device = row.original; + return h("span", { class: "font-mono text-sm" }, device.macAddr); + }, + enableHiding: true, + }, + { + accessorKey: "occupiedUserName", + header: "占用用户", + cell: ({ row }) => { + const device = row.original; + const userName = device.occupiedUserName || "未占用"; + const userClass = device.occupiedUserName ? "text-warning" : "text-success"; + return h("span", { class: `font-medium ${userClass}` }, userName); }, enableHiding: true, }, @@ -134,9 +140,27 @@ const [useProvideBoardTableManager, useBoardTableManager] = header: "状态", cell: ({ row }) => { const device = row.original; - const statusText = device.status === 0 ? "忙碌" : "可用"; - const statusClass = - device.status === 0 ? "badge-warning" : "badge-success"; + let statusText = ""; + let statusClass = ""; + + switch (device.status) { + case 0: // Disabled + statusText = "禁用"; + statusClass = "badge-error"; + break; + case 1: // Busy + statusText = "忙碌"; + statusClass = "badge-warning"; + break; + case 2: // Available + statusText = "可用"; + statusClass = "badge-success"; + break; + default: + statusText = "未知"; + statusClass = "badge-neutral"; + } + return h( "span", { @@ -148,10 +172,11 @@ const [useProvideBoardTableManager, useBoardTableManager] = enableHiding: true, }, { - accessorKey: "version", - header: "版本号", + accessorKey: "firmVersion", + header: "固件版本", cell: ({ row }) => - h("span", { class: "font-mono" }, row.original.firmVersion), + h("span", { class: "font-mono text-sm" }, row.original.firmVersion), + enableHiding: true, }, { accessorKey: "defaultBitstream", @@ -248,7 +273,7 @@ const [useProvideBoardTableManager, useBoardTableManager] = class: "btn btn-error btn-sm", onClick: async () => { const confirmed = confirm( - `确定要删除设备 ${device.ipAddr} 吗？`, + `确定要删除设备 ${device.boardName || device.ipAddr} 吗？`, ); if (confirmed) { await deleteBoard(device.id); @@ -378,8 +403,8 @@ const [useProvideBoardTableManager, useBoardTableManager] = } // 新增板卡 - async function addBoard(name: string, ipAddr: string, port: number): Promise { - const result = await boardManager.addBoard(name, ipAddr, port); + async function addBoard(name: string): Promise { + const result = await boardManager.addBoard(name); if (result.success) { dialog?.info("新增板卡成功"); } else {