diff --git a/.dockerignore b/.dockerignore index 92c02acca..305b3d81b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ -.git* \ No newline at end of file +.git* +.idea* diff --git a/.gitignore b/.gitignore index 7e6be9bfb..69ccc46e2 100644 --- a/.gitignore +++ b/.gitignore @@ -180,4 +180,3 @@ apps/static models/ data .dev -poetry.lock diff --git a/apps/common/constants/permission_constants.py b/apps/common/constants/permission_constants.py index 2d08e0c40..6484897c7 100644 --- a/apps/common/constants/permission_constants.py +++ b/apps/common/constants/permission_constants.py @@ -11,7 +11,7 @@ from typing import List class Group(Enum): """ - 权限组 一个组一般对应前段一个菜单 + 权限组 一个组一般对应前端一个菜单 """ USER = "USER" diff --git a/main.py b/main.py index f925b09f8..0f5e744fe 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ django.setup() def collect_static(): """ 收集静态文件到指定目录 - 本项目主要是将前段vue/dist的前段项目放到静态目录下面 + 本项目主要是将前端vue/dist的前段项目放到静态目录下面 :return: """ logging.info("Collect static files") diff --git a/ui/src/api/log.ts b/ui/src/api/log.ts index 77131fff6..1904e96b0 100644 --- a/ui/src/api/log.ts +++ b/ui/src/api/log.ts @@ -6,7 +6,7 @@ import { type Ref } from 'vue' const prefix = '/application' /** * 对话日志 - * @param 参数 + * @param 参数 * application_id, history_day * page { "current_page": "string", @@ -18,37 +18,37 @@ const prefix = '/application' } */ const getChatLog: ( - applicaiton_id: String, + application_id: String, page: pageRequest, param: any, loading?: Ref -) => Promise> = (applicaiton_id, page, param, loading) => { +) => Promise> = (application_id, page, param, loading) => { return get( - `${prefix}/${applicaiton_id}/chat/${page.current_page}/${page.page_size}`, + `${prefix}/${application_id}/chat/${page.current_page}/${page.page_size}`, param, loading ) } const exportChatLog: ( - applicaiton_id: string, - applicantion_name: string, + application_id: string, + application_name: string, param: any, loading?: Ref -) => void = (applicaiton_id, applicantion_name, param, loading) => { - exportExcel(applicantion_name, `${prefix}/${applicaiton_id}/chat/export`, param, loading) +) => void = (application_id, application_name, param, loading) => { + exportExcel(application_name, `${prefix}/${application_id}/chat/export`, param, loading) } /** * 删除日志 - * @param 参数 applicaiton_id, chat_id, + * @param 参数 application_id, chat_id, */ const delChatLog: ( - applicaiton_id: string, + application_id: string, chat_id: string, loading?: Ref -) => Promise> = (applicaiton_id, chat_id, loading) => { - return del(`${prefix}/${applicaiton_id}/chat/${chat_id}`, undefined, {}, loading) +) => Promise> = (application_id, chat_id, loading) => { + return del(`${prefix}/${application_id}/chat/${chat_id}`, undefined, {}, loading) } /** @@ -61,13 +61,13 @@ const delChatLog: ( } */ const getChatRecordLog: ( - applicaiton_id: String, + application_id: String, chart_id: String, page: pageRequest, loading?: Ref -) => Promise> = (applicaiton_id, chart_id, page, loading) => { +) => Promise> = (application_id, chart_id, page, loading) => { return get( - `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`, + `${prefix}/${application_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`, undefined, loading ) @@ -83,7 +83,7 @@ const getChatRecordLog: ( } */ const putChatRecordLog: ( - applicaiton_id: String, + application_id: String, chart_id: String, chart_record_id: String, dataset_id: String, @@ -91,7 +91,7 @@ const putChatRecordLog: ( data: any, loading?: Ref ) => Promise> = ( - applicaiton_id, + application_id, chart_id, chart_record_id, dataset_id, @@ -100,7 +100,7 @@ const putChatRecordLog: ( loading ) => { return put( - `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve`, + `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve`, data, undefined, loading @@ -113,13 +113,13 @@ const putChatRecordLog: ( * application_id, chart_id, chart_record_id */ const getMarkRecord: ( - applicaiton_id: String, + application_id: String, chart_id: String, chart_record_id: String, loading?: Ref -) => Promise> = (applicaiton_id, chart_id, chart_record_id, loading) => { +) => Promise> = (application_id, chart_id, chart_record_id, loading) => { return get( - `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/improve`, + `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/improve`, undefined, loading ) @@ -131,7 +131,7 @@ const getMarkRecord: ( * application_id, chart_id, chart_record_id, dataset_id, document_id,paragraph_id */ const delMarkRecord: ( - applicaiton_id: String, + application_id: String, chart_id: String, chart_record_id: String, dataset_id: String, @@ -139,7 +139,7 @@ const delMarkRecord: ( paragraph_id: String, loading?: Ref ) => Promise> = ( - applicaiton_id, + application_id, chart_id, chart_record_id, dataset_id, @@ -148,7 +148,7 @@ const delMarkRecord: ( loading ) => { return del( - `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve/${paragraph_id}`, + `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve/${paragraph_id}`, undefined, {}, loading @@ -161,13 +161,13 @@ const delMarkRecord: ( * application_id, chart_id, chart_record_id */ const getRecordDetail: ( - applicaiton_id: String, + application_id: String, chart_id: String, chart_record_id: String, loading?: Ref -) => Promise> = (applicaiton_id, chart_id, chart_record_id, loading) => { +) => Promise> = (application_id, chart_id, chart_record_id, loading) => { return get( - `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}`, + `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}`, undefined, loading ) diff --git a/ui/src/utils/utils.ts b/ui/src/utils/utils.ts index 370b7efbc..c431d1ad7 100644 --- a/ui/src/utils/utils.ts +++ b/ui/src/utils/utils.ts @@ -79,5 +79,5 @@ export function getAttrsArray(array: Array, attr: string) { // 求和 export function getSum(array: Array) { - return array.reduce((totol, item) => totol + item, 0) + return array.reduce((total, item) => total + item, 0) } diff --git a/ui/src/views/user-manage/component/UserDialog.vue b/ui/src/views/user-manage/component/UserDialog.vue index 997d9bd4c..998531983 100644 --- a/ui/src/views/user-manage/component/UserDialog.vue +++ b/ui/src/views/user-manage/component/UserDialog.vue @@ -53,10 +53,9 @@