Browse Source

fix():修改权限判断逻辑

liyangbin 2 years ago
parent
commit
328e5e7a79

+ 3 - 3
src/components/sideMenu.vue

@@ -86,9 +86,9 @@ export default {
       }
     },
     roles(){
-      if (parseInt(this.role) === 1) {
+      if (this.role.indexOf("1") !== -1) {
         return 'Super admin'
-      } else if (parseInt(this.role) === 2){
+      } else if (this.role.indexOf("2") !== -1){
         return 'Team admin'
       } else {
         return 'Team member'
@@ -110,7 +110,7 @@ export default {
         <div class="type">{{ roles }}</div>
       </div>
       <el-menu :default-active="path" active-text-color="#1460F3" text-color="#232A40" router>
-        <div v-if="parseInt(role) === 1 || parseInt(role) === 2">
+        <div v-if="role.indexOf('2') !== -1 || role.indexOf('1') !== -1">
           <el-menu-item index="/dashboard">
             <Dashboard />
             <span>Dashboard</span>

+ 1 - 1
src/router/index.js

@@ -122,7 +122,7 @@ const router = new VueRouter({
 router.beforeEach((to, from, next) => {
   const whiteList = '/login'
   if (to.path !== whiteList && to.path !== '/creat' && to.path !== '/noadmin') {
-    if (parseInt(userStore().user.role) === 1 || parseInt(userStore().user.role) === 2) {
+    if (userStore().user.role.indexOf("2") !== -1 || userStore().user.role.indexOf("1") !== -1) {
       next()
     } else {
       next('/noadmin')

+ 3 - 2
src/views/Login.vue

@@ -86,8 +86,9 @@ export default {
                         userStore().setUserInfo(res.data.result)
                       }
                       if (
-                        parseInt(res.data.result.role) === 1 ||
-                        parseInt(res.data.result.role) === 2
+                        // parseInt(res.data.result.role) === 1 ||
+                        // parseInt(res.data.result.role) === 2
+                        res.data.result.role.indexOf("2") !== -1 || res.data.result.role.indexOf("1") !== -1
                       ) {
                         this.$router.push('/dashboard')
                       } else {

+ 1 - 1
src/views/ManageAdmin.vue

@@ -33,7 +33,7 @@ onMounted(() => {
 })
 //打开对话框
 const handleClick = (val) => {
-  if( memberRole === '1'){
+  if( memberRole.indexOf("1") !== -1){
     dialogVisible.value = true
     cancelEmail.value = val.email
   }

+ 1 - 1
src/views/MenageAdmin/addAdmin.vue

@@ -24,7 +24,7 @@ export default {
     },
     //提交添加表单
     submitFormSingle(){
-      if(this.click && this.memberRole === '1'){
+      if(this.click && this.memberRole.indexOf("1") !== -1){
         this.click = false
         const regEmail = /^([A-Za-z0-9_\-.])+@([A-Za-z0-9_\-.])+\.([A-Za-z]{2,4})$/
         if (this.formData.AdminEmail.trim() === '' || this.formData.TeamAdmin.length === 0) {

+ 1 - 1
src/views/MenageAdmin/editAdmin.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     // 提交表单
     submitForm () {
-      if(this.click && this.memberRole === '1'){
+      if(this.click && this.memberRole.indexOf("1") !== -1){
         this.click = false
         var urlencoded = new URLSearchParams()
         urlencoded.append("memberId", this.memberId)

+ 0 - 1
utils/request.js

@@ -21,7 +21,6 @@ instance.interceptors.request.use(
      *  config.headers.token = token
      * }
      */
-    console.log(config)
     if(!(config.url.indexOf("pdf-tech/vppMember/create") !== -1 || config.url.indexOf("/pdf-tech/login") !== -1)){
       const token = cookies.get('accessToken')
       config.headers.Authorization = 'Bearer ' + token