diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index a078e9f7c..e7d1f3960 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -582,7 +582,10 @@ const cn = { }, asset: { asset: '资产', + talon: '爪子', alertNum: '告警', + userName: '用户名', + address: '地址', assetType: '资产类型', // '资产类型' batchEditAsset: '批量修改资产', selectAsset: '已选择的资产', @@ -609,7 +612,6 @@ const cn = { reloginpinTip: 'RELOGIN提示', userPinIntroduce: '请指定用户名和密码提示以便TELNET登录过程可自动运行', reLoginPinIntroduce: '请指定密码提示以便RELOGIN登录过程可自动运行', - username: '用户名', port: '端口', upload: '上传', clickToUpload: '上传', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 5ca80b4f8..3f0b3619e 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -589,6 +589,9 @@ const en = { }, asset: { asset: 'Asset ', + talon: 'Talon', + userName: 'User name', + address: 'Address', assets: 'Asset', // '资产' editAsset: 'Edit asset', // '编辑资产' createAsset: 'New asset', // '编辑资产' @@ -613,7 +616,6 @@ const en = { reloginPinTip: 'Relogin tip', // 密码提示 userPinIntroduce: 'Please specify a user name and password so that the telenet login process can automatically log in', reLoginPinIntroduce: 'Please specify the password prompt so that the login process can run automatically', - username: 'Username', // '用户名' port: 'Port', // '端口' upload: 'Upload', // '上传' clickToUpload: 'Upload', // '上传' diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index d54c5eb88..9cfeeb1b0 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -178,7 +178,7 @@ - + @@ -197,7 +197,7 @@ TELNET - + @@ -222,6 +222,40 @@ + + + TALON + + + + + + + + + + + + + + + + + + + + + + + + {{$t('overall.moreOption')}} + + + + @@ -259,6 +293,8 @@ export default { const vm = this return { assetConstants, + showAllTalonOption: false, + showAddressOption: true, editAsset: {}, url: 'asset/asset', rightBox: { model: { show: false } }, @@ -452,6 +488,10 @@ export default { clickOutside () { this.esc(false) }, + showAddress () { + this.showAddressOption = false + this.showAllTalonOption = true + }, setLocationData ({ cabinet, dc, u }) { if (cabinet) { this.editAsset.cabinetId = cabinet.id @@ -678,4 +718,20 @@ export default { .placeholder-emphasize input::-webkit-input-placeholder { color: #606266 !important; } + .el-form__sub-title { + background-color: #F6F6F6; + font-size: 14px; + font-weight: bold; + padding: 0 10px; + line-height: 32px; + color: #555; + margin: 0 0 20px; + } + .nz-btn-size-normal-new.nz-btn-style-light-new { + font-size: 12px; + color: #3C92F1; + i { + font-size: 12px; + } + } diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 767cc9e5f..09239103e 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -51,10 +51,12 @@ {{scope.row.cabinet.name}} {{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}} - - - - {{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}} - + + + + {{scope.row.pingInfo.rtt?scope.row.pingInfo.rtt+'ms':''}} + + {{scope.row.model ? scope.row.model.name : '-'}} @@ -80,6 +82,18 @@ - + + + 正常 + + + 不正常 + + + 认证失败 + + - + {{scope.row.brand ? scope.row.brand.name : '-'}} {{scope.row.purchaseDate ? scope.row.purchaseDate : '--'}} @@ -121,7 +135,7 @@ diff --git a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue index 18b005234..871c4a117 100644 --- a/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue +++ b/nezha-fronted/src/components/common/table/settings/terminalLogTable.vue @@ -138,7 +138,7 @@ export default { { label: this.$t('config.terminallog.source'), prop: 'remoteAddr', - minWidth: 200, + minWidth: 100, show: true }, { @@ -154,7 +154,7 @@ export default { { label: this.$t('config.terminallog.startTime'), prop: 'startTime', - minWidth: 200, + minWidth: 100, show: true }, { @@ -171,7 +171,7 @@ export default { label: this.$t('config.terminallog.status'), // killusername鼠标悬停形式 prop: 'status', show: true, - width: 100 + width: 150 } ] }