diff --git a/apps/admin/.env.dev b/apps/admin/.env.dev index 75238fd..e559977 100644 --- a/apps/admin/.env.dev +++ b/apps/admin/.env.dev @@ -3,9 +3,9 @@ # VITE_SERVICE_BASE_URL=http://192.168.5.140:9999 -VITE_SERVICE_BASE_URL=http://api.ydzx.qyzhjy.com +# VITE_SERVICE_BASE_URL=http://api.ydzx.qyzhjy.com -# VITE_SERVICE_BASE_URL=https://172.16.10.130:5000 +VITE_SERVICE_BASE_URL=http://172.16.10.130:5000 VITE_OTHER_SERVICE_BASE_URL= `{ "demo": "http://localhost:9528" diff --git a/apps/admin/src/enum/business.ts b/apps/admin/src/enum/business.ts index fdd3069..0bd8c31 100644 --- a/apps/admin/src/enum/business.ts +++ b/apps/admin/src/enum/business.ts @@ -21,11 +21,17 @@ export enum QuestionType { } export enum QuestionCategoryEnum { - ChineseCharacterDictation1 = 'ChineseCharacterDictation1', // 汉字听写-提示 (jiu表示小鸟的叫声) - ChineseCharacterDictation2 = 'ChineseCharacterDictation2', // 根据拼音写汉字-提示 (tang) - CharacterRadicalAddition = 'CharacterRadicalAddition', // 汉字加一加 (车) - WordDictation = 'WordDictation', // 词语听写 (zhi re) - IdiomWriting1 = 'IdiomWriting1', // 成语-文字要求 (反义字) - IdiomWriting2 = 'IdiomWriting2', // 成语-文字要求 (看图写成语) - PoetryComprehension = 'PoetryComprehension', // 诗词理解-选择题 + ChineseCharacterDictation1 = 'ChineseCharacterDictation1', // 1. 汉字听写-提示 (jiu表示小鸟的叫声) + ChineseCharacterDictation2 = 'ChineseCharacterDictation2', // 2. 根据拼音写汉字-提示 (tang) + CharacterRadicalAddition = 'CharacterRadicalAddition', // 3. 汉字加一加 (车) + WordDictation = 'WordDictation', // 4. 词语听写 (zhi re) + IdiomWriting1 = 'IdiomWriting1', // 5. 成语-文字要求 + IdiomWriting2 = 'IdiomWriting2', // 6. 成语-文字要求 (看图写成语) + PoetryComprehension = 'PoetryComprehension', // 7. 诗词理解-选择题 + ReversePoemMatching = 'ReversePoemMatching', // 8. 逆向接诗句 + SceneBasedPoemGuessing = 'SceneBasedPoemGuessing', // 9. 场景猜诗句 + AssociationMatching = 'AssociationMatching', // 10. 联想对对碰 + CharacterWordFlowerDrinkingGame = 'CharacterWordFlowerDrinkingGame', // 11. 字词飞花令 + PoetryCommonKnowledge = 'PoetryCommonKnowledge', // 12. 诗词常识 + ChangeWords = 'ChangeWords', // 13. 换字组成语 } diff --git a/apps/admin/src/service/api/question.ts b/apps/admin/src/service/api/question.ts index 78c0f64..6244b03 100644 --- a/apps/admin/src/service/api/question.ts +++ b/apps/admin/src/service/api/question.ts @@ -49,31 +49,11 @@ export function fetchGetQuestionLibraryListAll(params: Api.Question.GetQuestionL } /** 新增一条问题库 */ -export function fetchAddQuestionLibrary(params: Api.Question.AddQuestionLibraryParams, file?: File | null) { - const formData = new FormData() - if (file) { - formData.append('Image', file) - } +export function fetchAddQuestionLibrary(params: Api.Question.AddQuestionLibraryParams) { return request({ url: '/Base/ActivityMain/AddQuestionListDetail', method: 'post', - // params: { - // QuestionId: params.questionId, - // Name: params.name, - // Answer: params.answer, - // Type: params.type, - // IsGood: params.IsGood, - // ImageUrl: params.imageUrl, - // }, - data: { - QuestionId: params.questionId, - Name: params.name, - Answer: params.answer, - Type: params.type, - IsGood: params.IsGood, - ImageUrl: params.imageUrl, - IsDisabled: params.IsDisabled, - }, + data: params, }) } @@ -87,33 +67,11 @@ export function fetchDisableQuestionLibrary(params: Api.Question.DisableQuestion } /** 更新一条问题库 */ -export function fetchUpdateQuestionLibrary(params: Api.Question.AddQuestionLibraryParams, file?: File | null) { - const formData = new FormData() - if (file) { - formData.append('Image', file) - } +export function fetchUpdateQuestionLibrary(params: Api.Question.UpdateQuestionLibraryParams) { return request({ url: '/Base/ActivityMain/UpdateQuestionListDetail', method: 'post', - // params: { - // Id: params.id, - // QuestionId: params.questionId, - // Name: params.name, - // Answer: params.answer, - // Type: params.type, - // IsGood: params.IsGood, - // ImageUrl: params.imageUrl, - // }, - data: { - Id: params.id, - QuestionId: params.questionId, - Name: params.name, - Answer: params.answer, - Type: params.type, - IsGood: params.IsGood, - ImageUrl: params.imageUrl, - IsDisabled: params.IsDisabled, - }, + data: params, }) } diff --git a/apps/admin/src/typings/api/question.d.ts b/apps/admin/src/typings/api/question.d.ts index 965b5d2..7e50382 100644 --- a/apps/admin/src/typings/api/question.d.ts +++ b/apps/admin/src/typings/api/question.d.ts @@ -65,11 +65,21 @@ declare namespace Api { /** question library image url */ imageUrl: string /** question library type */ - type: QuestionScoreType + // type?: QuestionScoreType /** is priority 0: no 1: yes */ IsGood: number /** is disabled */ IsDisabled: boolean + /** keyword */ + KeyWord: string + /** keyword index */ + KeyWordsIndex: number + } + + /** update question library params */ + interface UpdateQuestionLibraryParams extends AddQuestionLibraryParams { + /** question library id */ + id: number } /** common search params of table */ diff --git a/apps/admin/src/views/question-store/index.vue b/apps/admin/src/views/question-store/index.vue index 1c5f35a..3ee1cd4 100644 --- a/apps/admin/src/views/question-store/index.vue +++ b/apps/admin/src/views/question-store/index.vue @@ -1,5 +1,5 @@