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

fix：修改remark 为非必填 修改高度；

Browse Source 
style：修改asset 机柜的空格
This commit is contained in:
zhangyu
2020-10-30 15:35:39 +08:00
parent 67267ef767
commit 754f5e17d8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nezha-fronted/src/components/common/alert/alertMessageTable.vue
View File

@@ -183,10 +183,10 @@
</div>
<!--删除弹窗-->
<div class="export-xlsx">
<el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px" @close="closeDialog" class="nz-message">
<el-dialog :visible.sync="deleteBox.show" :title="$t('alert.list.remark')" :modal-append-to-body='false' :show-close="true" width="450px" @close="closeDialog" class="nz-message">
<div class="upload-body">
<el-form ref="remarkForm" :model="deleteBox">
<el-form-item :rules="[{required: true, message: this.$t('validate.required'), trigger: 'blur'}]" prop="remark">
<el-form-item prop="remark">
<el-input type="textarea" :placeholder="$t('alert.description')" v-model="deleteBox.remark"></el-input>
</el-form-item>
</el-form>
@@ -984,4 +984,7 @@
padding: 2px 5px;
border-radius: 4px;
}
/deep/ .nz-message .el-textarea textarea{
height: 108px !important;
}
</style>

4
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -119,7 +119,7 @@
<span >{{scope.row.idc.name}}</span>
</div>
<template v-if="item.prop=='cabinet'">
<span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
<span v-if="scope.row.cabinet && scope.row.cabinet != '--'">{{returnData(scope.row.cabinet).name}}&nbsp;{{returnCabinet( scope.row.cabinetStart, scope.row.cabinetEnd)}}</span>
<span v-else >{{returnData(scope.row.cabinet)}}</span>
</template>
<div v-if="item.prop=='model'">
@@ -585,7 +585,7 @@
if(!start|| !end){
return ''
}
return `[${start} - ${end}]`
return `[${start}-${end}]`
},
closeAllPop() {
this.$refs.idcConfigBox.forEach((item) => {