diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 194a03a4..695a9627 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -1,7 +1,7 @@ /*列表上方操作按钮区域*/ .ant-card-body .table-operator { - margin-bottom: 8px; + //margin-bottom: 8px; } /** Button按钮间距 */ .table-operator .ant-btn { @@ -12,7 +12,7 @@ } .table-operator .ant-btn-group .ant-btn:last-child { - margin: 0 8px 8px 0; + margin: 0 8px 0px 0; } /*列表td的padding设置 可以控制列表大小*/ .ant-table-tbody .ant-table-row td { @@ -66,5 +66,11 @@ } .table-page-search-wrapper .ant-form-inline .ant-form-item{ - margin-bottom: 12px; + margin-bottom: 4px; } +.ant-card-body .table-operator{ + margin-bottom: 4px !important; +} +.ant-tabs-bar { + margin-bottom: 0px; +} \ No newline at end of file diff --git a/jero-web/src/components/jero/modal/JPopupOnlReport.vue b/jero-web/src/components/jero/modal/JPopupOnlReport.vue index ca66dae7..b7ea184d 100644 --- a/jero-web/src/components/jero/modal/JPopupOnlReport.vue +++ b/jero-web/src/components/jero/modal/JPopupOnlReport.vue @@ -43,9 +43,9 @@
diff --git a/jero-web/src/components/page/GlobalLayout.vue b/jero-web/src/components/page/GlobalLayout.vue index f83661b4..e8673f37 100644 --- a/jero-web/src/components/page/GlobalLayout.vue +++ b/jero-web/src/components/page/GlobalLayout.vue @@ -198,7 +198,7 @@ export default { } } .ant-card-body { - padding: 24px 24px 0 !important; + padding: 16px 16px 0 !important; } .layout { min-height: 100vh !important; @@ -688,7 +688,7 @@ export default { .ant-form-item { display: flex; - margin-bottom: 24px; + margin-bottom: 12px; margin-right: 0; .ant-form-item-control-wrapper { @@ -711,7 +711,7 @@ export default { .table-page-search-submitButtons { display: block; - margin-bottom: 24px; + margin-bottom: 12px; white-space: nowrap; } diff --git a/jero-web/src/views/demo/JeroDemoList.vue b/jero-web/src/views/demo/JeroDemoList.vue index 23c03b83..2643ca6e 100644 --- a/jero-web/src/views/demo/JeroDemoList.vue +++ b/jero-web/src/views/demo/JeroDemoList.vue @@ -79,9 +79,9 @@