fix: 解决冲突

2021-07-28 14:19:08 +08:00
parent 79b1b94171
commit 6d8da439df
3 changed files with 1 additions and 3 deletions
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -582,7 +582,6 @@ const cn = {
  },
  asset: {
    asset: '资产',
-    talon: '爪子',
    alertNum: '告警',
    userName: '用户名',
    address: '地址',
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -589,7 +589,6 @@ const en = {
  },
  asset: {
    asset: 'Asset ',
-    talon: 'Talon',
    userName: 'User name',
    address: 'Address',
    assets: 'Asset', // '资产'
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -240,7 +240,7 @@ export default {
          show: true,
          minWidth: 110
        }, {
-          label: this.$t('asset.talon'),
+          label: 'Talon',
          prop: 'clientState',
          show: true,
          sortable: 'custom',