diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 26b934e7..1c548b55 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -985,7 +985,7 @@ struct Index { //结束考试弹窗 if (this.endPopupVisible) { EndPoPup({ - title: '确定结束考试吗?', + title: this.getNotEndProjects().length ? `当前考试存在未完成的项目:${this.getNotEndProjects().join('、')},确定结束考试吗?` :'确定结束考试吗?', cancelFn: () => { this.endPopupVisible = false; }, @@ -1303,6 +1303,21 @@ struct Index { return false } } + // 获取必考项目里未完成的 + getNotEndProjects = () => { + const projectsObj = this.projectsObj; + const notEndProjectsNames = []; + Reflect.ownKeys(projectsObj).forEach((projectKey:string) => { + const { type, isRequired ,name} = projectsObj[projectKey]; + if (isRequired) { + if (type == undefined || type == '1' || type == '2') { + notEndProjectsNames.push(name) + } + } + }) + return notEndProjectsNames; + } + scroller: Scroller = new Scroller() //页面通用字体大小 diff --git a/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts b/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts index bf46e8ef..239e1b80 100644 --- a/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts +++ b/entry/src/main/ets/pages/judgeSDK/api/judgeSDK.d.ts @@ -11,7 +11,9 @@ export interface Project { type?: '1' | '2' | '3' | '4' | '5' // isEnd:boolean, - isUpload:boolean + isUpload:boolean, + //是否是必考 + isRequired: boolean } export interface MarkRule {