Commit 4ddb76c7 authored by yaqizhang's avatar yaqizhang

去掉右上角头像

parent 1cefc70a
...@@ -131,9 +131,9 @@ ...@@ -131,9 +131,9 @@
.el-tooltip { .el-tooltip {
padding: 0 !important; padding: 0 !important;
.svg-icon { // .svg-icon {
margin-left: 20px; // margin-left: 20px;
} // }
} }
} }
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="18"> <el-col :span="22">
<div style="float: left;padding: 5px;"> <div style="float: left;padding: 5px;">
<img src="@/assets/logo/top-left-logo.png" alt="" style="margin-top: 15px;"> <img src="@/assets/logo/top-left-logo.png" alt="" style="margin-top: 15px;">
</div> </div>
<!-- 点击左侧二级菜单滑开 --> <!-- 点击左侧二级菜单滑开 -->
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<!-- 顶部导航 --> <!-- 顶部导航 -->
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
</el-col> </el-col>
<el-col :span="6" style="float: right;"> <el-col :span="2" style="float: right;">
<div class="right-menu"> <div class="right-menu">
<!-- <template v-if="device!=='mobile'"> <!-- <template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
...@@ -41,13 +41,14 @@ ...@@ -41,13 +41,14 @@
<div class="formatDate"> <div class="formatDate">
<span>{{ nowDate }}</span> <span>{{ nowDate }}</span>
</div> </div>
<div class="yhm">{{showUserName}}</div> <!-- <div class="yhm">{{showUserName}}</div> -->
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar" class="user-avatar"> <!-- <img :src="avatar" class="user-avatar">
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" /> -->
<div class="yhm">{{showUserName}}</div>
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/user/profile"> <router-link to="/user/profile">
...@@ -168,14 +169,14 @@ export default { ...@@ -168,14 +169,14 @@ export default {
height: 80px; height: 80px;
width: 100%; width: 100%;
left: 0; left: 0;
line-height: 80px; /* line-height: 80px; */
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #053B6A; background: #053B6A;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0,21,41,.08);
.hamburger-container { .hamburger-container {
line-height: 80px; /* line-height: 80px; */
height: 100%; height: 100%;
float: left; float: left;
cursor: pointer; cursor: pointer;
...@@ -204,8 +205,9 @@ export default { ...@@ -204,8 +205,9 @@ export default {
} }
.right-menu { .right-menu {
float: right; float: right;
width: 100%;
height: 100%; height: 100%;
line-height: 80px; /* line-height: 80px; */
...@@ -213,27 +215,27 @@ export default { ...@@ -213,27 +215,27 @@ export default {
outline: none; outline: none;
} }
.formatDate{ .formatDate{
float: left; width: 100%;
font-size: 20px; height: 40px;
line-height: 50px;
text-align: center;
font-size: 18px;
color: #fff; color: #fff;
margin-right: 30px;
} }
.yhm{ .yhm{
font-size: 20px; font-size: 20px;
color: #fff; color: #fff;
float: left; width: 100%;
text-overflow:ellipsis; text-overflow:ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-align: center;
margin-right: 20px;
} }
.right-menu-item { .right-menu-item {
display: inline-block; display: inline-block;
margin-top: 8px; width: 100%;
padding: 0 8px; line-height: 30px;
float: right; height: 40px;
height: 100%; text-align: center;
font-size: 18px; font-size: 18px;
color: #5a5e66; color: #5a5e66;
vertical-align: text-bottom; vertical-align: text-bottom;
...@@ -249,10 +251,10 @@ export default { ...@@ -249,10 +251,10 @@ export default {
} }
.avatar-container { .avatar-container {
margin-right: 15px; width: 70%;
margin-left: 15%;
.avatar-wrapper { .avatar-wrapper {
margin-top: 5px;
position: relative; position: relative;
.user-avatar { .user-avatar {
......
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