Bladeren bron

修改权限表示 admin-hq -> admin

xiewenjie 3 jaren geleden
bovenliggende
commit
200de467b5
2 gewijzigde bestanden met toevoegingen van 12 en 12 verwijderingen
  1. 10 10
      src/state/user.js
  2. 2 2
      src/view/user/index.vue

+ 10 - 10
src/state/user.js

@@ -46,15 +46,15 @@ export const setPermission = async (val,permissions) => {
     power = permissions&&permissions.map(element => element.replace('dept','organization'));
     let pubPermission = ['home', 'vrmodel', 'camera', 'teaching', 'dispatch'].map(key => ({
       children: [
-        { resourceKey: key + ':select' }, 
-        { resourceKey: key + ':update' }, 
-        { resourceKey: key + ':delete' }, 
+        { resourceKey: key + ':select' },
+        { resourceKey: key + ':update' },
+        { resourceKey: key + ':delete' },
         { resourceKey: key + ':add' }
       ],
       resourceKey: key
     }))
 
-     if (val === 'admin' || val==="admin-dept") {
+     if (val === 'admin' || val==="admin-dept" || val==="admin-super"  ) {
       pubPermission[pubPermission.length - 1].children.push(
         { resourceKey: 'dispatch:setting' }
       )
@@ -63,15 +63,15 @@ export const setPermission = async (val,permissions) => {
       )
 
       pubPermission.push({children: [
-          { resourceKey: 'user:select' }, 
-          { resourceKey: 'user:update' }, 
-          { resourceKey: 'user:delete' }, 
+          { resourceKey: 'user:select' },
+          { resourceKey: 'user:update' },
+          { resourceKey: 'user:delete' },
           { resourceKey: 'user:add' }
         ],
         resourceKey: 'user'
       })
     }
-    
+
     val = pubPermission.map(item => ({
       ...item,
       viewName: keyViewMap[item.resourceKey] || item.resourceKey
@@ -79,7 +79,7 @@ export const setPermission = async (val,permissions) => {
   } else {
     val = []
   }
-  
+
   user.value.permission = val
   user.value.roleKeyList = power
 }
@@ -96,4 +96,4 @@ export const setRoleKey = val => {
   user.value.roleKey = val
 }
 
-export default user
+export default user

+ 2 - 2
src/view/user/index.vue

@@ -118,9 +118,9 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="用户角色" class="roleName mandatory">
-         <com-role v-model="newData.roleId" style="width: 100%" allText="请选择" hideAll :notDefault="true" /> 
+         <com-role v-model="newData.roleId" style="width: 100%" allText="请选择" hideAll :notDefault="true" />
         </el-form-item>
-        <el-form-item label="所属架构:" v-if="user.roleKey == 'admin-hq'">
+        <el-form-item label="所属架构:" v-if="user.roleKey == 'admin'">
           <com-select v-model="newData.deptId" />
         </el-form-item>
         <el-form-item label="用户账号" class="mandatory">