'normal'

src/pages/login/components/SignInForm.vue

@@ -10,7 +10,7 @@
           placeholder="输入账号"
           type="text"
           tabindex="1"
-          autocomplete="off"
+          autocomplete="on"
           v-model="loginForm.username"
         />
         <div class="rpm-sign__tip cprimary" >
@@ -21,15 +21,16 @@
         <el-input
           ref="password"
           placeholder="输入密码"
-          type="password"
           tabindex="2"
-          :key="passwordType"
+          :type="passwordType"
           autocomplete="new-password"
           v-model="loginForm.password"
           @keyup.native="checkCapslock"
           @blur="capsTooltip = false"
           @keyup.enter.native="handleLogin"
-        />
+        >
+          <i slot="suffix" class="el-icon-view" @click="showPwd"></i>
+        </el-input>
         <div class="rpm-sign-in__tip cdanger" @click="qrcode=true" >
           忘记密码
         </div>
@@ -77,7 +78,7 @@ export default {
       loginForm: {
         username: '',
         password: '',
-        remember: true,
+        remember: false,
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateLoginname }],
@@ -101,15 +102,14 @@ export default {
   },
   created(){
     this.redirect = this.$route.query.redirect
-    let username = this.getCookie("username");
-    if (username) {
-      this.loginForm.username = username;
-      this.loginForm.password = Base64.decode(this.getCookie("password"));
+    this.loginForm.username = this.getCookie("username");
+    let password = this.getCookie("password")
+    if (password) {
+      this.loginForm.password = Base64.decode( password );
       this.loginForm.remember = true;
     }else{
       this.loginForm.remember = false;
     }
-    console.log( this.loginForm )
   },
   methods: {
     ...mapActions("user", ["login", "loadDepartment"]),
@@ -157,13 +157,12 @@ export default {
         let path = this.redirect || '/';
         this.login( param).then(() => {
           this.$router.push({ path, query: this.otherQuery })
+          this.setCookie("username", this.loginForm.username, 30);
           if( remember ){
             let passWord = Base64.encode(this.loginForm.password);
             this.setCookie("password", passWord, 30);
-            this.setCookie("username", this.loginForm.username, 30);
           }else{
-            this.setCookie("password", "", 7);
-            this.setCookie("username", "", 7);
+            this.setCookie("password", "", 30);
           }
           this.loadDepartment()
           this.loading = false

src/pages/other/components/IHeader.vue

@@ -45,6 +45,7 @@
         <span>您好! </span>
         <span class="ml10" v-if="userInfo.userId">
           {{userInfo.nickname || '还未登入'}}
+          <span>[{{getDeparts()}}]</span>
           <span type="text" size="mini" class="ml20"
             @mouseover="showqrcode=true" @mouseleave="showqrcode=false">
             <svg-icon icon-class="xcx" class-name="card-panel-icon" /> 小程序
@@ -90,6 +91,7 @@ export default {
       SearchList: [],
       keyword: '',
       title:title,
+      curDepartment:'',
       showqrcode: false,
       timeout:  null,
       curDate: new Date()
@@ -118,6 +120,14 @@ export default {
       }
       return false
     },
+    getDeparts(){
+      for( let i in this.userDepartments){
+        if( this.userDepartments[i].isLeader >0 ){
+          return  this.userDepartments[i].department
+        }
+      }
+      return "";
+    },
     doLogout(){
       this.logout().then( res=>{
        this.$router.push( {path:'/login'})
@@ -147,7 +157,6 @@ export default {
     },
     handleSelect(item) {
       this.$router.push( {path:'/file-info', query:{articalId: item.id}})
-      console.log("search", item);
     },
     handlerSearch(){
       let query = {}

src/pages/other/file-manage.vue

@@ -6,19 +6,10 @@
       <div class="main-table">
 
         <div class="main-left">
-         <!-- <el-select v-model="searchDepartment" filterable clearable placeholder="关键字搜索部门" @change="handleChangeDepart">
-            <el-option
-              v-for="item in userDepartments"
-              :key="item.departmentId"
-              :label="item.department"
-              :value="item"
-            >
-            </el-option>
-          </el-select> -->
-
-          <el-menu  :default-openeds="['first']"  :unique-opened="true">
-
-            <el-submenu index="first">
+
+          <el-menu :default-openeds="[menuId]"  :unique-opened="true">
+
+            <el-submenu index="0">
               <template slot="title">机关各科室</template>
               <template  v-for="item in userDepartments"  v-if="item.menuId==0">
                 <el-menu-item :index="''+item.departmentId" v-bind:key="item.departmentId"  @click="handleSelectDepart(item)">
@@ -33,7 +24,7 @@
               </template>
             </el-submenu>
 
-            <el-submenu index="next" @select="handleSelectDepart" >
+            <el-submenu index="1" @select="handleSelectDepart" >
               <template slot="title">局属各单位</template>
 
               <template  v-for="item in userDepartments" v-if="item.menuId==1" >
@@ -126,6 +117,7 @@ export default {
       form:{},
       state3: '',
       category:'',
+      menuId:'1',
       isShowMore: false,
       screenWidth: document.body.clientWidth
     }
@@ -134,10 +126,20 @@ export default {
   	...mapGetters("user", ["userDepartments"])
   },
   beforeMount( ){
+    //
+    for( let i in this.userDepartments){
+      let department = this.userDepartments[i]
+      if( department.isLeader>0){
+        console.log("select", department)
+        this.handleSelectDepart( department  );
+        return;
+      }
+    }
     let departmentId = localStorage.getItem("@departmentId")||0;
-    this.department = data.getDepart( departmentId, this.userDepartments );
-    this.leaderId = data.getLeader( departmentId, this.userDepartments)
-    this.getDepartmentAccount()
+    if( departmentId > 0 ){
+      let department = data.getDepart( departmentId, this.userDepartments )
+      this.handleSelectDepart( department  );
+    }
   },
   filters:{
     filterTitle(val){
@@ -186,20 +188,12 @@ export default {
       this.setArticals( this.restaurants.result||[] )
       this.setArticals( this.restaurants.other||[] )
     },
-    handleSelectFile(item) {
-      console.log("handleSelectFile", item);
-    },
-    handleChangeDepart(item){
-      console.log("handleChangeDepart", item);
-      this.department = item;
-      // 切换文件列表
-    },
+
     handleSelectDepart( department ) {
       let departId = department.departmentId;
       localStorage.setItem("@departmentId", departId)
       this.department = department
-      // this.department = data.getDepart( departId, this.userDepartments)
-      console.log("handleSelectDepart", this.department );
+      this.menuId = ''+department.menuId||"0"
       this.getDepartmentAccount();
       // 切换文件列表
     },