diff --git a/ui/src/api/user/resource-authorization.ts b/ui/src/api/user/resource-authorization.ts index d7fcf3020..8df4b048b 100644 --- a/ui/src/api/user/resource-authorization.ts +++ b/ui/src/api/user/resource-authorization.ts @@ -3,25 +3,25 @@ import { get, put, post, del } from '@/request/index' import type { pageRequest } from '@/api/type/common' import type { Ref } from 'vue' -const prefix = '/workspace' +const prefix = '/workspace/' + localStorage.getItem('workspace_id') /** * 获取成员列表 * @query 参数 */ -const getUserList: (workspace_id: String) => Promise> = (workspace_id) => { - return get(`${prefix}/${workspace_id}/user_list`) +const getUserList: (loading?: Ref) => Promise> = (loading) => { + return get(`${prefix}/user_list`, undefined, loading) } /** * 获取资源权限 * @query 参数 */ -const getResourceAuthorization: (workspace_id: String, user_id: string) => Promise> = ( - workspace_id, - user_id, -) => { - return get(`${prefix}/${workspace_id}/user_resource_permission/user/${user_id}`) +const getResourceAuthorization: ( + user_id: string, + loading?: Ref, +) => Promise> = (user_id, loading) => { + return get(`${prefix}/user_resource_permission/user/${user_id}`, undefined, loading) } /** @@ -43,11 +43,11 @@ const getResourceAuthorization: (workspace_id: String, user_id: string) => Promi } */ const putResourceAuthorization: ( - workspace_id: String, user_id: string, body: any, -) => Promise> = (workspace_id, user_id, body) => { - return put(`${prefix}/${workspace_id}/user_resource_permission/user/${user_id}`, body) + loading?: Ref, +) => Promise> = (user_id, body, loading) => { + return put(`${prefix}/user_resource_permission/user/${user_id}`, body, loading) } export default { diff --git a/ui/src/components/app-charts/components/LineCharts.vue b/ui/src/components/app-charts/components/LineCharts.vue new file mode 100644 index 000000000..b4215c958 --- /dev/null +++ b/ui/src/components/app-charts/components/LineCharts.vue @@ -0,0 +1,135 @@ + + + diff --git a/ui/src/components/app-charts/index.vue b/ui/src/components/app-charts/index.vue new file mode 100644 index 000000000..e3b042bbc --- /dev/null +++ b/ui/src/components/app-charts/index.vue @@ -0,0 +1,30 @@ + + diff --git a/ui/src/views/resource-authorization/component/CreateMemberDialog.vue b/ui/src/views/resource-authorization/component/CreateMemberDialog.vue index 34ca81ef4..df85591db 100644 --- a/ui/src/views/resource-authorization/component/CreateMemberDialog.vue +++ b/ui/src/views/resource-authorization/component/CreateMemberDialog.vue @@ -21,7 +21,10 @@ @submit.prevent > - +