From 581f20e08b1ac09f9b62ab337089793cf7bffbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com> Date: Thu, 8 Dec 2022 13:26:36 +0800 Subject: [PATCH 1/2] 1 --- .../scss/modules/management/list-main.css | 19 ++++++++++--------- .../scss/modules/management/list-main.min.css | 2 +- .../scss/modules/management/list-main.scss | 16 ++++++++-------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css index 8af7c8232..9e5ef5f8b 100644 --- a/src/assets/scss/modules/management/list-main.css +++ b/src/assets/scss/modules/management/list-main.css @@ -18,6 +18,7 @@ } .div_main .div_search .div_search_btn { + margin-right: 10px; margin-top: 5px; float: right; } @@ -83,6 +84,15 @@ position: relative; } +.div_main .setFormBoxHeight { + max-height: 99px; + overflow: hidden; +} + +.div_main .setFormBoxHeightAuto { + height: auto; +} + .div_main .item_width_2 { width: 138px; } @@ -155,12 +165,3 @@ -webkit-line-clamp: 2; overflow: hidden; } - -.setFormBoxHeight { - max-height: 99px; - overflow: hidden; -} - -.setFormBoxHeightAuto { - height: auto; -} diff --git a/src/assets/scss/modules/management/list-main.min.css b/src/assets/scss/modules/management/list-main.min.css index a5eb4c5e0..379c79249 100644 --- a/src/assets/scss/modules/management/list-main.min.css +++ b/src/assets/scss/modules/management/list-main.min.css @@ -1 +1 @@ -.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}.setFormBoxHeight{max-height:99px;overflow:hidden}.setFormBoxHeightAuto{height:auto} +.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:99px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden} diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index c73b0d0d7..e14eea038 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -96,6 +96,14 @@ } } +// 搜索栏高度控制显示隐藏 +.setFormBoxHeight{ + max-height: 99px; + overflow: hidden; +} +.setFormBoxHeightAuto{ + height: auto; +} //---------旧版 @@ -172,12 +180,4 @@ -webkit-line-clamp: 2; overflow: hidden; } -// 搜索栏高度控制显示隐藏 -.setFormBoxHeight{ - max-height: 99px; - overflow: hidden; -} -.setFormBoxHeightAuto{ - height: auto; -} From 7a2a473acc77773e882b799f5ba8971b4f2f1788 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 8 Dec 2022 14:43:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/common-dai.scss | 4 ++-- src/views/main-sidebar.vue | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/common-dai.scss b/src/assets/scss/common-dai.scss index 00da13333..a5b87bba9 100644 --- a/src/assets/scss/common-dai.scss +++ b/src/assets/scss/common-dai.scss @@ -492,10 +492,10 @@ img { position: relative; z-index: 1; width: $sidebar--width; - min-height: 100%; + height: 100%; padding-bottom: 15px; overflow-x: hidden; - // overflow-y: scroll; + overflow-y: auto; transition: width 0.3s; } diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index d4a1862b3..db5dcd5e4 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -142,8 +142,14 @@ export default { padding: 25px 0; flex-shrink: 0; width: 64px; - min-height: calc(100% - 64px); + height: 100%; background: #0056d6; + overflow-y: auto; + + &::-webkit-scrollbar { + width: 1px; + } + .nav { color: rgba(#ffffff, 0.85); .nav-item {