diff --git a/src/style/media.scss b/src/style/media.scss index 9e0158c4..b2d18e18 100644 --- a/src/style/media.scss +++ b/src/style/media.scss @@ -14,6 +14,7 @@ .scTable { .el-table, .el-table__body-wrapper {display: block!important;height:auto!important;} + .el-scrollbar__wrap {height:auto!important;} .scTable-page {padding: 0 5px!important;} .el-pagination__total, .el-pagination__jump, @@ -36,4 +37,6 @@ .adminui-main > .el-container > .el-main {border-top: 1px solid #ebeef5;border-bottom: 1px solid #ebeef5;margin-top: 15px;} .adminui-main > .el-container > .el-main + .el-aside {border-left: 0!important;border-top: 1px solid #ebeef5;margin-top: 15px;} .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;} } diff --git a/src/views/setting/menu/save.vue b/src/views/setting/menu/save.vue index d22f1c9d..86b065cd 100644 --- a/src/views/setting/menu/save.vue +++ b/src/views/setting/menu/save.vue @@ -170,6 +170,7 @@ //表单注入数据 setData(data, pid){ this.form = data + this.form.apiList = data.apiList || [] this.form.parentId = pid } } diff --git a/src/views/vab/upload.vue b/src/views/vab/upload.vue index d1e831eb..6584e77e 100644 --- a/src/views/vab/upload.vue +++ b/src/views/vab/upload.vue @@ -15,17 +15,15 @@ - - + + - - - + @@ -104,7 +102,6 @@