gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: IPAM 页面列表展示顺序调整

Browse Source
This commit is contained in:
@changcode
2022-03-04 10:16:06 +08:00
parent 9b5fe8f5b8
commit c2e17dd325
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/components/common/rightBox/ipamBox.vue
View File

@@ -52,9 +52,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item :label="$t('overall.vlan')" prop="vlan">
<el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input>
</el-form-item>
<el-form-item :label="$t('overall.dc')" prop="dc.name"> <el-form-item :label="$t('overall.dc')" prop="dc.name">
<div class="right-box-form-content"> <div class="right-box-form-content">
<el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id"> <el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">
@@ -64,6 +61,9 @@
</el-select> </el-select>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('overall.vlan')" prop="vlan">
<el-input maxlength="256" rows="4" show-word-limit placeholder="" v-model="editipam.vlan" size="small"></el-input>
</el-form-item>
<el-form-item :label="$t('overall.remark')" prop="remark"> <el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editipam.remark" size="small" id="mib-box-input-remark"></el-input> <el-input maxlength="256" rows="4" show-word-limit type="textarea" placeholder="" v-model="editipam.remark" size="small" id="mib-box-input-remark"></el-input>
</el-form-item> </el-form-item>

10
nezha-fronted/src/components/common/table/settings/ipamTable.vue
View File

@@ -111,17 +111,17 @@ export default {
show: true, show: true,
minWidth: 200, minWidth: 200,
sortable: 'custom' sortable: 'custom'
}, {
label: this.$t('overall.vlan'),
prop: 'vlan',
show: true,
width: 200
}, { }, {
label: this.$t('overall.dc'), label: this.$t('overall.dc'),
prop: 'dc', prop: 'dc',
show: true, show: true,
width: 200, width: 200,
sortable: 'custom' sortable: 'custom'
}, {
label: this.$t('overall.vlan'),
prop: 'vlan',
show: true,
width: 200
}, { }, {
label: this.$t('overall.remark'), label: this.$t('overall.remark'),
prop: 'remark', prop: 'remark',

10
nezha-fronted/src/components/page/config/ipam.vue
View File

@@ -119,16 +119,16 @@ export default {
type: 'input', type: 'input',
label: 'addr', label: 'addr',
disabled: false disabled: false
}, {
name: this.$t('overall.vlan'),
type: 'input',
label: 'vlan',
disabled: false
}, { }, {
name: this.$t('overall.dc'), name: this.$t('overall.dc'),
type: 'dc', type: 'dc',
label: 'dcIds', label: 'dcIds',
disabled: false disabled: false
}, {
name: this.$t('overall.vlan'),
type: 'input',
label: 'vlan',
disabled: false
} }
] ]
} }