diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue index b79730219..850906065 100644 --- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue +++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue @@ -23,8 +23,8 @@ - 列表 - 详细 + {{$t('asset.detail.list')}} + {{$t('asset.detail.detail')}} @@ -39,14 +39,14 @@
- - - - - - - - +
diff --git a/nezha-fronted/src/components/common/detailView/view/detailRightTop/detailRightTop.vue b/nezha-fronted/src/components/common/detailView/view/detailRightTop/detailRightTop.vue index b390f3a6f..70c7e8d67 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailRightTop/detailRightTop.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailRightTop/detailRightTop.vue @@ -2,25 +2,29 @@
- Data center : {{obj.dc?obj.dc.name:'-'}} + {{$t('dc.dc')}} : {{obj.dc?obj.dc.name:'-'}}
- Cabinet : {{obj.cabinet?obj.cabinet.name:'-'}} + {{$t('dc.cabinets')}} : + + {{obj.cabinet.name}} {{returnCabinet( obj.cabinetStart, obj.cabinetEnd)}} + - +
- Alert : {{obj.alertNum?obj.alertNum:'-'}} + {{$t('dc.alert')}} : {{obj.alertNum?obj.alertNum:'-'}}
- Endpoint : {{obj.endpointNum?obj.endpointNum:'-'}} + {{$t('asset.endpoint')}} : {{obj.endpointNum?obj.endpointNum:'-'}}
- Brand : {{obj.brand?obj.brand.name:'-'}} + {{$t('asset.brand')}} : {{obj.brand?obj.brand.name:'-'}}
- Brand : {{obj.model?obj.model.name:'-'}} + {{$t('asset.model')}} : {{obj.model?obj.model.name:'-'}}
- SN : {{obj.sn?obj.sn:'-'}} + {{$t('asset.sn')}} : {{obj.sn?obj.sn:'-'}}
@@ -39,6 +43,14 @@ export default { fromRoute: fromRoute } }, + methods: { + returnCabinet (start, end) { // 返回机柜u位信息 + if (!start || !end) { + return '' + } + return `[${start}-${end}]` + } + }, watch: { from: { immediate: true, diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index cac19518b..906a6e8e3 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -158,7 +158,7 @@ const cn = { normal: '正常', unusual: '不正常', AuthenticationFailed: '认证失败', - clearAllSelect: '清除选择的内容' + clearAllSelect: '清除选择的内容', }, setup: { step0: '欢迎', @@ -708,7 +708,11 @@ const cn = { name: '名称', dc: '数据中心', type: '主机地址', - pingInfo: 'Ping' + pingInfo: 'Ping', + detail: { + list: '列表', + detail: '详细' + } }, config: { config: '设置', diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index 77f4d30bd..299161670 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -28,8 +28,8 @@ - 列表 - 详细 + {{$t('asset.detail.list')}} + {{$t('asset.detail.detail')}}