Przeglądaj źródła

优化 isSuperAdmin 判断

Michael Wang 6 lat temu
rodzic
commit
7b4ace8496

+ 3 - 8
src/modules/basic/view/campus.vue

@@ -348,7 +348,6 @@ export default {
   name: "Campus",
   data() {
     return {
-      isSuperAdmin: false,
       paginationShow: false,
       rootOrgList: [],
       formSearch: {
@@ -412,6 +411,9 @@ export default {
     },
     noBatchSelected() {
       return this.selectedOrgIds.length === 0;
+    },
+    isSuperAdmin() {
+      return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
     }
   },
   methods: {
@@ -701,13 +703,6 @@ export default {
         this.user.token;
     },
     init() {
-      for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          this.isSuperAdmin = true;
-          break;
-        }
-      }
-
       this.$httpWithMsg.get(CORE_API + "/org/getRootOrgList").then(response => {
         this.rootOrgList = response.data;
         if (this.formSearch.parentId === null)

+ 4 - 9
src/modules/basic/view/role_privilege_settings.vue

@@ -91,7 +91,6 @@ export default {
   data() {
     return {
       completed: false,
-      isSuperAdmin: false,
       form: {
         orgId: null,
         roleId: null,
@@ -111,18 +110,14 @@ export default {
     };
   },
   computed: {
-    ...mapState({ user: state => state.user })
+    ...mapState({ user: state => state.user }),
+    isSuperAdmin() {
+      return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
+    }
   },
   methods: {
     /*初始化*/
     init() {
-      for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          this.isSuperAdmin = true;
-          break;
-        }
-      }
-
       var url1 = CORE_API + "/org/getRootOrgList";
       var url2 =
         CORE_API + "/rolePrivilege/getRoles?includeSuperAdmin=" + false;

+ 3 - 8
src/modules/basic/view/user.vue

@@ -493,7 +493,6 @@ export default {
     return {
       loading: false,
       orgLoading4InsertOrUpdate: false,
-      isSuperAdmin: false,
       roleList4Search: [],
       roleList4InsertOrUpdate: [],
       rootOrgList: [],
@@ -592,6 +591,9 @@ export default {
       return this.roleList4InsertOrUpdate.filter(
         item => item.roleCode != "SUPER_ADMIN"
       );
+    },
+    isSuperAdmin() {
+      return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
     }
   },
   methods: {
@@ -986,13 +988,6 @@ export default {
 
     /*初始化*/
     init() {
-      for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          this.isSuperAdmin = true;
-          break;
-        }
-      }
-
       this.searchForm.rootOrgId = this.user.rootOrgId;
       this.userForm.rootOrgId = this.user.rootOrgId;
 

+ 1 - 5
src/modules/examwork/view/examStudent.vue

@@ -871,7 +871,6 @@ export default {
         update_examStudent: false,
         change_exam_student_availability: false
       },
-      isSuperAdmin: false,
       pureLC: false,
       lc_id: null,
       lc_code: null,
@@ -1670,10 +1669,7 @@ export default {
     },
     init() {
       for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          this.isSuperAdmin = true;
-          continue;
-        } else if (role.roleCode == "LC_USER") {
+        if (role.roleCode == "LC_USER") {
           this.pureLC = true;
           continue;
         }

+ 3 - 8
src/modules/examwork/view/student.vue

@@ -489,7 +489,6 @@ export default {
         unbind_student_code: false,
         unbind_security_phone: false
       },
-      isSuperAdmin: false,
       rootOrgList: null,
       stuExamLoading: false,
       button: {},
@@ -566,6 +565,9 @@ export default {
     },
     noBatchSelected() {
       return this.selectedStuIds.length === 0;
+    },
+    isSuperAdmin() {
+      return this.user.roleList.some(role => role.roleCode == "SUPER_ADMIN");
     }
   },
   methods: {
@@ -910,13 +912,6 @@ export default {
     init() {
       this.initPrivileges();
 
-      for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          this.isSuperAdmin = true;
-          break;
-        }
-      }
-
       var url = CORE_API + "/org/getRootOrgList";
 
       this.$httpWithMsg.get(url).then(response => {

+ 1 - 1
src/modules/examwork/view/traditionExam.vue

@@ -241,4 +241,4 @@ export default {
 .input >>> .el-input__inner {
   -webkit-appearance: button;
 }
-</style>
+</style>

+ 0 - 11
src/modules/portal/views/home/Home.vue

@@ -202,17 +202,6 @@ export default {
     resetForm() {
       this.$refs.passForm.resetFields();
     },
-    isSuperAdmin() {
-      if (!this.user.roleList) {
-        return false;
-      }
-      for (let role of this.user.roleList) {
-        if (role.roleCode == "SUPER_ADMIN") {
-          return true;
-        }
-      }
-      return false;
-    },
     logout() {
       this.$http
         .post(CORE_API + "/auth/logout")