NEZ-613 fix:

1.asset 编辑页面bug ssh port 默认端口:22
2.asset model 搜索分页国际化添加
This commit is contained in:
@changcode
2021-05-17 13:31:25 +08:00
parent db03694824
commit 1467f15a7c
4 changed files with 13 additions and 10 deletions

View File

@@ -828,6 +828,8 @@ const cn = {
model: '资产型号', model: '资产型号',
name: '资产型号', name: '资产型号',
brand: '品牌', brand: '品牌',
titleName: '名称',
titleType: '类型',
ChartTemplate: '图表模板', ChartTemplate: '图表模板',
assetNum: '资产', assetNum: '资产',
editModel: '编辑型号', editModel: '编辑型号',

View File

@@ -759,6 +759,8 @@ const en = {
model: 'Asset model', model: 'Asset model',
brand: 'Brand', brand: 'Brand',
name: 'Name', name: 'Name',
titleName: 'Name',
titleType: 'Type',
ChartTemplate: 'Chart template', ChartTemplate: 'Chart template',
assetNum: 'Asset', assetNum: 'Asset',
editModel: 'Edit model', editModel: 'Edit model',

View File

@@ -28,7 +28,7 @@
varType: 1, panelId: 0 varType: 1, panelId: 0
}" }"
:multiple="true" :multiple="true"
language="en" :language="language"
title="ChartSearch" title="ChartSearch"
key-field="id" key-field="id"
v-model="editModel.chartIds" v-model="editModel.chartIds"
@@ -78,15 +78,16 @@ export default {
}, },
data () { data () {
return { return {
language: localStorage.getItem('nz-language'),
editModel: {}, editModel: {},
brandList: [], // brand 列表数据 brandList: [], // brand 列表数据
editModule: {}, editModule: {},
chartlList: [], // chart 列表数据 chartlList: [], // chart 列表数据
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头 ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' }, { title: 'ID', data: 'id' },
{ title: 'Name', data: 'name' }, { title: this.$t("config.model.titleName"), data: 'name' },
{ title: 'Type', data: 'type' }, { title: this.$t("config.model.titleType"), data: 'type' },
{ title: 'Description', data: 'remark' } { title: this.$t("config.model.remark"), data: 'remark' }
], ],
url: 'asset/model', url: 'asset/model',
brandUrl: 'asset/brand', brandUrl: 'asset/brand',

View File

@@ -379,7 +379,6 @@ export default {
handler (n) { handler (n) {
if (n) { if (n) {
this.vmLock = n.vm === 1 // vm == 1 时锁定model和location this.vmLock = n.vm === 1 // vm == 1 时锁定model和location
if (!this.editAsset.authProtocolPort) {
if (n.authProtocol === this.assetConstants.authProtocolData.ssh) { if (n.authProtocol === this.assetConstants.authProtocolData.ssh) {
this.editAsset.authProtocolPort = 22 this.editAsset.authProtocolPort = 22
} else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) { } else if (n.authProtocol === this.assetConstants.authProtocolData.telnet) {
@@ -387,7 +386,6 @@ export default {
} }
} }
} }
}
}, },
'editAsset.pid': { 'editAsset.pid': {
deep: true, deep: true,