diff --git a/packages/assets/styles/utilities.scss b/packages/assets/styles/utilities.scss index 63b76acd8..d287835c2 100644 --- a/packages/assets/styles/utilities.scss +++ b/packages/assets/styles/utilities.scss @@ -1318,6 +1318,10 @@ margin-top: 0.25rem !important; } +.mt-1\.5 { + margin-top: 0.375rem !important; +} + .mt-2 { margin-top: 0.5rem !important; } diff --git a/packages/business/src/components/SyncStatus.vue b/packages/business/src/components/SyncStatus.vue index d03186907..4b2760f7b 100644 --- a/packages/business/src/components/SyncStatus.vue +++ b/packages/business/src/components/SyncStatus.vue @@ -1,27 +1,19 @@ - diff --git a/packages/business/src/components/TaskStatus.vue b/packages/business/src/components/TaskStatus.vue index b0aeef68e..6ca0289d9 100644 --- a/packages/business/src/components/TaskStatus.vue +++ b/packages/business/src/components/TaskStatus.vue @@ -1,111 +1,193 @@ - @@ -116,10 +198,53 @@ export default { > - {{ $t(STATUS_MAP[task.status].i18n) }} + {{ $t(STATUS_MAP[task.status as keyof typeof STATUS_MAP].i18n) }} + + + + + + + warning + + + + + + + + + + + + - - - - warning - - - {{ - $t('packages_business_task_status_agent_tooltip_time', { - time: pingTime, - }) - }},{{ $t('packages_business_task_status_agent_tooltip_agent') }}: - {{ - agentStatus - }} - - - - - - - warning - - {{ task.shareCdcStopMessage }} - - - - - - question-circle - - - {{ errorCause }} - - - - - - - warning - - - {{ taskRetryStartTimeTip }} - - - - + + + + + {{ errorCause }} + + @@ -208,7 +275,7 @@ export default { min-width: 72px; padding: 2px 8px; text-align: center; - border-radius: 6px; + border-radius: 8px; box-sizing: border-box; word-break: keep-all; line-height: 22px; @@ -249,11 +316,48 @@ export default { } - diff --git a/packages/business/src/locale/lang/en.js b/packages/business/src/locale/lang/en.js index f7bace6ee..96234f6af 100644 --- a/packages/business/src/locale/lang/en.js +++ b/packages/business/src/locale/lang/en.js @@ -680,6 +680,8 @@ export default { 'The Agent where the task is located is', packages_business_task_status_retrying_tooltip: 'The current task is being retried. Retry start at: {val}', + packages_business_task_status_increment_delay_warning: + 'Current max delay is {delay}, exceeding threshold {threshold}', packages_business_select_placeholder: 'Please add or select', packages_business_verification_form_youjiantongzhi: 'Mail Notification', packages_business_verification_form_xitongtongzhi: 'System Notification', diff --git a/packages/business/src/locale/lang/zh-CN.js b/packages/business/src/locale/lang/zh-CN.js index 358ad7425..8d2ef52b3 100644 --- a/packages/business/src/locale/lang/zh-CN.js +++ b/packages/business/src/locale/lang/zh-CN.js @@ -613,6 +613,8 @@ export default { packages_business_task_status_agent_tooltip_agent: '任务所在的引擎为', packages_business_task_status_retrying_tooltip: '当前任务正在重试中,重试开始时间:{val}', + packages_business_task_status_increment_delay_warning: + '当前任务最大延迟为 {delay},已超过阈值 {threshold}', packages_business_select_placeholder: '请添加或选择', packages_business_verification_form_youjiantongzhi: '邮件通知', packages_business_verification_form_xitongtongzhi: '系统通知', diff --git a/packages/business/src/locale/lang/zh-TW.js b/packages/business/src/locale/lang/zh-TW.js index 4b6eb8350..018b1dec2 100644 --- a/packages/business/src/locale/lang/zh-TW.js +++ b/packages/business/src/locale/lang/zh-TW.js @@ -614,6 +614,8 @@ export default { packages_business_task_status_agent_tooltip_agent: '任務所在的引擎為', packages_business_task_status_retrying_tooltip: '當前任務正在重試中,重試開始時間:{val}', + packages_business_task_status_increment_delay_warning: + '當前任務最大延遲為 {delay},已超過閾值 {threshold}', packages_business_select_placeholder: '請添加或選擇', packages_business_verification_form_youjiantongzhi: '郵件通知', packages_business_verification_form_xitongtongzhi: '系統通知', diff --git a/packages/business/src/views/task/List.vue b/packages/business/src/views/task/List.vue index 3ac0efb87..e26dfb48a 100644 --- a/packages/business/src/views/task/List.vue +++ b/packages/business/src/views/task/List.vue @@ -18,7 +18,7 @@ import { DownBoldOutlined } from '@tap/component/src/DownBoldOutlined' import SelectList from '@tap/component/src/filter-bar/FilterItemSelect.vue' import FilterBar from '@tap/component/src/filter-bar/Main.vue' import i18n from '@tap/i18n' -import { calcUnit } from '@tap/shared' +import { calcTimeUnit, calcUnit } from '@tap/shared' import dayjs from 'dayjs' import { escapeRegExp, isNumber, uniqBy } from 'lodash-es' import { h } from 'vue' @@ -227,6 +227,9 @@ export default { }, methods: { + formatTimeUnit(val) { + return isNumber(val) ? calcTimeUnit(val) : '-' + }, getData({ page, tags, isSelectedNoTag }) { const { current, size } = page const { syncType } = this @@ -264,6 +267,9 @@ export default { restartFlag: true, attrs: true, metricInfo: true, + delayTime: true, + taskIncrementDelay: true, + taskIncrementDelayThreshold: true, } const where = { syncType, @@ -463,7 +469,7 @@ export default { if (this.showInstanceInfo) { items.splice(-1, 0, { - label: '数据源通道', + label: this.$t('daas_datasourcePipeline'), key: 'id', slotName: 'pipeline', type: 'select-inner', @@ -1255,6 +1261,7 @@ export default { prop="status" :label="$t('public_task_status')" :min-width="colWidth.status" + class-name="task-status-cell" > - + + + + + + + + + + + {{ formatTimeUnit(row.delayTime) }} + + + {{ formatTime(row.currentEventTimestamp) }} @@ -1286,13 +1311,33 @@ export default { {{ formatTime(row.lastStartDate) }} + + + {{ formatTime(row.createTime) }} + + + + + {{ formatTime(row.last_updated) }} + +