diff --git a/src/style/media.scss b/src/style/media.scss index b3d639fe..c2772be6 100644 --- a/src/style/media.scss +++ b/src/style/media.scss @@ -8,13 +8,17 @@ .el-form-item__content {margin-left: 0px!important;} .adminui-main { - >.el-container {display: block;height:auto;} - >.el-container > .el-aside {width: 100%!important;border: 0} + // >.el-container {display: block;height:auto;} + // >.el-container > .el-aside {width: 100%!important;border: 0} + >.el-container {display: flex;} + >.el-container > .el-aside {width: 150px!important;border: 0} } .scTable { .el-table, - .el-table__body-wrapper {display: block!important;height:auto!important;} - .el-scrollbar__wrap {height:auto!important;} + // .el-table__body-wrapper {display: block!important;height:auto!important;} + .el-table__body-wrapper {display: block!important;height:100%!important;} + // .el-scrollbar__wrap {height:auto!important;} + .el-scrollbar__wrap {height:100%!important;} .scTable-page {padding: 0 5px!important;} .el-pagination__total, .el-pagination__jump, @@ -22,10 +26,12 @@ } .headerPublic { - height: auto!important;display: block; + // height: auto!important;display: block; + height: auto!important; .left-panel {overflow: auto;} .left-panel::-webkit-scrollbar{display: none;} - .right-panel {display: block;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;} + // .right-panel {display: block;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;} + .right-panel {border-top: 1px solid var(--el-border-color-light);display: flex;} .right-panel .right-panel-search {display: block;} .right-panel .right-panel-search >* {width: 100%;margin: 0;margin-top: 15px;} } @@ -34,13 +40,13 @@ .adminui-main > .el-container > .el-aside {border-bottom: 1px solid var(--el-border-color-light)!important;} .adminui-main > .el-container > .el-container {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 15px;} .adminui-main > .el-container > .el-container + .el-aside {border-top: 1px solid var(--el-border-color-light);margin-top: 15px;} - .adminui-main > .el-container > .el-header {@extend .headerPublic;} - .adminui-main > .el-container > .el-main.nopadding {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 15px;} + .adminui-main > .el-container > .el-header {@extend .headerPublic;display: flex;padding: 6px;} + .adminui-main > .el-container > .el-main.nopadding {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 5px;} .adminui-main > .el-container > .el-main + .el-aside {border-left: 0!important;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;} .adminui-main > .el-container > .el-footer {margin-top: 15px;border-bottom: 1px solid var(--el-border-color-light);} .adminui-main > .el-container > .el-container > .el-header {@extend .headerPublic} .adminui-main > .el-container > .el-container > .el-header .left-panel {display: block;} - .adminui-main > .el-container > .el-container > .el-header .right-panel {display: block;margin-top: 15px;} + .adminui-main > .el-container > .el-container > .el-header .right-panel {margin-top: 15px;} .sc-page {width: 100%;margin: 0;} diff --git a/src/views/hrm/employee.vue b/src/views/hrm/employee.vue index e09fb5f4..ce0ed742 100644 --- a/src/views/hrm/employee.vue +++ b/src/views/hrm/employee.vue @@ -56,8 +56,7 @@ />