From 65696dee09169260f61b83cd4a3bd0d0297fe972 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Wed, 21 Feb 2024 14:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=A1=A8=E6=A0=BC=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=80=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 3 +-- src/views/index.vue | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 666154e6..ec4626ff 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -59,12 +59,12 @@ export async function listMain() { ipAddress, serialNum, name: key.split('/').join('_'), + expiryDate:'-', status: 'Abnormal', }; } return mergedObj; }); - //通过sort进行冒泡排序 mergedData.sort((a: any, b: any) => { const typeA = specificOrder.indexOf(a.name.split('_')[0]); @@ -73,7 +73,6 @@ export async function listMain() { if (typeB === -1) return -1; // 如果不在特定顺序中,排到后面 return typeA - typeB; }); - //console.log(mergedData); return mergedData; } diff --git a/src/views/index.vue b/src/views/index.vue index f0b7a5fc..3f8e0581 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -73,6 +73,11 @@ let tableColumns: ColumnsType = [ title: t('views.index.serialNum'), dataIndex: 'serialNum', align: 'center', + }, + { + title: t('views.index.expiryDate'), + dataIndex: 'expiryDate', + align: 'center', }, { title: t('views.index.ipAddress'),