Merge remote-tracking branch 'origin/develop' into develop

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