diff --git a/src/constants/business.ts b/src/constants/business.ts index 00623b2..5c21996 100644 --- a/src/constants/business.ts +++ b/src/constants/business.ts @@ -117,12 +117,12 @@ export const backOffRecord: Record = { export const backOffRecordOptions = transformRecordToNumberOption(backOffRecord, true); export const routeKeyRecord: Record = { - 1: 'common.routeKey.items.consistentHash', - 2: 'common.routeKey.items.random', - 3: 'common.routeKey.items.lru', - 4: 'common.routeKey.items.round' + '1': 'common.routeKey.items.consistentHash', + '2': 'common.routeKey.items.random', + '3': 'common.routeKey.items.lru', + '4': 'common.routeKey.items.round' }; -export const routeKeyRecordOptions = transformRecordToNumberOption(routeKeyRecord, true); +export const routeKeyRecordOptions = transformRecordToOption(routeKeyRecord); /** 阻塞策略 */ export const blockStrategyRecord: Record = { diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index 2c65530..2872e20 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -71,7 +71,7 @@ declare namespace Api { } & T; /** 1: 一致性Hash 2: 随机 3: LRU 4: 轮询 */ - type RouteKey = 1 | 2 | 3 | 4; + type RouteKey = '1' | '2' | '3' | '4'; /** 阻塞策略 1:丢弃 2:覆盖 3:并行 */ type BlockStrategy = 1 | 2 | 3; diff --git a/src/utils/common.ts b/src/utils/common.ts index 9d425f5..4e4dbc5 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -69,7 +69,9 @@ export function translateOptions2(options: string[]) { * * @param index */ -export function tagColor(index: number) { +export function tagColor(index: number | string) { + const indexNumber = Number(index); + const tagMap: Record = { 0: 'error', 1: 'info', @@ -78,9 +80,9 @@ export function tagColor(index: number) { 4: 'primary' }; - if (index === null || index < 0) { + if (indexNumber === null || indexNumber < 0) { return tagMap[1]; } - return tagMap[index % 5]; + return tagMap[indexNumber % 5]; } diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue index a735159..bcd47d7 100644 --- a/src/views/job/batch/index.vue +++ b/src/views/job/batch/index.vue @@ -53,27 +53,33 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe return null; } const tagMap: Record = { - 0: 'default', - 1: 'default', - 2: 'error', - 3: 'default', - 4: 'default', - 5: 'default', - 6: 'default', - 7: 'default', - 8: 'default', - 9: 'default', - 10: 'default', - 11: 'default', - 12: 'default', - 13: 'default', - 14: 'default' + 0: 'warning', + 1: 'warning', + 2: 'warning', + 3: 'warning', + 4: 'warning', + 5: 'warning', + 6: 'warning', + 7: 'warning', + 8: 'warning', + 9: 'warning', + 10: 'warning', + 11: 'warning', + 12: 'warning', + 13: 'warning', + 14: 'warning' }; const label = $t(operationReasonRecord[row.operationReason!]); return {label}; } }, + { + key: 'createDt', + title: $t('common.createDt'), + align: 'center', + minWidth: 120 + }, { key: 'operate', title: $t('common.operate'), @@ -84,6 +90,9 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe detail(row.id!)}> {$t('common.detail')} + handleExecute(row.id!)}> + {$t('common.execute')} + ) } @@ -93,6 +102,10 @@ const { columns, data, getData, loading, mobilePagination, searchParams, resetSe function detail(id: string) { console.log(id); } + +function handleExecute(id: string) { + console.log(id); +}