diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 98bb323..c78c5c1 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -711,6 +711,7 @@ const local: App.I18n.Schema = { }, notifyRecipient: { title: 'Notify Recipient List', + detail: 'Notify Recipient Detail', recipientName: 'Recipient Name', notifyType: 'Notification Type', notifyAttribute: 'Attribute Information', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 72bfb87..141e8aa 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -707,6 +707,7 @@ const local: App.I18n.Schema = { }, notifyRecipient: { title: '通知人列表', + detail: '通知人详情', recipientName: '接收人名称', notifyType: '通知类型', notifyAttribute: '属性信息', diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index de7d32b..d89eef3 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -855,6 +855,7 @@ declare namespace App { }; notifyRecipient: { title: string; + detail: string; recipientName: string; notifyType: string; notifyAttribute: string; diff --git a/src/views/notify/recipient/index.vue b/src/views/notify/recipient/index.vue index 27a16b6..6e48d70 100644 --- a/src/views/notify/recipient/index.vue +++ b/src/views/notify/recipient/index.vue @@ -1,5 +1,6 @@ + + + + diff --git a/src/views/notify/scene/index.vue b/src/views/notify/scene/index.vue index 33bf9db..05bc1b0 100644 --- a/src/views/notify/scene/index.vue +++ b/src/views/notify/scene/index.vue @@ -8,6 +8,7 @@ import NotifyConfigOperateDrawer from '@/views/notify/scene/modules/notify-confi import NotifyConfigSearch from '@/views/notify/scene/modules/notify-config-search.vue'; import StatusSwitch from '@/components/common/status-switch.vue'; import { jobNotifyScene, retryNotifyScene } from '@/constants/business'; +import { tagColor } from '@/utils/common'; const appStore = useAppStore(); @@ -74,24 +75,14 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP return null; } - const tagMap: Record = { - 1: 'warning', - 2: 'info', - 3: 'warning', - 4: 'success' - }; - - const index = row.notifyScene! % 4; - if (row.systemTaskType === 1) { const label = $t(retryNotifyScene[row.notifyScene! as Api.NotifyConfig.RetryNotifyScene]); - const type = tagMap[index as Api.NotifyConfig.RetryNotifyScene]; - return {label}; + return {label}; } if (row.systemTaskType === 3) { const label = $t(jobNotifyScene[row.notifyScene! as Api.NotifyConfig.JobNotifyScene]); - return {label}; + return {label}; } return null;