Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善menu导航 滚动条问题

Browse Source
This commit is contained in:
WangHao 2020-09-13 20:03:03 +08:00
parent 75f8fe0781
commit 5c64b70575
2 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/bookmark/content/index.vue
View File

@ -62,7 +62,7 @@
</div> </div>
<div class="bookmarklist" v-loading="loading" v-if="showbookmark"> <div class="bookmarklist" v-loading="loading" v-if="showbookmark" >
<el-row > <el-row >
<hr class="bookamrk-hr"/> <hr class="bookamrk-hr"/>
@ -97,9 +97,6 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -571,6 +568,9 @@
.bookmarktag{ .bookmarktag{
margin-right: 5px; margin-right: 5px;
} }
.bookmarklist{
/*height: 400px !important;*/
}
</style> </style>

66
ruoyi-ui/src/views/bookmark/index/index.vue
View File

@ -1,7 +1,7 @@
<template > <template >
<div> <div >
<el-container> <el-container >
<transition name="el-zoom-in-left"> <transition name="el-zoom-in-left">
<el-aside :style="asideHeight" v-show="isShowZtree" class="transition-box"> <el-aside :style="asideHeight" v-show="isShowZtree" class="transition-box">
@ -37,20 +37,20 @@
</transition> </transition>
<el-drawer <!-- <el-drawer-->
title="我是标题" <!-- title="我是标题"-->
:visible.sync="drawer" <!-- :visible.sync="drawer"-->
:direction="direction" <!-- :direction="direction"-->
:modal-append-to-body="drawerS" <!-- :modal-append-to-body="drawerS"-->
:append-to-body="isShowZtree" <!-- :append-to-body="isShowZtree"-->
> <!-- >-->
<span>我来啦!</span> <!-- <span>我来啦!</span>-->
</el-drawer> <!-- </el-drawer>-->
<!-- <el-button @click="isShowZtree = !isShowZtree">Click Me</el-button>--> <!-- <el-button @click="isShowZtree = !isShowZtree">Click Me</el-button>-->
<el-container> <el-container >
<el-header class="header-sousou" style="height: 50px"> <el-header class="header-sousou" style="height: 50px">
<div class="sousou-left"> <div class="sousou-left">
@ -102,7 +102,7 @@
</el-header> </el-header>
<el-main class="bookmarkmain" > <el-main class="bookmarkmain" style="overflow: hidden;">
<router-view :key="$route.query.menuId"></router-view> <router-view :key="$route.query.menuId"></router-view>
@ -387,12 +387,12 @@
/**自动获取高度**/ /**自动获取高度**/
getHeight(){ getHeight(){
if (window.innerHeight<=900) { // if (window.innerHeight<=500) {
this.asideHeight.height=='700px'; // this.asideHeight.height=='500';
//
return; // return;
} // }
this.asideHeight.height=window.innerHeight+'px'; // this.asideHeight.height=window.innerHeight+'px';
}, },
@ -830,16 +830,17 @@
/*background:red;*/ /*background:red;*/
} }
/*.areaTree{*/ .areaTree{
/* width: 300px;*/
/* !*height: 700px;*!*/ height: 400px;
/* font-weight: 400;*/ /*overflow:scroll;*/
/* !*overflow:auto;*!*/ /*font-weight: 400;*/
overflow:auto;
/* background-color: #F6F6F6;*/ /* background-color: #F6F6F6;*/
/* !* background:url('https://ftp.bmp.ovh/imgs/2020/08/4ac1d6b4f41049ef.jpg') no-repeat;*!*/ /* background:url('https://ftp.bmp.ovh/imgs/2020/08/4ac1d6b4f41049ef.jpg') no-repeat;*/
/* background-size: 100% 100%;*/ /* background-size: 100% 100%;*/
/*}*/ }
aside{ aside{
padding:0; padding:0;
@ -918,14 +919,22 @@
text-align: center; text-align: center;
float: left; float: left;
padding: 0 8px; padding: 0 8px;
} }
.filter-sort:hover{ .filter-sort:hover{
color: #6f8eee; color: #6f8eee;
background-color: #e6e6e6; background-color: #e6e6e6;
} }
.bookmarkmain{ .bookmarkmain{
padding-top: 0px!important; padding-top: 0px!important;
} }
.separator{ .separator{
float: left; float: left;
@ -1212,9 +1221,8 @@
box-shadow: inset -1px 0 0 rgba(0,0,0,.1); box-shadow: inset -1px 0 0 rgba(0,0,0,.1);
} }
.asideMenu{
margin-bottom: 100px;
}
</style> </style>