diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue index 894fc4368..79b3806b7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue @@ -122,8 +122,9 @@ export default { disabled: false }, { name: this.$t('overall.state'), - type: 'input', - label: 'state', + type: 'select', + label: 'ipamState', + readonly: true, disabled: false }] } diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index ea3d861c9..e13550b2d 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -898,6 +898,21 @@ export default { }, jsonKey: 'val' }, + state: { + target: this.searchLabel, + isSearchInput: true, + propertyName: 'state', + type: 'string', + defaultJson: { + disabled: false, + label: 'ipamState', + name: 'State', + readonly: true, + type: 'select', + val: '' + }, + jsonKey: 'val' + }, name: { target: this.searchLabel, isSearchInput: true, diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 02d4088c9..f315b868c 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -900,6 +900,8 @@ export default { objectInfo.types = val.valnum } else if (val.label === 'promState') { objectInfo.statuses = val.valnum + } else if (val.label === 'ipamState') { + objectInfo.state = val.valnum } else if (typeof (val.valnum) === 'undefined' || val.valnum == '') { this.selectInfoList[val.label].forEach(item => { if (item.label === val.val) { diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue index fc52380e7..5c58a5fae 100644 --- a/nezha-fronted/src/components/common/searchSelectInfo.vue +++ b/nezha-fronted/src/components/common/searchSelectInfo.vue @@ -72,6 +72,19 @@ const searchSelectInfo = { // value: 传给后台的值;label:显示给用 label: i18n.t('asset.down') } ], + ipamState: [ + { + value: 1, + label: i18n.t('overall.ipam.available') + }, { + value: 2, + label: i18n.t('overall.ipam.transient') + }, { + value: 3, + label: i18n.t('overall.ipam.used') + } + + ], pingStatus: [ { value: '0',