y595705120 3 jaren geleden
bovenliggende
commit
fa48119789
2 gewijzigde bestanden met toevoegingen van 26 en 19 verwijderingen
  1. 6 15
      src/pages/other/file-manage.vue
  2. 20 4
      src/store/modules/user.js

+ 6 - 15
src/pages/other/file-manage.vue

@@ -123,22 +123,12 @@ export default {
     }
   },
   computed: {
-  	...mapGetters("user", ["userDepartments"])
+  	...mapGetters("user", ["userDepartments", "userDepartment"])
   },
-  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;
-    if( departmentId > 0 ){
-      let department = data.getDepart( departmentId, this.userDepartments )
-      this.handleSelectDepart( department  );
+  watch:{
+    "userDepartment.departmentId"(){
+      if( !this.userDepartment.departmentId) return;
+      this.handleSelectDepart(  Object.assign({}, this.userDepartment))
     }
   },
   filters:{
@@ -190,6 +180,7 @@ export default {
     },
 
     handleSelectDepart( department ) {
+      console.log("handleSelectDepart", department)
       let departId = department.departmentId;
       localStorage.setItem("@departmentId", departId)
       this.department = department

+ 20 - 4
src/store/modules/user.js

@@ -12,6 +12,7 @@ const state = {
   introduction: '',
   roles: [],
   departments:[],
+  department: {},
   articals: {}
 }
 
@@ -38,8 +39,11 @@ const mutations = {
   SET_ROLES: (state, roles) => {
     state.roles = roles
   },
-  SET_DEPARTMENT( state, deparments){
-    state.departments = deparments
+  SET_DEPARTMENTS( state, departments){
+    state.departments = departments
+  },
+  SET_DEPARTMENT( state, department){
+    state.department = department
   },
   Logout(state) {
     state.userInfo = {}
@@ -105,12 +109,21 @@ const actions = {
   setArticals( {commit}, articals){
     commit('APPEND_ARTICAL', articals )
   },
-
+  setDepartment( {commit}, department){
+    commit('SET_DEPARTMENT', department )
+  },
   loadDepartment( {commit, state} ){
     let userId = authDB.get('userId')||0;
     loadDepartmentList( {userId} ).then( res=>{
       if( res.code == 200){
-        commit('SET_DEPARTMENT', res.data)
+        commit('SET_DEPARTMENTS', res.data);
+        for( let i in res.data){
+          let department = res.data[i]
+          if( department.isLeader>0){
+            commit('SET_DEPARTMENT', department);
+            return;
+          }
+        }
       }
     })
   },
@@ -151,6 +164,9 @@ const getters=  {
   getArticals(state) {
     return state.articals
   },
+  userDepartment(state){
+    return state.department
+  },
   userInfo(state){
     if( state.userInfo && state.userInfo.userId ){
       return state.userInfo;