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

# Conflicts: # nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
2021-05-20 14:10:08 +08:00
parent f805795f1d 9488eef644
commit 2c81a8cfa8
23 changed files with 256 additions and 526 deletions
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -128,13 +128,13 @@ export default {
            label: 'ids',
            disabled: false
          }, {
-            name: 'Name',
+            name: this.$t('overall.name'),
            type: 'input',
            label: 'name',
            disabled: false
          },
          {
-            name: 'Project name',
+            name: this.$t('overall.projectName'),
            type: 'project',
            label: 'projectIds',
            disabled: false