用户管理、端口池管理页面调通.

neutrino-proxy-admin/src/store/modules/user.js

@@ -9,6 +9,7 @@ const user = {
     code: '',
     token: getToken(),
     name: '',
+    loginName: '',
     avatar: '',
     introduction: '',
     roles: [],
@@ -36,6 +37,9 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
+    SET_LOGIN_NAME: (state, loginName) => {
+      state.loginName = loginName
+    },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
@@ -68,6 +72,7 @@ const user = {
           }
           commit('SET_ROLES', [response.data.data.loginName])
           commit('SET_NAME', response.data.data.name)
+          commit('SET_LOGIN_NAME', response.data.data.loginName)
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -119,8 +124,10 @@ const user = {
         setToken(role)
         getUserInfo(role).then(response => {
           const data = response.data
+          console.log('111222', data)
           commit('SET_ROLES', data.roles)
           commit('SET_NAME', data.name)
+          commit('SET_LOGIN_NAME', data.loginName)
           commit('SET_AVATAR', data.avatar)
           commit('SET_INTRODUCTION', data.introduction)
           resolve()

neutrino-proxy-admin/src/views/layout/components/Navbar.vue

@@ -7,19 +7,19 @@
     <div class="right-menu">
       <error-log class="errLog-container right-menu-item"></error-log>
 
-      <el-tooltip effect="dark" :content="$t('navbar.screenfull')" placement="bottom">
-        <screenfull class="screenfull right-menu-item"></screenfull>
-      </el-tooltip>
+<!--      <el-tooltip effect="dark" :content="$t('navbar.screenfull')" placement="bottom">-->
+<!--        <screenfull class="screenfull right-menu-item"></screenfull>-->
+<!--      </el-tooltip>-->
 
-      <lang-select class="international right-menu-item"></lang-select>
+<!--      <lang-select class="international right-menu-item"></lang-select>-->
 
-      <el-tooltip effect="dark" :content="$t('navbar.theme')" placement="bottom">
-        <theme-picker class="theme-switch right-menu-item"></theme-picker>
-      </el-tooltip>
+<!--      <el-tooltip effect="dark" :content="$t('navbar.theme')" placement="bottom">-->
+<!--        <theme-picker class="theme-switch right-menu-item"></theme-picker>-->
+<!--      </el-tooltip>-->
 
       <el-dropdown class="avatar-container right-menu-item" trigger="click">
         <div class="avatar-wrapper">
-          <img class="user-avatar" :src="avatar+'?imageView2/1/w/80/h/80'">
+          <span>{{loginName}}|{{name}}</span>
           <i class="el-icon-caret-bottom"></i>
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -28,7 +28,7 @@
               {{$t('navbar.dashboard')}}
             </el-dropdown-item>
           </router-link>
-          <a target='_blank' href="https://github.com/PanJiaChen/vue-element-admin/">
+          <a target='_blank' href="https://gitee.com/asgc/neutrino-proxy">
             <el-dropdown-item>
               {{$t('navbar.github')}}
             </el-dropdown-item>
@@ -64,7 +64,8 @@ export default {
     ...mapGetters([
       'sidebar',
       'name',
-      'avatar'
+      'avatar',
+      'loginName'
     ])
   },
   methods: {