Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -120,7 +120,7 @@
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
border
|
||||
height="475px"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
>
|
||||
@@ -276,9 +276,9 @@
|
||||
>
|
||||
<el-input
|
||||
type="textarea"
|
||||
autosize
|
||||
:autosize="{ minRows: 1, maxRows: 15}"
|
||||
style="width: 95%"
|
||||
maxlength="200"
|
||||
maxlength="4000"
|
||||
show-word-limit
|
||||
v-model="attributeEO.dataExplain"
|
||||
placeholder="请输入资料说明"
|
||||
@@ -370,6 +370,9 @@ export default {
|
||||
],
|
||||
dataTitle: [
|
||||
{required: true, message: '资料标题不能为空', trigger: 'change'},
|
||||
],
|
||||
attachFileId: [
|
||||
{required: true, message: '附件不能为空', trigger: 'change'},
|
||||
]
|
||||
},
|
||||
dataCenterSearch: {
|
||||
@@ -905,6 +908,7 @@ export default {
|
||||
}
|
||||
}
|
||||
.table-area{
|
||||
height: calc(100% - 180px);
|
||||
padding: 0 10px 10px 10px;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user