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

2022-03-25 09:22:18 +08:00
parent 3201c50026 b0c2dd6a83
commit 235411cbe8
15 changed files with 115 additions and 65 deletions
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -275,12 +275,12 @@ export default {
          minWidth: 110,
          sortable: 'custom'
        }, {
-          label: 'SN',
+          label: this.$t('asset.sn'),
          prop: 'sn',
          show: true,
          minWidth: 110
        }, {
-          label: 'Talon',
+          label: this.$t('asset.talon'),
          // prop: 'clientState',
          prop: 'talon',
          show: true,