diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 68667aac3..88f8923be 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -828,6 +828,8 @@ const cn = { model: '资产型号', name: '资产型号', brand: '品牌', + titleName: '名称', + titleType: '类型', ChartTemplate: '图表模板', assetNum: '资产', editModel: '编辑型号', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index ded1161f6..9786c24d7 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -759,6 +759,8 @@ const en = { model: 'Asset model', brand: 'Brand', name: 'Name', + titleName: 'Name', + titleType: 'Type', ChartTemplate: 'Chart template', assetNum: 'Asset', editModel: 'Edit model', diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue index d697f4900..d43e523f9 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue @@ -28,7 +28,7 @@ varType: 1, panelId: 0 }" :multiple="true" - language="en" + :language="language" title="ChartSearch" key-field="id" v-model="editModel.chartIds" @@ -78,15 +78,16 @@ export default { }, data () { return { + language: localStorage.getItem('nz-language'), editModel: {}, brandList: [], // brand 列表数据 editModule: {}, chartlList: [], // chart 列表数据 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 { title: 'ID', data: 'id' }, - { title: 'Name', data: 'name' }, - { title: 'Type', data: 'type' }, - { title: 'Description', data: 'remark' } + { title: this.$t("config.model.titleName"), data: 'name' }, + { title: this.$t("config.model.titleType"), data: 'type' }, + { title: this.$t("config.model.remark"), data: 'remark' } ], url: 'asset/model', brandUrl: 'asset/brand', diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index e13d06978..4871b000a 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -379,12 +379,10 @@ export default { handler (n) { if (n) { this.vmLock = n.vm === 1 // vm == 1 时,锁定model和location - if (!this.editAsset.authProtocolPort) { - if (n.authProtocol === this.assetConstants.authProtocolData.ssh) { - this.editAsset.authProtocolPort = 22 - } else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) { - this.editAsset.authProtocolPort = 23 - } + if (n.authProtocol === this.assetConstants.authProtocolData.ssh) { + this.editAsset.authProtocolPort = 22 + } else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) { + this.editAsset.authProtocolPort = 23 } } }