elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-新新版' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-新新版

dev2
jiangyy 3 years ago
parent
8c716cab25 4e387e13d0
commit
5b579bae05
5 changed files with 21 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/assets/scss/common-dai.scss
  2. 19
      src/assets/scss/modules/management/list-main.css
  3. 2
      src/assets/scss/modules/management/list-main.min.css
  4. 4
      src/assets/scss/modules/management/list-main.scss
  5. 8
      src/views/main-sidebar.vue

4
src/assets/scss/common-dai.scss
View File

@ -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;
}

19
src/assets/scss/modules/management/list-main.css
View File

@ -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;
}

2
src/assets/scss/modules/management/list-main.min.css
View File

@ -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}

4
src/assets/scss/modules/management/list-main.scss
View File

@ -96,7 +96,7 @@
}
}
// 搜索栏高度控制显示隐藏
// 搜索栏高度控制显示隐藏
.setFormBoxHeight{
max-height: 99px;
overflow: hidden;
@ -105,7 +105,6 @@
height: auto;
}
//---------旧版
.item_width_2{
@ -182,4 +181,3 @@
overflow: hidden;
}

8
src/views/main-sidebar.vue
View File

@ -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 {

Write Preview
Loading…
Cancel
Save