gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
@changcode
2021-07-28 14:19:08 +08:00
parent 79b1b94171
commit 6d8da439df
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -582,7 +582,6 @@ const cn = {
}, },
asset: { asset: {
asset: '资产', asset: '资产',
talon: '爪子',
alertNum: '告警', alertNum: '告警',
userName: '用户名', userName: '用户名',
address: '地址', address: '地址',

1
nezha-fronted/src/components/common/language/en.js
View File

@@ -589,7 +589,6 @@ const en = {
}, },
asset: { asset: {
asset: 'Asset ', asset: 'Asset ',
talon: 'Talon',
userName: 'User name', userName: 'User name',
address: 'Address', address: 'Address',
assets: 'Asset', // '资产' assets: 'Asset', // '资产'

2
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -240,7 +240,7 @@ export default {
show: true, show: true,
minWidth: 110 minWidth: 110
}, { }, {
label: this.$t('asset.talon'), label: 'Talon',
prop: 'clientState', prop: 'clientState',
show: true, show: true,
sortable: 'custom', sortable: 'custom',