diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 9929518f2..a07b68e5c 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -831,7 +831,7 @@ const en = { mib: { mib: 'MIB file', fileName: 'File name', - remark: 'Remark', + description: 'Description', updateUser: 'Update user', updateAt: 'Update time', editMib: 'Edit MIB', diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue index b2c16de3e..e741c08a1 100644 --- a/nezha-fronted/src/components/common/rightBox/mibBox.vue +++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue @@ -16,18 +16,15 @@ id="mib-input-selected-models" :options="modelOptions" :props="modelProps" - :show-all-levels="false" v-model="selectedModels" @change="selectedModelChange" ref="modelSelector" - collapse-tags - :placeholder="$t('config.mib.modelTip')" size="small" class="right-box__select" - popper-class="right-box-select-dropdown prevent-clickoutside" + popper-class="prevent-clickoutside limit-height" clearable> - + @@ -115,34 +112,23 @@ export default { this.$emit('close', refresh) }, queryModelInfos: function () { - this.$get('model?pageSize=-1').then(response => { + this.$get('asset/model?pageSize=-1').then(response => { if (response.code == 200) { const modelInfos = response.data.list const sortModels = {} modelInfos.forEach((item) => { - if (!sortModels[item.type.value]) { // 没有这个assetType - sortModels[item.type.value] = {} - } - if (!sortModels[item.type.value][item.vendor.value]) { - sortModels[item.type.value][item.vendor.value] = [] + if (!sortModels[item.brand.name]) { // 没有这个assetType + sortModels[item.brand.name] = [] } item.label = item.name item.value = item.id - sortModels[item.type.value][item.vendor.value].push(item) + sortModels[item.brand.name].push(item) }) - for (const assetType of Object.keys(sortModels)) { + for (const brand of Object.keys(sortModels)) { const option = { - label: assetType, - value: assetType, - children: [] - } - for (const vendor of Object.keys(sortModels[assetType])) { - const child = { - label: vendor, - value: vendor, - children: sortModels[assetType][vendor] - } - option.children.push(child) + label: brand, + value: brand, + children: sortModels[brand] } this.modelOptions.push(option) } @@ -245,6 +231,7 @@ export default { this.editMib = JSON.parse(JSON.stringify(n)) if (this.editMib.models) { this.selectedModels = this.editMib.models.split(',') + console.log(this.selectedModels) } else { this.selectedModels = [] } diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index 4195f0972..e2acf4ae3 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -96,7 +96,7 @@ import table from '@/components/common/mixin/table' import axios from 'axios' export default { - name: 'roleTable', + name: 'mibTable', mixins: [table], data () { return { @@ -121,7 +121,7 @@ export default { prop: 'modelsDetail', show: true }, { - label: this.$t('config.mib.remark'), + label: this.$t('config.mib.description'), prop: 'remark', show: true }, {