Explorar el Código

组长监控页面的角色列表改为新接口

刘洋 hace 1 año
padre
commit
a6cd1ae2a6

+ 1 - 0
src/api/api-types/role.d.ts

@@ -36,5 +36,6 @@ export namespace Role {
     getAllRoleList: GetAllRoleList
     getAllRoleList: GetAllRoleList
     getRolePrivilege: GetRolePrivilege
     getRolePrivilege: GetRolePrivilege
     setRolePrivilege: SetRolePrivilege
     setRolePrivilege: SetRolePrivilege
+    nomakerRoleList: any
   }
   }
 }
 }

+ 1 - 0
src/api/role.ts

@@ -6,6 +6,7 @@ const RoleApi: DefineApiModule<Role.ApiMap> = {
   getRoleList: '/api/role/list',
   getRoleList: '/api/role/list',
   /** 获取全部角色列表 */
   /** 获取全部角色列表 */
   getAllRoleList: '/api/role/list/all',
   getAllRoleList: '/api/role/list/all',
+  nomakerRoleList: '/api/role/list/nomarker',
   /** 获取角色权限 */
   /** 获取角色权限 */
   getRolePrivilege: '/api/role/privilege',
   getRolePrivilege: '/api/role/privilege',
   /** 设置角色权限 */
   /** 设置角色权限 */

+ 11 - 1
src/modules/analysis/group-monitoring/hooks/useFormFilter.ts

@@ -18,7 +18,17 @@ const useFormFilter = () => {
     isLeader,
     isLeader,
   } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
   } = useOptions(['subject', 'question', 'group'], undefined, true, true, true)
   const ROLE_OPTION = ref<any[]>([])
   const ROLE_OPTION = ref<any[]>([])
-  useFetch('getRoleList')
+  // useFetch('getRoleList')
+  //   .fetch()
+  //   .then((res: any) => {
+  //     ROLE_OPTION.value = res.map((item: any) => {
+  //       return {
+  //         value: item.code,
+  //         label: item.roleName,
+  //       }
+  //     })
+  //   })
+  useFetch('nomakerRoleList')
     .fetch()
     .fetch()
     .then((res: any) => {
     .then((res: any) => {
       ROLE_OPTION.value = res.map((item: any) => {
       ROLE_OPTION.value = res.map((item: any) => {