From a4de385a219846d9c4c3261cc0177bb71eed0fec Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Sat, 20 Feb 2021 09:32:49 +0800
Subject: [PATCH] the alert instance page displays the name of the alert
 plug-in. (#4815)

---
 .../home/pages/security/pages/warningInstance/_source/list.vue | 1 +
 .../conf/home/pages/security/pages/warningInstance/index.vue   | 3 ++-
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js         | 1 +
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js         | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/list.vue
index 5a8cf2ad1b..d3c508bcff 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/list.vue
@@ -20,6 +20,7 @@
       <el-table :data="list" size="mini" style="width: 100%">
         <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="instanceName" :label="$t('Alarm instance name')"></el-table-column>
+        <el-table-column prop="alertPluginName" :label="$t('Alarm plugin name')"></el-table-column>
         <el-table-column :label="$t('Create Time')">
           <template slot-scope="scope">
             <span>{{scope.row.createTime | formatDate}}</span>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
index c4619f986f..deb0c00f11 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
@@ -116,7 +116,7 @@
         this.getPlugins({ pluginType: 'ALERT' }).then(res => {
           this.pluginInstance = res
         }).catch(e => {
-          this.$message.error(e.msg)
+          this.$message.error(e.msg || '')
         })
         this.item = item
         this.createWarningDialog = true
@@ -148,6 +148,7 @@
             this.isLoading = false
           }
         }).catch(e => {
+          this.$message.error(e.msg || '')
           this.isLoading = false
         })
       }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 17d96ccf44..cf90cad00b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -220,6 +220,7 @@ export default {
   'Edit Alarm Instance': 'Edit Alarm Instance',
   'Group Name': 'Group Name',
   'Alarm instance name': 'Alarm instance name',
+  'Alarm plugin name': 'Alarm plugin name',
   'Select plugin': 'Select plugin',
   'Please enter group name': 'Please enter group name',
   'Instance parameter exception': 'Instance parameter exception',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 746517fb21..c7e87de125 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -220,6 +220,7 @@ export default {
   'Edit Alarm Instance': '编辑告警实例',
   'Group Name': '组名称',
   'Alarm instance name': '告警实例名称',
+  'Alarm plugin name': '告警插件名称',
   'Select plugin': '选择插件',
   'Please enter group name': '请输入组名称',
   'Instance parameter exception': '实例参数异常',