Commit 2096b4ec authored by danfuman's avatar danfuman

修改

parent 046a8970
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
transition: margin-left .28s; transition: margin-left .28s;
margin-left: $base-sidebar-width; margin-left: $base-sidebar-width;
position: relative; position: relative;
background: #F5F5F5;
} }
.sidebarHide { .sidebarHide {
...@@ -37,12 +38,12 @@ ...@@ -37,12 +38,12 @@
animation-fill-mode: forwards; animation-fill-mode: forwards;
z-index: 1002; z-index: 1002;
} }
@keyframes left-right{ @keyframes left-right{
0%{right: 0;} 0%{right: 0;}
100%{right: -21px;} 100%{right: -21px;}
} }
// reset element-ui css // reset element-ui css
.horizontal-collapse-transition { .horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
...@@ -58,10 +59,10 @@ ...@@ -58,10 +59,10 @@
.el-scrollbar { .el-scrollbar {
height: 100%; height: 100%;
} }
&.has-logo { &.has-logo {
.el-scrollbar { .el-scrollbar {
...@@ -138,8 +139,8 @@ ...@@ -138,8 +139,8 @@
background: #fff!important; background: #fff!important;
} }
} }
// menu hover // menu hover
.submenu-title-noDropdown, .el-submenu__title { .submenu-title-noDropdown, .el-submenu__title {
color: #fff!important; color: #fff!important;
...@@ -150,9 +151,9 @@ ...@@ -150,9 +151,9 @@
border: 1px solid #2b3f69; border: 1px solid #2b3f69;
} }
} }
} }
.sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover { .sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover {
background-color: #1e2c4c!important; background-color: #1e2c4c!important;
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
border-radius: 10px; border-radius: 10px;
border: 1px solid #2b3f69; border: 1px solid #2b3f69;
} }
.sidebar-container .el-submenu .el-menu-item:before, .sidebar-container .nest-menu .el-submenu>.el-submenu__title:before { .sidebar-container .el-submenu .el-menu-item:before, .sidebar-container .nest-menu .el-submenu>.el-submenu__title:before {
position: absolute; position: absolute;
width: 2px; width: 2px;
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
vertical-align: -0.15em; vertical-align: -0.15em;
fill: currentColor; fill: currentColor;
overflow: hidden; overflow: hidden;
} }
} }
} }
...@@ -405,4 +406,4 @@ ...@@ -405,4 +406,4 @@
padding-top: 6px; padding-top: 6px;
padding-bottom: 10px; padding-bottom: 10px;
} }
} }
\ No newline at end of file
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
min-height: calc(100vh - 56px); min-height: calc(100vh - 56px);
min-width:1440px; min-width:1440px;
background: #F5F5F5; background: #F5F5F5;
overflow: initial;
} }
.fixed-header + .app-main { .fixed-header + .app-main {
......
...@@ -823,6 +823,7 @@ export default { ...@@ -823,6 +823,7 @@ export default {
.table-item{ .table-item{
margin-top: 22px; margin-top: 22px;
::v-deep .el-table{ ::v-deep .el-table{
overflow:visible;
th{ th{
font-size: 12px !important; font-size: 12px !important;
font-weight: 400 !important; font-weight: 400 !important;
...@@ -836,6 +837,16 @@ export default { ...@@ -836,6 +837,16 @@ export default {
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
.el-table__body-wrapper{
overflow:visible;
}
.el-table__body{
tr:first-child{
position: sticky;
top:56px;
z-index: 9;
}
}
} }
} }
} }
......
...@@ -136,17 +136,17 @@ export default { ...@@ -136,17 +136,17 @@ export default {
}, },
mounted() { mounted() {
// window.addEventListener("scroll",this.scrolling) window.addEventListener("scroll",this.scrolling)
}, },
beforeDestroy() { beforeDestroy() {
// window.removeEventListener("scroll", this.scrolling); window.removeEventListener("scroll", this.scrolling);
}, },
methods: { methods: {
scrolling() { scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0] let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop; let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>135){ if (scrollTop>197){
let top = scrollTop-138 let top = scrollTop-197
el.style.top = top+'px' el.style.top = top+'px'
}else{ }else{
el.style.top = 0 el.style.top = 0
......
...@@ -295,5 +295,17 @@ export default { ...@@ -295,5 +295,17 @@ export default {
} }
.table-item{ .table-item{
padding: 16px 10px 16px 16px; padding: 16px 10px 16px 16px;
::v-deep .el-table{
.el-table__body-wrapper{
overflow:visible;
}
.el-table__body{
tr:first-child{
position: fixed;
top: 49px;
z-index: 9;
}
}
}
} }
</style> </style>
...@@ -158,14 +158,14 @@ ...@@ -158,14 +158,14 @@
}, },
methods: { methods: {
scrolling() { scrolling() {
// let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0] let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
// let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop; let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
// if (scrollTop>135){ if (scrollTop>138){
// let top = scrollTop-136 let top = scrollTop-138
// el.style.top = top+'px' el.style.top = top+'px'
// }else{ }else{
// el.style.top = 0 el.style.top = 0
// } }
}, },
getYears(){ getYears(){
getYears({}).then(res => { getYears({}).then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment