1319612909 4 years ago
parent
commit
c218ac1b8e
  1. 29
      web/src/style/main.scss
  2. 2
      web/src/view/layout/index.vue
  3. 2
      web/src/view/layout/search/search.vue

29
web/src/style/main.scss

@ -1060,6 +1060,7 @@ $mainHight: 100vh;
.right-box {
text-align: center;
vertical-align: middle;
margin-right: 40px;
img {
vertical-align: middle;
border: 1px solid #ccc;
@ -1087,27 +1088,17 @@ $mainHight: 100vh;
&.el-main {
overflow: auto;
background: #fff;
// padding: 0px 10px;
// background: #fff;
}
height: $mainHight !important;
overflow: visible;
position: relative;
.menu-total {
// z-index: 5;
// position: absolute;
// top: 10px;
// right: -35px;
margin-left: -10px;
float: left;
margin-top: 10px;
width: 30px;
height: 30px;
line-height: 30px;
font-size: 30px;
// border: 0 solid #ffffff;
// border-radius: 50%;
// background: #fff;
}
.aside {
overflow: auto;
@ -1189,6 +1180,10 @@ $mainHight: 100vh;
.search-component {
display: inline-block;
overflow: hidden;
height: 60px;
width: 40px;
text-align: center;
.el-input__inner {
border: none;
border-bottom: 1px solid #606266;
@ -1208,3 +1203,17 @@ $mainHight: 100vh;
min-width: 100px;
}
}
.transition-box{
overflow: hidden;
width: 40px;
text-align: center;
}
.screenfull{
overflow: hidden;
width: 40px;
text-align: center;
}
.el-dropdown{
overflow: hidden;
height: 60px;
}

2
web/src/view/layout/index.vue

@ -32,7 +32,7 @@
<Screenfull class="screenfull"></Screenfull>
<el-dropdown>
<span class="header-avatar">
欢迎您<CustomPic/>
<CustomPic/>
<span style="margin-left: 5px">{{userInfo.nickName}}</span>
<i class="el-icon-arrow-down"></i>
</span>

2
web/src/view/layout/search/search.vue

@ -18,7 +18,7 @@
</el-select>
</div>
</transition>
<div :style="{display:'inline-block'}">
<div :style="{display:'inline-block'}" class="user-box">
<i @click="show = !show" class="el-icon-search search-icon"></i>
</div>
</div>

Loading…
Cancel
Save