diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss new file mode 100644 index 000000000..58281a018 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss @@ -0,0 +1,26 @@ +.right-box-ipam { + .cidr { + display: flex; + } + .cidr-title { + float: none; + text-align: left; + color: $--color-text-regular; + padding: 0 0 6px 0; + font-size: 14px; + } + .cidr-title::before { + content: '*'; + color: #EC7F66; + margin-right: 4px; + } + .cidr-addr.el-form-item.is-required { + flex: 3; + margin-right: 5px; + } +} +.el-select-dropdown.right-box__select-width .el-select-dropdown__item { + text-overflow:ellipsis; + white-space:nowrap; + width: 199px; +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index c09beccae..99f9198d1 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -44,6 +44,7 @@ @import './common/rightBox/locationCascader.scss'; @import './common/rightBox/menuBox.scss'; @import './common/rightBox/moduleBox.scss'; +@import './common/rightBox/ipam.scss'; @import './common/rightBox/chartRightBox/chartRightBox.scss'; @import './common/rightBox/mibBox.scss'; @import './common/rightBox/assetBactchEditBox.scss'; diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js index a2e2b49f1..10ce505f2 100644 --- a/nezha-fronted/src/components/common/mixin/dataList.js +++ b/nezha-fronted/src/components/common/mixin/dataList.js @@ -948,15 +948,17 @@ export default { target: this.searchLabel, isSearchInput: true, propertyName: 'dc', - type: 'string', + type: 'number', defaultJson: { + name: 'Date center', + type: 'dc', + label: 'dcIds', disabled: false, - label: 'dcId', - name: 'Data center', - type: 'input', - val: '' + val: '', + valnum: '', + listStr: 'dcSelect' }, - jsonKey: 'val' + jsonKey: 'valnum' } } } diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue index 037e06bef..2e399c18b 100644 --- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue @@ -1,5 +1,5 @@