diff --git a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue index 2c79d53c12..e7ae124608 100644 --- a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue +++ b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue @@ -37,7 +37,7 @@ @import "~@/styles/variables.scss"; .tab-header { background-color: $search-bg; - padding: 8px 20px; + padding: 5px 20px; .tab-search{ padding: 9px 0px; } diff --git a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue index b8c891f811..966c6c40c9 100644 --- a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue +++ b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue @@ -29,7 +29,7 @@ export default { position: relative; background-color: #FFFFFF; /* margin-left:10px; */ - padding: 0 20px; + /*padding: 0 20px;*/ overflow-x: hidden; overflow-y: hidden; } diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss index bca5f38c72..e0f46a85a2 100644 --- a/anrui-base/anrui-base-ui/src/styles/index.scss +++ b/anrui-base/anrui-base-ui/src/styles/index.scss @@ -108,7 +108,7 @@ div:focus { background-color: #fff; } // 设置了滚动区域 -.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);} +.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);padding: 0 20px} .listcon{height: calc(100vh - 425px);overflow-y: hidden;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} .listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;} @@ -123,15 +123,29 @@ div:focus { align-items: center; margin-bottom: 0px !important; font-size: 20px; } -.tab-header{ - background-color: #edf1f7; - padding: 9px 20px; +.tab-header { + font-size: 20px; + font-weight: bold; } + .filter-item { - padding-right:10px; + padding-right: 10px; width: 220px; display: inline-block; } + +.search { + .tab-header { + .el-form-item { + margin-right: 30px; + .el-form-item__label { + font-size: 16px; + font-weight: 500; + } + } + } +} + .listtop { display: flex; flex-direction: row; @@ -169,7 +183,7 @@ div:focus { margin-right: 4px; } .formadd { - padding: 88px 20px 0 20px; + padding: 88px 40px 0 40px; font-size: 16px; // height: calc(100vh - 200px);overflow-y: auto; .title { diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue index 59d82af19f..f9739cd46f 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue @@ -7,7 +7,7 @@