刘洋 2 年之前
父節點
當前提交
c8a960c155
共有 4 個文件被更改,包括 7 次插入3 次删除
  1. 2 2
      server.config.ts
  2. 2 0
      src/api/api-types/role.d.ts
  3. 2 0
      src/api/role.ts
  4. 1 1
      src/modules/expert/expert/index.vue

+ 2 - 2
server.config.ts

@@ -3,11 +3,11 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      // target: 'http://192.168.10.41:8200',
+      target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.178:8200',
       // target: 'http://192.168.10.108:8200',
       // target: 'http://cet-test.markingtool.cn',
-      target: 'http://192.168.10.136:80',
+      // target: 'http://192.168.10.136:80',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

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

@@ -11,6 +11,7 @@ export namespace Role {
   }
 
   type GetRoleList = BaseDefine<{ role?: ROLE }, RawRole[]>
+  type GetAllRoleList = BaseDefine<{ role?: ROLE }, RawRole[]>
   type GetRolePrivilege = BaseDefine<
     { role: ROLE },
     {
@@ -32,6 +33,7 @@ export namespace Role {
 
   export interface ApiMap {
     getRoleList: GetRoleList
+    getAllRoleList: GetAllRoleList
     getRolePrivilege: GetRolePrivilege
     setRolePrivilege: SetRolePrivilege
   }

+ 2 - 0
src/api/role.ts

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

+ 1 - 1
src/modules/expert/expert/index.vue

@@ -99,7 +99,7 @@ import type { MarkHeaderInstance, EpFormItem, EpTableColumn } from 'global-type'
 
 type RowType = ExtractMultipleApiResponse<'getExpertPickList'> & { index: number }
 const ROLE_OPTION = ref<any[]>([])
-useFetch('getRoleList')
+useFetch('getAllRoleList')
   .fetch()
   .then((res: any) => {
     ROLE_OPTION.value = res.map((item: any) => {