|
@@ -57,7 +57,14 @@ class executor extends EventEmitter {
|
|
|
//显示总分明细
|
|
|
imgData.font(fontFile, fontSize).fill(color)
|
|
|
imgData.drawText(x, y += height, '成绩明细')
|
|
|
- imgData.drawText(x, y += height, '总分=(客观+主观) | ' + totalScore + '=' + student.objectiveScore + '+' + student.subjectiveScore)
|
|
|
+ //普通考试模式,按客观+主观模式显示总分
|
|
|
+ if (trackMode === '1') {
|
|
|
+ imgData.drawText(x, y += height, '总分=(客观+主观) | ' + totalScore + '=' + student.objectiveScore + '+' + student.subjectiveScore)
|
|
|
+ }
|
|
|
+ //研究生考试模式,只显示总分
|
|
|
+ else if (trackMode === '2') {
|
|
|
+ imgData.drawText(x, y += height, '总分=' + totalScore + '分')
|
|
|
+ }
|
|
|
//显示客观题明细
|
|
|
if (student.objectiveScoreDetail && student.objectiveScoreDetail.length > 0) {
|
|
|
let lines = []
|
|
@@ -279,7 +286,7 @@ class executor extends EventEmitter {
|
|
|
let count = 0
|
|
|
let pageNumber = 0
|
|
|
this.emit('count', 0)
|
|
|
- for (;;) {
|
|
|
+ for (; ;) {
|
|
|
pageNumber++
|
|
|
let array = await api.getStudents(env.examId, pageNumber, 10, params)
|
|
|
if (array == undefined || array.length == 0) {
|