导航栏右侧修改

src/store/getters.js

@@ -4,6 +4,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  username: state => state.user.username,
   introduction: state => state.user.introduction,
   status: state => state.user.status,
   roles: state => state.user.roles,

src/store/modules/user.js

@@ -16,6 +16,7 @@ const user = {
     code: '',
     token: getToken(),
     name: '',
+    username:'',
     avatar: '',
     introduction: '',
     roles: [],
@@ -46,6 +47,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name;
     },
+    SET_USER_NAME: (state, username) => {
+      state.username = username;
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar;
     },
@@ -101,6 +105,7 @@ const user = {
           const data = response;
           commit('SET_ROLES', 'admin');
           commit('SET_NAME', data.name);
+          commit('SET_USER_NAME', data.username);
           commit('SET_AVATAR', 'http://git.oschina.net/uploads/42/547642_geek_qi.png?1499487420');
           commit('SET_INTRODUCTION', data.description);
           const menus = {};

src/views/layout/AppMain.vue

 <template>
 
-	<section class="app-main" style="min-height: 100%">
+	<section class="app-main" style="min-height: 100%;padding-top:20px;">
 		<transition name="fade" mode="out-in">
 			<router-view :key="key"></router-view>
 		</transition>

src/views/layout/Levelbar.vue

@@ -39,7 +39,7 @@
   .app-levelbar.el-breadcrumb {
     display: inline-block;
     font-size: 14px;
-    line-height: 50px;
+    line-height: 70px;
     margin-left: 10px;
     .no-redirect {
       color: #97a8be;

src/views/layout/Navbar.vue

@@ -5,9 +5,10 @@
   <levelbar></levelbar>
   <tabs-view></tabs-view>
   <error-log v-if="log.length>0" class="errLog-container" :logsList="log"></error-log>
-  <screenfull class='screenfull'></screenfull>
+  <!-- <screenfull class='screenfull'></screenfull> -->
   <el-dropdown class="avatar-container" trigger="click">
-    <div class="avatar-wrapper"> <img class="user-avatar" :src="avatar+'?imageView2/1/w/80/h/80'"> <i class="el-icon-caret-bottom"></i> </div>
+    <!-- <div class="avatar-wrapper"> <img class="user-avatar" :src="avatar+'?imageView2/1/w/80/h/80'"> <i class="el-icon-caret-bottom"></i> </div> -->
+    <div class="" style="font-size: 15px;cursor: pointer;"> 欢迎您，<span style="color:#20A0FF;">{{username}}</span> <i class="el-icon-caret-bottom"></i> </div>
     <el-dropdown-menu class="user-dropdown" slot="dropdown">
       <router-link class='inlineBlock' to="/">
         <el-dropdown-item> 首页 </el-dropdown-item>
@@ -47,7 +48,8 @@ export default {
   computed: { ...mapGetters([
       'sidebar',
       'name',
-      'avatar'
+      'avatar',
+      'username'
     ])
   },
   methods: {
@@ -72,12 +74,12 @@ export default {
   -moz-box-shadow:1px 1px 3px #ccc; -webkit-box-shadow:1px 1px 3px #ccc; box-shadow:1px 1px 3px #ccc;
 }
 .navbar {
-    height: 50px;
-    line-height: 50px;
+    height: 70px;
+    line-height: 70px;
     border-radius: 0 !important;
     .hamburger-container {
-        line-height: 58px;
-        height: 50px;
+        line-height: 78px;
+        height: 70px;
         float: left;
         padding: 0 10px;
     }
@@ -89,17 +91,17 @@ export default {
     .screenfull {
         position: absolute;
         right: 90px;
-        top: 16px;
+        top: 26px;
         color: red;
     }
     .avatar-container {
-        height: 50px;
+        height: 70px;
         display: inline-block;
         position: absolute;
         right: 35px;
         .avatar-wrapper {
             cursor: pointer;
-            margin-top: 5px;
+            margin-top: 10px;
             position: relative;
             .user-avatar {
                 width: 40px;

src/views/vehicle/bookRecord/index.vue

@@ -1146,6 +1146,11 @@
       },
       getList() {
         this.listLoading = true;
+        for(var key in this.listQuery){
+          if(this.listQuery[key]==''){
+            this.listQuery[key]=undefined
+          }
+        }    
         page(this.listQuery)
           .then(response => {
             this.list = response.data.data;