修改

src/api/Account.js

@@ -9,9 +9,9 @@
 import request from '@/utils/request'
 
 // 账号列表查询
-export function GetAccountList(params) {
+export function GetAccountList (params) {
   return request({
-    url: '/api/4A/GetUserList/v1',
+    url: '/api/fs4a/GetUserList/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -19,9 +19,9 @@ export function GetAccountList(params) {
 }
 
 // 账号状态变更
-export function ChangeUserStatus(params) {
+export function ChangeUserStatus (params) {
   return request({
-    url: '/api/4A/ChangeUserStatus/v1',
+    url: '/api/fs4a/ChangeUserStatus/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -29,9 +29,9 @@ export function ChangeUserStatus(params) {
 }
 
 // 账号删除
-export function delAccount(params) {
+export function delAccount (params) {
   return request({
-    url: '/api/4A/DeleteUser/v1',
+    url: '/api/fs4a/DeleteUser/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -39,9 +39,9 @@ export function delAccount(params) {
 }
 
 // 账号新增保存
-export function addAccount(params) {
+export function addAccount (params) {
   return request({
-    url: '/api/4A/SaveUser/v1',
+    url: '/api/fs4a/SaveUser/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -49,9 +49,9 @@ export function addAccount(params) {
 }
 
 // 账号详情查询
-export function getAccountDetails(params) {
+export function getAccountDetails (params) {
   return request({
-    url: '/api/4A/GetUserDetails/v1',
+    url: '/api/fs4a/GetUserDetails/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -59,9 +59,9 @@ export function getAccountDetails(params) {
 }
 
 // 账号编辑保存
-export function editAccount(params) {
+export function editAccount (params) {
   return request({
-    url: '/api/4A/EditUser/v1',
+    url: '/api/fs4a/EditUser/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -69,9 +69,9 @@ export function editAccount(params) {
 }
 
 // 根据账号组获取角色
-export function GetRoleByGroup(params) {
+export function GetRoleByGroup (params) {
   return request({
-    url: '/api/4A/GetRoleByGroup/v1',
+    url: '/api/fs4a/GetRoleByGroup/v1',
     method: 'post',
     data: params,
     proxy: true

src/api/AccountGroup.js

@@ -2,80 +2,80 @@ import request from '@/utils/request'
 
 // 账号组树查询
 export function GetGroupTree (params) {
-    return request({
-      url: '/api/4A/GetGroupTree/v1',
-      method: 'post',
-      data: params,
-      proxy: true
-    })
-  }
+  return request({
+    url: '/api/fs4a/GetGroupTree/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-  //账号组新增
-  export function SaveGroup(params){
-    return request({
-        url: '/api/4A/SaveGroup/v1',
-        method: 'post',
-        data: params,
-        proxy: true
-      })
-  }
+//账号组新增
+export function SaveGroup (params) {
+  return request({
+    url: '/api/fs4a/SaveGroup/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-    //账号组删除
-    export function DeleteGroup(params){
-        return request({
-            url: '/api/4A/DeleteGroup/v1',
-            method: 'post',
-            data: params,
-            proxy: true
-          })
-      }
+//账号组删除
+export function DeleteGroup (params) {
+  return request({
+    url: '/api/fs4a/DeleteGroup/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-  //账号组详情
-  export function GetGroupDetails(params){
-      return request({
-        url: '/api/4A/GetGroupDetails/v1',
-        method: 'post',
-        data: params,
-        proxy: true
-      })
-  }
+//账号组详情
+export function GetGroupDetails (params) {
+  return request({
+    url: '/api/fs4a/GetGroupDetails/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-    //账号组修改状态
-    export function ChangeGroupStatus(params){
-        return request({
-          url: '/api/4A/ChangeGroupStatus/v1',
-          method: 'post',
-          data: params,
-          proxy: true
-        })
-    }
+//账号组修改状态
+export function ChangeGroupStatus (params) {
+  return request({
+    url: '/api/fs4a/ChangeGroupStatus/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-    // 根据账号组获取权限树
-    export function GetAuthTreeByGroup(params){
-      return request({
-        url: '/api/4A/GetAuthTreeByGroup/v1',
-        method: 'post',
-        data: params,
-        proxy: true
-      })
-  }
+// 根据账号组获取权限树
+export function GetAuthTreeByGroup (params) {
+  return request({
+    url: '/api/fs4a/GetAuthTreeByGroup/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-      // 修改保存账号组
-      export function EditGroup(params){
-        return request({
-          url: '/api/4A/EditGroup/v1',
-          method: 'post',
-          data: params,
-          proxy: true
-        })
-    }
+// 修改保存账号组
+export function EditGroup (params) {
+  return request({
+    url: '/api/fs4a/EditGroup/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-    //根据账号组获取角色
-    export function GetRoleByGroup(params){
-      return request({
-        url: '/api/4A/GetRoleByGroup/v1',
-        method: 'post',
-        data: params,
-        proxy: true
-      })
-  }
+//根据账号组获取角色
+export function GetRoleByGroup (params) {
+  return request({
+    url: '/api/fs4a/GetRoleByGroup/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}

src/api/apiAuthority.js

@@ -11,7 +11,7 @@ import request from '@/utils/request'
 //权限树查询
 export function GetAuthTree (params) {
   return request({
-    url: '/api/4A/GetAuthTree/v1',
+    url: '/api/fs4a/GetAuthTree/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -21,7 +21,7 @@ export function GetAuthTree (params) {
 //应用新增保存
 export function SaveApp (params) {
   return request({
-    url: '/api/4A/SaveApp/v1',
+    url: '/api/fs4a/SaveApp/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -31,7 +31,7 @@ export function SaveApp (params) {
 //应用详情查询
 export function GetAppDetails (params) {
   return request({
-    url: '/api/4A/GetAppDetails/v1',
+    url: '/api/fs4a/GetAppDetails/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -41,7 +41,7 @@ export function GetAppDetails (params) {
 //应用修改保存
 export function EditApp (params) {
   return request({
-    url: '/api/4A/EditApp/v1',
+    url: '/api/fs4a/EditApp/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -51,7 +51,7 @@ export function EditApp (params) {
 //应用状态变更
 export function UpdateAppStatus (params) {
   return request({
-    url: '/api/4A/UpdateAppStatus/v1',
+    url: '/api/fs4a/UpdateAppStatus/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -61,7 +61,7 @@ export function UpdateAppStatus (params) {
 //应用删除
 export function DeleteApp (params) {
   return request({
-    url: '/api/4A/DeleteApp/v1',
+    url: '/api/fs4a/DeleteApp/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -72,7 +72,7 @@ export function DeleteApp (params) {
 //权限项修改保存
 export function EditAuth (params) {
   return request({
-    url: '/api/4A/EditAuth/v1',
+    url: '/api/fs4a/EditAuth/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -82,7 +82,7 @@ export function EditAuth (params) {
 //权限详情查询
 export function GetAuthDetails (params) {
   return request({
-    url: '/api/4A/GetAuthDetails/v1',
+    url: '/api/fs4a/GetAuthDetails/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -92,7 +92,7 @@ export function GetAuthDetails (params) {
 //根据权限获取授权规则
 export function GetAuthTo (params) {
   return request({
-    url: '/api/4A/GetAuthTo/v1',
+    url: '/api/fs4a/GetAuthTo/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -102,7 +102,7 @@ export function GetAuthTo (params) {
 //权限项新增保存
 export function SaveAuth (params) {
   return request({
-    url: '/api/4A/SaveAuth/v1',
+    url: '/api/fs4a/SaveAuth/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -112,7 +112,7 @@ export function SaveAuth (params) {
 //权限项删除
 export function DeleteAuth (params) {
   return request({
-    url: '/api/4A/DeleteAuth/v1',
+    url: '/api/fs4a/DeleteAuth/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -122,7 +122,7 @@ export function DeleteAuth (params) {
 //权限状态变更
 export function UpdateAuthStatus (params) {
   return request({
-    url: '/api/4A/UpdateAuthStatus/v1',
+    url: '/api/fs4a/UpdateAuthStatus/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -132,7 +132,7 @@ export function UpdateAuthStatus (params) {
 //角色新增保存
 export function SaveRole (params) {
   return request({
-    url: '/api/4A/SaveRole/v1',
+    url: '/api/fs4a/SaveRole/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -142,7 +142,7 @@ export function SaveRole (params) {
 //角色列表查询
 export function QueryRole (params) {
   return request({
-    url: '/api/4A/QueryRole/v1',
+    url: '/api/fs4a/QueryRole/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -152,7 +152,7 @@ export function QueryRole (params) {
 //账号列表查询
 export function GetUserList (params) {
   return request({
-    url: '/api/4A/GetUserList/v1',
+    url: '/api/fs4a/GetUserList/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -162,7 +162,7 @@ export function GetUserList (params) {
 //角色明细查询
 export function RoleDetails (params) {
   return request({
-    url: '/api/4A/RoleDetails/v1',
+    url: '/api/fs4a/RoleDetails/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -172,7 +172,7 @@ export function RoleDetails (params) {
 //角色权限列表
 export function RoleAuths (params) {
   return request({
-    url: '/api/4A/RoleAuths/v1',
+    url: '/api/fs4a/RoleAuths/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -182,7 +182,7 @@ export function RoleAuths (params) {
 //角色删除
 export function DeleteRole (params) {
   return request({
-    url: '/api/4A/DeleteRole/v1',
+    url: '/api/fs4a/DeleteRole/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -192,7 +192,7 @@ export function DeleteRole (params) {
 //角色编辑保存
 export function EditRole (params) {
   return request({
-    url: '/api/4A/EditRole/v1',
+    url: '/api/fs4a/EditRole/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -202,7 +202,7 @@ export function EditRole (params) {
 //角色状态变更
 export function UpdateStatus (params) {
   return request({
-    url: '/api/4A/UpdateStatus/v1',
+    url: '/api/fs4a/UpdateStatus/v1',
     method: 'post',
     data: params,
     proxy: true

src/api/apiHome.js

@@ -11,7 +11,7 @@ import request from '@/utils/request'
 //接入系统信息
 export function GetOthSystem (params) {
   return request({
-    url: '/api/4A/GetOthSystem/v1',
+    url: '/api/fs4a/GetOthSystem/v1',
     method: 'post',
     data: params
   })
@@ -20,7 +20,7 @@ export function GetOthSystem (params) {
 //账号信息分析
 export function GetUserAna (params) {
   return request({
-    url: '/api/4A/GetUserAna/v1',
+    url: '/api/fs4a/GetUserAna/v1',
     method: 'post',
     data: params
   })
@@ -29,7 +29,7 @@ export function GetUserAna (params) {
 //职员信息分析
 export function GetOfficerAna (params) {
   return request({
-    url: '/api/4A/GetOfficerAna/v1',
+    url: '/api/fs4a/GetOfficerAna/v1',
     method: 'post',
     data: params
   })
@@ -38,7 +38,7 @@ export function GetOfficerAna (params) {
 //角色信息分析
 export function GetRoleAna (params) {
   return request({
-    url: '/api/4A/GetRoleAna/v1',
+    url: '/api/fs4a/GetRoleAna/v1',
     method: 'post',
     data: params
   })
@@ -47,7 +47,7 @@ export function GetRoleAna (params) {
 //权限信息分析
 export function GetAuthAna (params) {
   return request({
-    url: '/api/4A/GetAuthAna/v1',
+    url: '/api/fs4a/GetAuthAna/v1',
     method: 'post',
     data: params
   })
@@ -56,7 +56,7 @@ export function GetAuthAna (params) {
 //修改密码
 export function EditPwd (params) {
   return request({
-    url: '/api/4A/EditPwd/v1',
+    url: '/api/fs4a/EditPwd/v1',
     method: 'post',
     data: params
   })
@@ -65,7 +65,7 @@ export function EditPwd (params) {
 //锁屏验证
 export function SsoLogin (params) {
   return request({
-    url: '/api/4A/SsoLogin/v1',
+    url: '/api/fs4a/SsoLogin/v1',
     method: 'post',
     data: params
   })

src/api/authGroupApi.js

@@ -2,30 +2,30 @@ import request from '@/utils/request'
 
 // 根据组织获取权限组
 export function GetGroupByOrgan (params) {
-    return request({
-      url: '/api/4A/GetGroupByOrgan/v1',
-      method: 'post',
-      data: params,
-      proxy: true
-    })
-  }
+  return request({
+    url: '/api/fs4a/GetGroupByOrgan/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-  //根据岗位获取权限组
-  export function GetGroupByJob(params){
-    return request({
-        url: '/api/4A/GetGroupByJob/v1',
-        method: 'post',
-        data: params,
-        proxy: true
-      })
-  }
+//根据岗位获取权限组
+export function GetGroupByJob (params) {
+  return request({
+    url: '/api/fs4a/GetGroupByJob/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 
-  //根据权限组获取权限列表
-  export function GroupAuths(params){
-    return request({
-      url: '/api/4A/GroupAuths/v1',
-      method: 'post',
-      data: params,
-      proxy: true
-    })
-  }
+//根据权限组获取权限列表
+export function GroupAuths (params) {
+  return request({
+    url: '/api/fs4a/GroupAuths/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}

src/api/jobApi.js

@@ -1,70 +1,70 @@
 import request from '@/utils/request'
 
 //岗位列表查询
-export function GetJobList(params) {
+export function GetJobList (params) {
   return request({
-    url: '/api/4A/GetJobList/v1',
+    url: '/api/fs4a/GetJobList/v1',
     method: 'post',
     data: params
   })
 }
 
 //新增岗位
-export function SaveJob(params) {
+export function SaveJob (params) {
   return request({
-    url: '/api/4A/SaveJob/v1',
+    url: '/api/fs4a/SaveJob/v1',
     method: 'post',
     data: params,
   })
 }
 //修改岗位状态
-export function ChangeJobStatus(params) {
+export function ChangeJobStatus (params) {
   return request({
-    url: '/api/4A/ChangeJobStatus/v1',
+    url: '/api/fs4a/ChangeJobStatus/v1',
     method: 'post',
     data: params,
   })
 }
 
 //编辑岗位
-export function EditJob(params) {
+export function EditJob (params) {
   return request({
-    url: '/api/4A/EditJob/v1',
+    url: '/api/fs4a/EditJob/v1',
     method: 'post',
     data: params,
   })
 }
 //删除岗位
-export function DeleteJob(params) {
+export function DeleteJob (params) {
   return request({
-    url: '/api/4A/DeleteJob/v1',
+    url: '/api/fs4a/DeleteJob/v1',
     method: 'post',
     data: params,
   })
 }
 
 //根据岗位获取权限
-export function GetAuthTreeByJob(params) {
+export function GetAuthTreeByJob (params) {
   return request({
-    url: '/api/4A/GetAuthTreeByJob/v1',
+    url: '/api/fs4a/GetAuthTreeByJob/v1',
     method: 'post',
     data: params,
   })
 }
 
 //岗位详情
-export function GetJobDetails(params) {
+export function GetJobDetails (params) {
   return request({
-    url: '/api/4A/GetJobDetails/v1',
+    url: '/api/fs4a/GetJobDetails/v1',
     method: 'post',
     data: params,
   })
 }
 
 //根据岗位获取角色
-export function GetRoleByJob(params) {
+export function GetRoleByJob (params) {
   return request({
-    url: '/api/4A/GetRoleByJob/v1',
+    url: '/api/fs4a/GetRoleByJob/v1',
     method: 'post',
     data: params,
   })

src/api/login.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //获取动态验证码
 export function GetCheckCode (params) {
     return request({
-        url: '/api/4A/GetCheckCode/v1',
+        url: '/api/fs4a/GetCheckCode/v1',
         method: 'post',
         data: params
     })
@@ -12,7 +12,7 @@ export function GetCheckCode (params) {
 //登录
 export function login (params) {
     return request({
-        url: '/api/4A/Login/v1',
+        url: '/api/fs4a/Login/v1',
         method: 'post',
         data: params
     })
@@ -21,7 +21,7 @@ export function login (params) {
 //登出
 export function loginUp (params) {
     return request({
-        url: '/api/4A/Logout/v1',
+        url: '/api/fs4a/Logout/v1',
         method: 'post',
         data: params
     })
@@ -30,7 +30,7 @@ export function loginUp (params) {
 //忘记密码
 export function changePassword (params) {
     return request({
-        url: '/api/4A/ForgetPwd/v1',
+        url: '/api/fs4a/ForgetPwd/v1',
         method: 'post',
         data: params
     })
@@ -39,7 +39,7 @@ export function changePassword (params) {
 //权限获取
 export function permission (params) {
     return request({
-        url: '/api/4A/GetAuth/v1',
+        url: '/api/fs4a/GetAuth/v1',
         method: 'post',
         data: params
     })

src/api/postInterface.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //岗位列表查询
 export function postList (params) {
     return request({
-        url: '/api/4A/GetJobList/v1',
+        url: '/api/fs4a/GetJobList/v1',
         method: 'post',
         data: params
     })
@@ -12,7 +12,7 @@ export function postList (params) {
 //组织树查询
 export function tissueTreeList (params) {
     return request({
-        url: '/api/4A/GetOrganTree/v1',
+        url: '/api/fs4a/GetOrganTree/v1',
         method: 'post',
         data: params,
     })
@@ -20,7 +20,7 @@ export function tissueTreeList (params) {
 //组织树状态
 export function tissueTreeStart (params) {
     return request({
-        url: '/api/4A/ChangeOrganStatus/v1',
+        url: '/api/fs4a/ChangeOrganStatus/v1',
         method: 'post',
         data: params,
     })
@@ -28,7 +28,7 @@ export function tissueTreeStart (params) {
 //职员查询
 export function staffList (params) {
     return request({
-        url: '/api/4A/GetOfficerList/v1',
+        url: '/api/fs4a/GetOfficerList/v1',
         method: 'post',
         data: params,
     })
@@ -37,7 +37,7 @@ export function staffList (params) {
 //职员状态
 export function staffStart (params) {
     return request({
-        url: '/api/4A/ChangeOfficerStatus/v1',
+        url: '/api/fs4a/ChangeOfficerStatus/v1',
         method: 'post',
         data: params,
     })
@@ -46,7 +46,7 @@ export function staffStart (params) {
 //删除职员
 export function staffListele (params) {
     return request({
-        url: '/api/4A/DeleteOfficer/v1',
+        url: '/api/fs4a/DeleteOfficer/v1',
         method: 'post',
         data: params,
     })
@@ -54,7 +54,7 @@ export function staffListele (params) {
 //新增岗位
 export function newPostUp (params) {
     return request({
-        url: '/api/4A/SaveJob/v1',
+        url: '/api/fs4a/SaveJob/v1',
         method: 'post',
         data: params,
     })
@@ -62,7 +62,7 @@ export function newPostUp (params) {
 //岗位状态
 export function PostSatrt (params) {
     return request({
-        url: '/api/4A/ChangeJobStatus/v1',
+        url: '/api/fs4a/ChangeJobStatus/v1',
         method: 'post',
         data: params,
     })
@@ -71,7 +71,7 @@ export function PostSatrt (params) {
 //编辑岗位
 export function PostSatrtmod (params) {
     return request({
-        url: '/api/4A/EditJob/v1',
+        url: '/api/fs4a/EditJob/v1',
         method: 'post',
         data: params,
     })
@@ -79,7 +79,7 @@ export function PostSatrtmod (params) {
 //删除岗位
 export function PostUpele (params) {
     return request({
-        url: '/api/4A/DeleteJob/v1',
+        url: '/api/fs4a/DeleteJob/v1',
         method: 'post',
         data: params,
     })
@@ -89,7 +89,7 @@ export function PostUpele (params) {
 //新增组织
 export function newOrgan (params) {
     return request({
-        url: '/api/4A/SaveOrgan/v1',
+        url: '/api/fs4a/SaveOrgan/v1',
         method: 'post',
         data: params,
     })
@@ -98,7 +98,7 @@ export function newOrgan (params) {
 //编辑组织
 export function newOrganmod (params) {
     return request({
-        url: '/api/4A/EditOrgan/v1',
+        url: '/api/fs4a/EditOrgan/v1',
         method: 'post',
         data: params,
     })
@@ -108,7 +108,7 @@ export function newOrganmod (params) {
 //组织详情
 export function newOrganall (params) {
     return request({
-        url: '/api/4A/GetOrganDetails/v1',
+        url: '/api/fs4a/GetOrganDetails/v1',
         method: 'post',
         data: params,
     })
@@ -118,7 +118,7 @@ export function newOrganall (params) {
 //新增职员
 export function newstaff (params) {
     return request({
-        url: '/api/4A/SaveOfficer/v1',
+        url: '/api/fs4a/SaveOfficer/v1',
         method: 'post',
         data: params,
     })
@@ -126,7 +126,7 @@ export function newstaff (params) {
 //职员详情
 export function Staffdetails (params) {
     return request({
-        url: '/api/4A/GetOfficerDetails/v1',
+        url: '/api/fs4a/GetOfficerDetails/v1',
         method: 'post',
         data: params,
     })
@@ -134,7 +134,7 @@ export function Staffdetails (params) {
 //编辑职员
 export function newstaffmod (params) {
     return request({
-        url: '/api/4A/EditOfficer/v1',
+        url: '/api/fs4a/EditOfficer/v1',
         method: 'post',
         data: params,
     })
@@ -143,7 +143,7 @@ export function newstaffmod (params) {
 //根据组织获取权限
 export function organizationUptree (params) {
     return request({
-        url: '/api/4A/GetAuthTreeByOrgan/v1',
+        url: '/api/fs4a/GetAuthTreeByOrgan/v1',
         method: 'post',
         data: params,
     })
@@ -151,7 +151,7 @@ export function organizationUptree (params) {
 //根据岗位获取权限
 export function postUptree (params) {
     return request({
-        url: '/api/4A/GetAuthTreeByJob/v1',
+        url: '/api/fs4a/GetAuthTreeByJob/v1',
         method: 'post',
         data: params,
     })
@@ -160,7 +160,7 @@ export function postUptree (params) {
 //岗位详情
 export function jbdetails (params) {
     return request({
-        url: '/api/4A/GetJobDetails/v1',
+        url: '/api/fs4a/GetJobDetails/v1',
         method: 'post',
         data: params,
     })
@@ -169,7 +169,7 @@ export function jbdetails (params) {
 //根据岗位获取角色
 export function jbdetpop (params) {
     return request({
-        url: '/api/4A/GetRoleByJob/v1',
+        url: '/api/fs4a/GetRoleByJob/v1',
         method: 'post',
         data: params,
     })
@@ -178,7 +178,7 @@ export function jbdetpop (params) {
 //组织获取角色
 export function organpop (params) {
     return request({
-        url: '/api/4A/GetRoleByOrgan/v1',
+        url: '/api/fs4a/GetRoleByOrgan/v1',
         method: 'post',
         data: params,
     })
@@ -187,7 +187,7 @@ export function organpop (params) {
 //组织删除
 export function organele (params) {
     return request({
-        url: '/api/4A/DeleteOrgan/v1',
+        url: '/api/fs4a/DeleteOrgan/v1',
         method: 'post',
         data: params,
     })
@@ -196,7 +196,7 @@ export function organele (params) {
 //根据组织查询岗位列表
 export function organgitpost (params) {
     return request({
-        url: '/api/4A/GetJobListByOrgan/v1',
+        url: '/api/fs4a/GetJobListByOrgan/v1',
         method: 'post',
         data: params,
     })

src/api/systemConfiguration.js

@@ -2,17 +2,17 @@ import request from '@/utils/request'
 
 //登录策略详情查询
 export function GetTacDetails (params) {
-    return request({
-      url: '/api/4A/GetTacDetails/v1',
-      method: 'post',
-      data: params,
-      proxy: true
-    })
-  }
+  return request({
+    url: '/api/fs4a/GetTacDetails/v1',
+    method: 'post',
+    data: params,
+    proxy: true
+  })
+}
 //登录策略列表查询
 export function GetTacList (params) {
   return request({
-    url: '/api/4A/GetTacList/v1',
+    url: '/api/fs4a/GetTacList/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -22,7 +22,7 @@ export function GetTacList (params) {
 //登录策略新增
 export function SaveTac (params) {
   return request({
-    url: '/api/4A/SaveTac/v1',
+    url: '/api/fs4a/SaveTac/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -32,7 +32,7 @@ export function SaveTac (params) {
 //登录策略编辑
 export function EditTac (params) {
   return request({
-    url: '/api/4A/EditTac/v1',
+    url: '/api/fs4a/EditTac/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -42,7 +42,7 @@ export function EditTac (params) {
 //登录策略删除
 export function DeleteTac (params) {
   return request({
-    url: '/api/4A/DeleteTac/v1',
+    url: '/api/fs4a/DeleteTac/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -52,7 +52,7 @@ export function DeleteTac (params) {
 //获取系统基础设置
 export function GetSystemSet (params) {
   return request({
-    url: '/api/4A/GetSystemSet/v1',
+    url: '/api/fs4a/GetSystemSet/v1',
     method: 'post',
     data: params,
     proxy: true
@@ -62,7 +62,7 @@ export function GetSystemSet (params) {
 //保存系统基础设置
 export function SaveSystemSet (params) {
   return request({
-    url: '/api/4A/SaveSystemSet/v1',
+    url: '/api/fs4a/SaveSystemSet/v1',
     method: 'post',
     data: params,
     proxy: true

src/components/permissiontree/index.vue

@@ -40,37 +40,14 @@
       </div> -->
       <div class="paren_cont">
         <el-scrollbar style="height: 100%">
-          <el-tree
-            :data="data"
-            show-checkbox
-            :check-strictly="true"
-            @check-change="currentChange"
-            @node-click="handleNodeClick"
-            :defaultProps="defaultProps"
-            :expand-on-click-node="false"
-            node-key="AuthId"
-            default-expand-all
-            ref="tree"
-            highlight-current
-          >
+          <el-tree :data="data" show-checkbox :check-strictly="true" @check-change="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="AuthId" default-expand-all ref="tree" highlight-current>
             <span class="custom-tree-node" slot-scope="{ data }">
               {{ data.AuthName }}
               <div class="logup">
-                <div
-                  class="one"
-                  v-if="data.AuthList && data.AuthList.ValidBegin"
-                ></div>
-                <div
-                  class="two"
-                  v-if="data.AuthList && data.AuthList.Action == '1'"
-                ></div>
-                <div
-                  class="four"
-                  v-if="data.AuthList && data.AuthList.Action == '2'"
-                ></div>
-                <div
-                  class="three"
-                  v-if="
+                <div class="one" v-if="data.AuthList && data.AuthList.ValidBegin"></div>
+                <div class="two" v-if="data.AuthList && data.AuthList.Action == '1'"></div>
+                <div class="four" v-if="data.AuthList && data.AuthList.Action == '2'"></div>
+                <div class="three" v-if="
                     data.AuthList &&
                     (data.AuthList.EditCol ||
                       data.AuthList.DeleteRow ||
@@ -78,8 +55,7 @@
                       data.AuthList.NewCol ||
                       data.AuthList.QueryCol ||
                       data.AuthList.QueryRow)
-                  "
-                ></div>
+                  "></div>
               </div>
             </span>
           </el-tree>
@@ -121,7 +97,7 @@ export default {
       default: true,
     },
   },
-  data() {
+  data () {
     return {
       active: 0,
       data: [],
@@ -137,19 +113,19 @@ export default {
       checkedList: [], //选中的列表
       oldType: "",
       queryIdArr: [], //历史查询ID
-      MainJobId:"",//主岗ID
+      MainJobId: "",//主岗ID
     };
   },
   watch: {
     checkedKeys: {
-      handler(val) {
+      handler (val) {
         this.checkedList = val;
         this.$refs.tree.setCheckedKeys(val);
       },
       deep: true,
     },
     "$store.state.auth.authList": {
-      handler(val) {
+      handler (val) {
         this.AuthList = val;
         this.resetData();
       },
@@ -157,16 +133,16 @@ export default {
       deep: true,
     },
     queryId: {
-      handler(val) {
+      handler (val) {
         if (this.queryType == "job") {
           this.setDisabledAll();
           let ids = val.split(",");
           this.queryIdArr = [];
           this.$refs.tree.setCheckedKeys([]);
-          if(this.isMainJob == true){
+          if (this.isMainJob == true) {
             this.MainJobId = val;
           }
-          if(this.MainJobId!=""){
+          if (this.MainJobId != "") {
             this.queryIdArr.push(this.MainJobId);
           }
           for (let i = 0; i < ids.length; i++) {
@@ -192,13 +168,13 @@ export default {
   },
   methods: {
     //获取权限列表
-    getDataList() {
+    getDataList () {
       GetAuthTree({ QueryName: "" }).then((result) => {
         this.getDefaultDataList();
         this.setData(result);
       });
     },
-    async getDefaultDataList() {
+    async getDefaultDataList () {
       if (this.queryType == "all" && this.searchId != "") {
         //获取全部权限树
         GetAuthTree({ QueryName: "" }).then((result) => {
@@ -223,13 +199,13 @@ export default {
         });
       }
     },
-    setData(result) {
+    setData (result) {
       if (result.code === 0 && result.returnData.length) {
         this.AuthArrList = [];
         result.returnData.forEach((item) => {
           item.flag = item.Status === 1 ? true : false;
           item["AuthList"] = null;
-          if(this.queryType!="all"){
+          if (this.queryType != "all") {
             item["disabled"] = true;
           }
         });
@@ -240,7 +216,7 @@ export default {
       }
     },
     //数据转树形
-    toTree() {
+    toTree () {
       this.data = [];
       this.dataObj = {};
       this.treeTitles = [];
@@ -254,7 +230,7 @@ export default {
         Status: 0,
         UpAuthId: 0,
         Type: 0,
-        disabled:true,
+        disabled: true,
         children: arr,
       };
       this.dataObj = _.cloneDeep(items);
@@ -274,24 +250,24 @@ export default {
       }
     },
     //数据切换
-    upActive(item, index) {
+    upActive (item, index) {
       this.active = index;
       this.decompose([this.dataObj], item.AuthId);
       this.$refs.tree.setCheckedKeys(this.checkedList);
     },
     // 树节点选中
-    currentChange() {
+    currentChange () {
       this.checkedList = [];
       const arr = this.$refs.tree.getCheckedNodes();
       arr.forEach((item) => {
         // if(item.disabled==false){
-          this.checkedList.push(item.AuthId);
+        this.checkedList.push(item.AuthId);
         // }
       });
       this.setDataObj(arr);
     },
     // 选中后设置初始数据
-    setDataObj(arr) {
+    setDataObj (arr) {
       arr.forEach((item) => {
         if (!item.AuthList) {
           item.AuthList = {
@@ -308,10 +284,10 @@ export default {
           };
         }
       });
-      this.$emit("get-tree-data", arr);
+      this.$emit("getTreeData", arr);
     },
     //获取指定数据
-    decompose(data, id) {
+    decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].AuthId == id) {
           this.data = [data[i]];
@@ -321,7 +297,7 @@ export default {
       }
     },
     //获取权限规则 从新组合数据
-    resetData() {
+    resetData () {
       if (this.AuthList) {
         this.AuthArrList.forEach((item1) => {
           item1["AuthList"] = null;
@@ -334,14 +310,14 @@ export default {
       }
       this.toTree();
     },
-    setUnDisabledData(data) {
+    setUnDisabledData (data) {
       const ArrData = _.cloneDeep(data);
       this.AuthArrList.forEach((item1) => {
         if (this.queryType != "job") {
           item1.disabled = true;
         }
         ArrData.forEach((item2) => {
-          if (item1.AuthId == item2.AuthId&&item1.Type!=1) {
+          if (item1.AuthId == item2.AuthId && item1.Type != 1) {
             item1.disabled = false;
           }
         });
@@ -349,7 +325,7 @@ export default {
       this.toTree();
     },
     //获取点击目标
-    handleNodeClick(data) {
+    handleNodeClick (data) {
       // this.toTree();
       const arr = this.$store.getters.authArrs;
       arr.push(data);
@@ -359,8 +335,8 @@ export default {
       this.$store.dispatch("auth/changeAuthArrs", datas);
       this.$store.dispatch("auth/changeAuthId", data.AuthId);
     },
-    async setDisabledAll(){
-      this.AuthArrList.forEach(item=>{
+    async setDisabledAll () {
+      this.AuthArrList.forEach(item => {
         item.disabled = true;
       })
     }

src/components/rolelist/index.vue

@@ -192,7 +192,7 @@ export default {
     // 选中
     handleBg (item, i) {
       this.msg = i;
-      this.$emit("check-click", item);
+      this.$emit("checkClick", item);
     },
     //多选框
     checkChange (arr) {
@@ -200,11 +200,11 @@ export default {
       // if (this.roleType == 'account') {
       //   datas = this.formatChecks(arr, 'UserId');
       // }
-      this.$emit("check-change", datas);
+      this.$emit("checkChange", datas);
     },
     //单选框
     radioChange (val) {
-      this.$emit("radio-change", val);
+      this.$emit("radioChange", val);
     },
     //格式化选中回调
     formatChecks (arr, key) {

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-02-15 15:20:52
+ * @LastEditTime: 2022-02-16 09:58:30
  * @LastEditors: Please set LastEditors
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -35,7 +35,7 @@
         <Rulesofcompetency @getData="getData" title="权限规则" />
       </div>
       <div class="flex1 part">
-        <Rolelist @checkChange="checkChange" @checkClick="checkClick" :imageSize="80" :dataList="arrs" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Rolelist @checkChange="checkChange" @checkClick="checkClick" :imageSize="80" :roleType="roleType" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
         <Permissionlist v-loading="permission" :imageSize="80" :RoleList="RoleList" :check="true" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>
     </div>
@@ -75,6 +75,7 @@ export default {
       defRoleId: null,
       AuthObj: {},
       treeData: [],
+      roleType: ''
     };
   },
   watch: {
@@ -88,8 +89,8 @@ export default {
       deep: true,
     },
   },
-  created () {
-    //this.getAuthTree();
+  mounted () {
+    this.roleType = 'onlyRole';
   },
   methods: {
     //获取权限树回调
@@ -102,19 +103,11 @@ export default {
     },
     //互斥角色选中回调
     checkChange (arr) {
-      const datas = [];
       const arrs = [];
-      this.arrs.forEach((item, index) => {
-        arr.forEach((p) => {
-          if (index === p) {
-            datas.push(item);
-          }
-        });
-      });
-      datas.forEach((item) => {
+      arr.forEach((item) => {
         const obj = {
           DefRoleId: item.RoleId,
-          IsSelected: item.IsDef,
+          IsSelected: 1,
           DefRoleName: item.RoleName,
         };
         arrs.push(obj);
@@ -130,7 +123,7 @@ export default {
       try {
         this.permission = true;
         let params = {
-          RoleId: id,
+          RoleIds: [id],
         };
         const res = await RoleAuths(params);
         if (res.code === 0) {

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 16:31:31
- * @LastEditTime: 2022-02-15 15:19:50
+ * @LastEditTime: 2022-02-16 10:10:54
  * @LastEditors: Please set LastEditors
  * @Description: 新增/编辑角色
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRoleStatus.vue
@@ -43,7 +43,7 @@
         <Rulesofcompetency v-loading="loading" element-loading-text="数据加载中" :authList="authList" :authTo="authTo" title="权限规则" />
       </div>
       <div class="flex1 part">
-        <Rolelist v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :dataList="arrs" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Rolelist v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
         <Permissionlist v-loading="permission" element-loading-text="数据加载中" :check="true" :imageSize="80" :RoleList="RoleList" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>
     </div>
@@ -89,43 +89,9 @@ export default {
       authList: [],
       authId: [],
       type: null, //参数类型
+      roleType: ''
     };
   },
-  watch: {
-    arrs: {
-      handler (arr) {
-        arr.forEach((item) => {
-          item.name = item.RoleName;
-        });
-        this.checkedKeys = this.authId;
-        this.arrs = arr;
-        this.loading = false;
-      },
-      deep: true,
-    },
-    defRoleId: {
-      handler (arr) {
-        const datas = [];
-        const arrs = [];
-        this.arrs.forEach((item, index) => {
-          arr.forEach((p) => {
-            if (item.RoleId === p.DefRoleId) {
-              const obj = {
-                DefRoleId: item.RoleId,
-                IsSelected: item.IsDef,
-                DefRoleName: item.RoleName,
-              };
-              arrs.push(obj);
-              datas.push(index);
-            }
-          });
-        });
-        this.radioCheck = datas;
-        this.checkedBoxs = arrs;
-      },
-      deep: true,
-    },
-  },
   created () {
     //this.getAuthTree();
     const { RoleId, Status } = this.$route.query;
@@ -133,6 +99,9 @@ export default {
     this.Status = Status;
     this.roleDetails(RoleId);
   },
+  mounted () {
+    this.roleType = 'onlyRole';
+  },
   methods: {
     //角色明细
     async roleDetails (id) {
@@ -156,7 +125,11 @@ export default {
             this.authTo = AuthList[0];
           }
           if (DefRoleList && DefRoleList.length) {
-            this.defRoleId = DefRoleList;
+            this.checkedBoxs = DefRoleList;
+            DefRoleList.forEach(item => {
+              item.RoleId = item.DefRoleId
+            })
+            this.radioCheck = DefRoleList;
             this.roleAuths(DefRoleList[0].DefRoleId);
           }
           this.loading = false;
@@ -183,16 +156,8 @@ export default {
     },
     //互斥角色选中回调
     checkChange (arr) {
-      const datas = [];
       const arrs = [];
-      this.arrs.forEach((item, index) => {
-        arr.forEach((p) => {
-          if (index === p) {
-            datas.push(item);
-          }
-        });
-      });
-      datas.forEach((item) => {
+      arr.forEach((item) => {
         const obj = {
           DefRoleId: item.RoleId,
           IsSelected: 1,