diff --git a/.env.development b/.env.development index 0e20cf6d..4ddca13e 100644 --- a/.env.development +++ b/.env.development @@ -29,3 +29,8 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' + +# 王洋洋 +VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' +# 于嘉文 +#VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' diff --git a/src/api/courseRecord.js b/src/api/courseRecord.js new file mode 100644 index 00000000..b47d471f --- /dev/null +++ b/src/api/courseRecord.js @@ -0,0 +1,49 @@ +import request from '@/api/request' +const base_url = '/traexam' + + + +// 学习列表页 + + +/**练习*/ +// 练习列表页 +export const queryPracticeRecordPaging = (data) => { + return request({ + url: base_url + '/traRecord/queryPracticeRecordPaging', + method: 'post', + toastErrors: true, + data + }); +}; +// 练习每一项列表 +export const queryPracticeHis = (data) => { + return request({ + url: base_url + '/traRecord/queryPracticeHis', + method: 'post', + toastErrors: true, + data + }); +}; + +/**考试*/ +// 考试列表页 +export const queryExamRecordPaging = (data) => { + return request({ + url: base_url + '/traRecord/queryExamRecordPaging', + method: 'post', + toastErrors: true, + data + }); +}; +// 考试每一项列表 +export const queryExamHisByExamId = (data) => { + return request({ + url: base_url + '/traRecord/queryExamHisByExamId', + method: 'post', + toastErrors: true, + data + }); +}; + + diff --git a/src/api/practice.js b/src/api/practice.js new file mode 100644 index 00000000..562ce205 --- /dev/null +++ b/src/api/practice.js @@ -0,0 +1,42 @@ +import request from '@/api/request' +const base_url = '/traexam' + +// 1.开始练习（课程练习） +export const startPracticeByCrs = (data) => { + return request({ + url: base_url + '/traCrsPractice/startPracticeByCrs', + method: 'post', + toastErrors: true, + data + }); +}; + +// 2.课程练习答题 +export const practiceAnswer = (data) => { + return request({ + url: base_url + '/traCrsPractice/practiceAnswer', + method: 'post', + toastErrors: true, + data + }); +}; + +// 3.课程练习状态变更 +export const practiceCommit = (data) => { + return request({ + url: base_url + '/traCrsPractice/practiceCommit', + method: 'post', + toastErrors: true, + data + }); +}; + +// 4.课程练习记录 +export const queryPracticeRecordByExrId = (data) => { + return request({ + url: base_url + '/traCrsPractice/queryPracticeRecordByExrId', + method: 'post', + toastErrors: true, + data + }); +}; diff --git a/src/common/imgSvg.ts b/src/common/imgSvg.ts index 2a9bf5d9..9e61a5c2 100644 --- a/src/common/imgSvg.ts +++ b/src/common/imgSvg.ts @@ -57,3 +57,27 @@ export const lockIcon = (color: string) : string => { return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`; }; + +// 学习时长 +export const studyDurationIcon = (color: string='#62A1FF') : string => { + const svgXml = ` + +`.trim(); + return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`; +}; + +// 学习次数 +export const studyFrequencyIcon = (color: string='#62A1FF') : string => { + const svgXml = ` + +`.trim(); + return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`; +}; + +// 学习时间 +export const studyTimeIcon = (color: string='#958DFF') : string => { + const svgXml = ` + +`.trim(); + return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`; +}; \ No newline at end of file diff --git a/src/components/examination/radio-subject-item.vue b/src/components/examination/radio-subject-item.vue index 0c62edbc..5f1b3cf4 100644 --- a/src/components/examination/radio-subject-item.vue +++ b/src/components/examination/radio-subject-item.vue @@ -40,7 +40,6 @@ if (props.analysisVo.correctFlag === 'R') return 'success'; // 是错误答案但是被用户错误选中的为红 const my_answer_array = props.my_answer; - console.log('my_answer_array', my_answer_array); if(my_answer_array.includes(props.analysisVo.itemId) && props.analysisVo.correctFlag === 'E') return 'error'; // 只有被我选中,不知是正确还是错误的为蓝 diff --git a/src/pages.json b/src/pages.json index 0986e251..c66ed48b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -244,6 +244,24 @@ } } }, + { + "path": "pages/courseRecord/index", + "style": { + "navigationBarTitleText": "课程记录页", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/examinationRecord/index", + "style": { + "navigationBarTitleText": "考试记录页", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/course/index", "style": { diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 925ea3e8..c18d7a8c 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -1,7 +1,13 @@