From e31dc32ec39ca9c68f9447ecbfbe82f240a67fee Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Thu, 24 Oct 2024 17:04:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E6=B1=A0=E5=AE=B9=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resourcePool/components/capacityDrawer.vue | 18 +++++++++--------- .../system/resourcePool/locale/en-US.ts | 1 + .../system/resourcePool/locale/zh-CN.ts | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue b/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue index 76d8df03ca..759c6c2ff9 100644 --- a/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue +++ b/frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue @@ -119,14 +119,12 @@ }); const statusList = computed(() => { - return Object.keys(ReportStatus) - .map((key) => { - return { - value: key, - label: t(ReportStatus[key].label), - }; - }) - .filter((e) => e.value !== 'FAKE_ERROR'); + return Object.keys(ReportStatus).map((key) => { + return { + value: key, + label: t(ReportStatus[key].label), + }; + }); }); const columns: MsTableColumn = [ @@ -143,6 +141,8 @@ slotName: 'taskName', dataIndex: 'taskName', showDrag: true, + width: 150, + showTooltip: true, }, { title: 'system.resourcePool.useCaseName', @@ -153,7 +153,7 @@ showDrag: true, }, { - title: 'system.resourcePool.tableColumnStatus', + title: 'system.resourcePool.tableColumnExecuteStatus', dataIndex: 'status', slotName: 'status', filterConfig: { diff --git a/frontend/src/views/setting/system/resourcePool/locale/en-US.ts b/frontend/src/views/setting/system/resourcePool/locale/en-US.ts index 262b525015..107915da05 100644 --- a/frontend/src/views/setting/system/resourcePool/locale/en-US.ts +++ b/frontend/src/views/setting/system/resourcePool/locale/en-US.ts @@ -9,6 +9,7 @@ export default { 'system.resourcePool.editPool': 'Edit', 'system.resourcePool.tableColumnName': 'Name', 'system.resourcePool.tableColumnStatus': 'Status', + 'system.resourcePool.tableColumnExecuteStatus': 'Execution state', 'system.resourcePool.tableColumnType': 'Type', 'system.resourcePool.tableColumnCreateTime': 'CreateTime', 'system.resourcePool.tableColumnUpdateTime': 'UpdateTime', diff --git a/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts b/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts index 2bb7637f8b..3d9e155af2 100644 --- a/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts +++ b/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts @@ -9,6 +9,7 @@ export default { 'system.resourcePool.editPool': '编辑', 'system.resourcePool.tableColumnName': '名称', 'system.resourcePool.tableColumnStatus': '状态', + 'system.resourcePool.tableColumnExecuteStatus': '执行状态', 'system.resourcePool.tableColumnType': '类型', 'system.resourcePool.tableColumnCreateTime': '创建时间', 'system.resourcePool.tableColumnUpdateTime': '更新时间',