merge

kimi

2020-01-23 11317bf89e4d4194f84229c3d89a786b323c6be4

 src/views/Home.vue

@@ -42,7 +42,7 @@
        <el-container>
          <el-header style="text-align: right; font-size: 15px;padding-right: 40px;">
               <i class="el-icon-user-solid"></i>
               <span>admin</span>
               <span>{{userName}}</span>
               <el-button size="small" type="primary" @click="Cancel">退 出</el-button>
          </el-header>
          
@@ -70,6 +70,7 @@
  },
   created() {
      let userId_ = localStorage.getItem('userId');
      this.userName = localStorage.getItem('userName');
      let departId = localStorage.getItem('departId');
      if (!userId_ || !departId) {
         this.$router.push('/login');
@@ -80,8 +81,10 @@
         let type;
         if(departId == "100" || departId == "500") {
            type = departId;
             localStorage.setItem('assign', false);
         }else {
            type = "all";
            localStorage.setItem('assign', true);
         }
         
         this.getMenu(type);