Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

# Conflicts: # nezha-fronted/src/assets/css/common.scss
2022-06-23 16:51:51 +08:00
parent acbd5016a9 8d8654a13a
commit 6403b570f5
15 changed files with 53 additions and 27 deletions
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -243,7 +243,7 @@ export default {
          width: 120,
          sortable: 'custom'
        }, {
-          label: this.$t('alert.config.receiver'),
+          label: this.$t('alert.receiver'),
          prop: 'receivers',
          show: false,
          minWidth: 100