Browse Source

1.5.0 coding...

刘洋 10 months ago
parent
commit
00c1f951fc
3 changed files with 10 additions and 4 deletions
  1. 1 1
      package.json
  2. 8 2
      src/lib/watermark.ts
  3. 1 1
      src/types/index.ts

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "stmmsproxy",
-  "version": "1.3.5",
+  "version": "1.5.0",
   "private": true,
   "scripts": {
     "start": "vue-cli-service electron:serve",

+ 8 - 2
src/lib/watermark.ts

@@ -187,8 +187,14 @@ export async function addWatermark(
     //   }
     // }
     //显示复核人
-    if (student.inspector) {
-      drawText(x, (y += height), "复核人: " + student.inspector.loginName);
+    // if (student.inspector) {
+    //   drawText(x, (y += height), "复核人: " + student.inspector.loginName);
+    // }
+    if (student.inspector?.length) {
+      const allNameStr = student.inspector
+        .map((item: any) => item.loginName)
+        .join("、");
+      drawText(x, (y += height), "复核人: " + allNameStr);
     }
     //显示主观题明细
     if (

+ 1 - 1
src/types/index.ts

@@ -107,7 +107,7 @@ export interface Student {
   college: string;
   className: string;
   teacher: string;
-  inspector?: Inspector;
+  inspector?: Inspector[];
   objectiveScoreDetail: SubjectiveScoreDetail[];
   subjectiveScoreDetail: SubjectiveScoreDetail[];
   sheetUrls: string[];