diff --git a/src/api/homework.ts b/src/api/homework.ts index 4274113..24fade9 100644 --- a/src/api/homework.ts +++ b/src/api/homework.ts @@ -140,6 +140,7 @@ export const getPaperRecordDetail = (data: { recordId: string; reportFlag: numbe export interface JobReportVo { actualScore?: number; + markScore?: number; beginTime?: string; costTime?: number; jobId?: number; @@ -179,17 +180,24 @@ export interface JobAnalyseVo { stuRankVoList?: StuRankVoItem[]; } -/** 作业整体分析 */ -export const getJobAnalyse = (params: { recordId: string }) => +/** 作业整体分析(家长端查看孩子报告时需传 userId) */ +export const getJobAnalyse = (params: { recordId: string; userId?: string }) => request({ url: '/sc/job/getJobAnalyse', method: 'GET', params, }); -/** 知识点分析 */ -export const getKnowledgeAnalyse = (params: { recordId: string }) => - request({ +export interface KnowledgeAnalyzeItem { + knowledgeId?: string; + knowledgeName?: string; + answerScore?: number; + titleScore?: number; +} + +/** 知识点分析(家长端查看孩子报告时需传 userId) */ +export const getKnowledgeAnalyse = (params: { recordId: string; userId?: string }) => + request({ url: '/sc/job/statisticalKnowledge', method: 'GET', params, diff --git a/src/api/login.ts b/src/api/login.ts index 0a22184..5728a4f 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -80,6 +80,7 @@ export const parentSmsLogin = (data: ParentSmsLoginParams) => data: { bindMaOpenid: true, adminType: 16, + clientType: 'PARENT', phone: data.phone, verifyCode: data.verifyCode, wxUser: { diff --git a/src/api/parent.ts b/src/api/parent.ts index 196adb4..d351169 100644 --- a/src/api/parent.ts +++ b/src/api/parent.ts @@ -109,7 +109,7 @@ export interface KpointScoreItem { kpointId?: number; kpointName?: string; actualScore?: number; - fullscore?: number; + fullScore?: number; scoreRate?: number; scoreRatePercent?: number; levelCode?: number; diff --git a/src/pages/parent/analysis/index.vue b/src/pages/parent/analysis/index.vue index d0843ac..9cc0242 100644 --- a/src/pages/parent/analysis/index.vue +++ b/src/pages/parent/analysis/index.vue @@ -240,7 +240,7 @@ const levelKnowledge = computed(() => { return (level?.items || []).map((item) => ({ kpointId: item.kpointId ?? 0, kpointName: item.kpointName || '--', - fullScore: item.fullscore ?? 0, + fullScore: item.fullScore ?? 0, score: item.actualScore ?? 0, scoreRatePercent: item.scoreRatePercent ?? 0, })); diff --git a/src/pages/parent/reports/detail.vue b/src/pages/parent/reports/detail.vue index 23eb35a..8cc81eb 100644 --- a/src/pages/parent/reports/detail.vue +++ b/src/pages/parent/reports/detail.vue @@ -43,24 +43,100 @@ @@ -308,7 +399,9 @@