diff --git a/src/components/public/Header.vue b/src/components/public/Header.vue
index 868ad0c..d618683 100644
--- a/src/components/public/Header.vue
+++ b/src/components/public/Header.vue
@@ -1,5 +1,5 @@
 <template>
-  <header>
+  <header v-loading="loading">
     <div id="topnavbar">
        <div class="logo logo2 cursor">
         <img src="../../../static/images/logo.png" alt="">
@@ -7,34 +7,48 @@
       <div id="topnanv"  v-show="!collapse || navShow">
         <nav>
           <ul class="content clearfix">
-            <li class="dropdown" v-for="(item,index) in menu" :key="index">
-              <a href="javascript:void(0);" @click="routerTurn(item.path)">{{item.name}}<img v-show="item.children.length" src="../../../static/images/arrow-down.png" alt=""></a>
-              <ul class="sub-menu" v-show="item.children.length">
-                <li v-for="(item1,index1) in item.children" :key="index1">
-                  <a href="javascript:void(0);" @click="routerTurn(item1.path)">{{item1.name}}</a>
-                </li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <el-dropdown>
-                <span class="el-dropdown-link userClass">
+            <template v-if="userName">
+              <li class="dropdown" v-for="(item,index) in adminMenu" :key="index">
+                <a href="javascript:void(0);" @click="routerTurn(item.path)">{{item.name}}<img v-show="item.children.length" src="../../../static/images/arrow-down.png" alt=""></a>
+                <ul class="sub-menu" v-show="item.children.length">
+                  <li v-for="(item1,index1) in item.children" :key="index1">
+                    <a href="javascript:void(0);" @click="routerTurn(item1.path)">{{item1.name}}</a>
+                  </li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <el-dropdown>
+                  <span class="el-dropdown-link userClass">
                     <a href="javascript:void(0);">admin<img src="../../../static/images/arrow-down.png" alt=""></a>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item>
-                    <a href="javascript:void(0);" @click="routerTurn('personalCenter')">个人中心</a>
-                  </el-dropdown-item>
-                  <el-dropdown-item>
-                    <a href="javascript:void(0);" @click="onLogout">退出登录</a>
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-              <el-dropdown  trigger="click">
-                <span class="el-dropdown-link userClass">
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item>
+                      <a href="javascript:void(0);" @click="routerTurn('personalCenter')">个人中心</a>
+                    </el-dropdown-item>
+                    <el-dropdown-item>
+                      <a href="javascript:void(0);" @click="onLogout">退出登录</a>
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </li>
+            </template>
+            <template v-else>
+              <li class="dropdown" v-for="(item,index) in menu" :key="index">
+                <a href="javascript:void(0);" @click="routerTurn(item.path)">{{item.name}}<img v-show="item.children.length" src="../../../static/images/arrow-down.png" alt=""></a>
+                <ul class="sub-menu" v-show="item.children.length">
+                  <li v-for="(item1,index1) in item.children" :key="index1">
+                    <a href="javascript:void(0);" @click="routerTurn(item1.path)">{{item1.name}}</a>
+                  </li>
+                </ul>
+              </li>
+              <li class="dropdown">
+                <el-dropdown  trigger="click">
+                  <span class="el-dropdown-link userClass">
                     <a href="javascript:void(0);" @click="routerTurn('login')">登录</a>
-                </span>
-              </el-dropdown>
-            </li>
+                  </span>
+                </el-dropdown>
+              </li>
+            </template>
           </ul>
         </nav>
       </div>
@@ -55,6 +69,7 @@ export default {
   },
   data(){
 	  return {
+      loading: false,
 		  collapse:true,
 		  menu:[
 			  {
@@ -104,93 +119,142 @@ export default {
 					  }
 				  ]
 			  },
-			  {
-				  name:"数据汇交",
-				  children:[
-					  {
-						name:"航次数据汇交",
-				 		path:"VoyageReg",
-				  		children:[]
-					  },
-					   {
-						name:"样品数据集汇交",
-				 		path:"SampleDataset",
-				  		children:[]
-					  }
-				  ]
-			  },
-			  {
-				  name:"字典管理",
-				  children:[
-					  {
-						name:"数据样品类型",
-						path:"dataSampleType",
-						children:[]
-					  },
-					  {
-						name:"设备类型",
-						path:"docType",
-						children:[]
-					  },
-					  {
-						name:"平台类型",
-						path:"platformType",
-						children:[]
-					  },
-					  {
-						name:"参航单位",
-						path:"visitorUnit",
-						children:[]
-					  },
-					  {
-						name:"共享单位",
-						path:"sharedUnit",
-						children:[]
-					  },
-				  ]
-			  },
-			  {
-				  name:"系统管理",
-				  children:[
-					  {
-						name:"用户管理",
-						path:"userManage",
-						children:[]
-					  },
-					  {
-						name:"角色管理",
-						path:"roleManage",
-						children:[]
-					  },
-					  {
-						name:"单位管理",
-						path:"unitManage",
-						children:[]
-					  }
-				  ]
-			  },
 			  {
 				  name:"关于我们",
 				  path:"",
 				  children:[]
-			  },
-			  //  {
-				//   name:"个人中心",
-				//   path:"personalCenter",
-				//   children:[]
-			  // },
-			  // {
-				//   name:"登录",
-				//   path:"login",
-				//   children:[]
-			  // },
-
+			  }
 		  ],
+      adminMenu: [
+        {
+          name:"首页",
+          path:"home",
+          children:[]
+        },
+        {
+          name:"数据检索",
+          path:"",
+          children:[
+            {
+              name:"数据检索",
+              path:"dataSearch",
+              children:[]
+            },
+            {
+              name:"航次详情",
+              path:"voyagedetail",
+              children:[]
+            }
+          ]
+        },
+        {
+          name:"统计分析",
+          path:"analyse",
+          children:[]
+        },
+        {
+          name:"数据资源",
+          path:"",
+          children:[
+            {
+              name:"海洋地球物理与物理海洋信息库",
+              path:"physicalIndex",
+              children:[]
+            },
+            {
+              name:"海洋生物样品信息库",
+              path:"biologyIndex",
+              children:[]
+            },
+            {
+              name:"深海海洋视频音像信息库",
+              path:"phoneVideoIndex",
+              children:[]
+            }
+          ]
+        },
+        {
+          name:"数据汇交",
+          children:[
+            {
+              name:"航次数据汇交",
+              path:"VoyageReg",
+              children:[]
+            },
+            {
+              name:"样品数据集汇交",
+              path:"SampleDataset",
+              children:[]
+            }
+          ]
+        },
+        {
+          name:"字典管理",
+          children:[
+            {
+              name:"数据样品类型",
+              path:"dataSampleType",
+              children:[]
+            },
+            {
+              name:"设备类型",
+              path:"docType",
+              children:[]
+            },
+            {
+              name:"平台类型",
+              path:"platformType",
+              children:[]
+            },
+            {
+              name:"参航单位",
+              path:"visitorUnit",
+              children:[]
+            },
+            {
+              name:"共享单位",
+              path:"sharedUnit",
+              children:[]
+            },
+          ]
+        },
+        {
+          name:"系统管理",
+          children:[
+            {
+              name:"用户管理",
+              path:"userManage",
+              children:[]
+            },
+            {
+              name:"角色管理",
+              path:"roleManage",
+              children:[]
+            },
+            {
+              name:"单位管理",
+              path:"unitManage",
+              children:[]
+            }
+          ]
+        },
+        {
+          name:"关于我们",
+          path:"",
+          children:[]
+        }
+      ],
       nowPathName: '',
       navShow:false
 	  }
   },
+  computed: {
+    userName() {
+      return sessionStorage.getItem('userName') || this.$store.state.user.name
+    }
+  },
   created() {
+    console.log(this.userName)
     this.getLoginInfo()
   },
   mounted(){
@@ -234,11 +298,14 @@ export default {
 	  },
     // 退出登录
     onLogout() {
+      this.loading = true
       loginOut().then(res => {
+        this.$store.commit('SET_NAME', '')
+        sessionStorage.setItem('userName', '')
         this.$router.push({
           path: 'login'
         })
-        this.getLoginInfo()
+        location.reload()
       })
     },
     // 获取登录信息
diff --git a/src/store/index.js b/src/store/index.js
index 622b06f..ef88cb1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,7 +4,7 @@ import getters from './getters'
 import app from './modules/app'
 import settings from './modules/settings'
 import sample from '@/store/modules/sample'
-// import user from './modules/user'
+import user from './modules/user'
 
 Vue.use(Vuex)
 
@@ -12,8 +12,8 @@ const store = new Vuex.Store({
   modules: {
     app,
     settings,
-    sample
-    // user
+    sample,
+    user
   },
   getters
 })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
new file mode 100644
index 0000000..ee814f8
--- /dev/null
+++ b/src/store/modules/user.js
@@ -0,0 +1,18 @@
+
+const user = {
+  state: {
+    name: ''
+  },
+
+  mutations: {
+    SET_NAME: (state, name) => {
+      state.name = name
+    }
+  },
+
+  actions: {
+
+  }
+}
+
+export default user
diff --git a/src/utils/request.js b/src/utils/request.js
index 8f841de..fd32c8d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -53,11 +53,12 @@ service.interceptors.response.use(
         message: res.errorMsg,
         type: 'warning'
       })
+      sessionStorage.setItem('userName', '')
     } else if (res.errorCode === 0) {
       return res
     } else {
       Message({
-        message: '系统错误',
+        message: res.errorMsg,
         type: 'warning'
       })
     }
diff --git a/src/views/login.vue b/src/views/login.vue
index fcd53e4..0cd67a6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -55,6 +55,8 @@ export default {
       loginCode: '1234'
     }
   },
+  created() {
+  },
   methods: {
     onLogin() {
       if (!this.loginName) return this.$message.warning('请输入用户名')
@@ -67,6 +69,8 @@ export default {
       }).then(res => {
         if (res.success) {
           this.$router.back()
+          this.$store.commit('SET_NAME', this.loginName)
+          sessionStorage.setItem('userName', this.loginName)
         } else {
           this.$message.error(res.errorMsg)
         }