|
@@ -99,7 +99,8 @@ export async function addWatermark(
|
|
|
lines.push(array);
|
|
|
for (let i = 0; i < student.objectiveScoreDetail.length; i++) {
|
|
|
const detail = student.objectiveScoreDetail[i];
|
|
|
- const content = detail.answer + ":" + detail.score;
|
|
|
+ const content =
|
|
|
+ detail.answer + ":" + (detail.score === -1 ? "未选做" : detail.score);
|
|
|
//超长后另起一行显示客观题
|
|
|
if ((count + content.length) * fontSize * 0.7 > maxX) {
|
|
|
array = [];
|
|
@@ -150,7 +151,7 @@ export async function addWatermark(
|
|
|
"-" +
|
|
|
detail.subNumber +
|
|
|
" : " +
|
|
|
- detail.score +
|
|
|
+ (detail.score === -1 ? "未选做" : detail.score) +
|
|
|
" " +
|
|
|
(detail.marker || "") +
|
|
|
" " +
|
|
@@ -185,7 +186,7 @@ export async function addWatermark(
|
|
|
groups[detail.groupNumber] = group;
|
|
|
maxGroupNumber = Math.max(maxGroupNumber, group.number);
|
|
|
}
|
|
|
- group.score = group.score + detail.score;
|
|
|
+ group.score = group.score + (detail.score === -1 ? 0 : detail.score);
|
|
|
if (detail.mainTitle && !group.title[detail.mainTitle]) {
|
|
|
group.titleString.push(detail.mainTitle);
|
|
|
group.title[detail.mainTitle] = true;
|