|
@@ -161,7 +161,7 @@ onMounted(async () => {
|
|
|
// colorMap[groupNumber + ""][tag.userId + ""] = c;
|
|
|
}
|
|
|
}
|
|
|
- console.log("colorMap:", colorMap);
|
|
|
+ // console.log("colorMap:", colorMap);
|
|
|
let resultImgList: any[] = [];
|
|
|
let sheetUrlsLength = (student.sheetUrls || []).length;
|
|
|
for (const sheetUrl of student.sheetUrls) {
|
|
@@ -215,7 +215,6 @@ onMounted(async () => {
|
|
|
colorMap
|
|
|
);
|
|
|
resultImgList.push(fileLocation);
|
|
|
- console.log(resultImgList.length, sheetUrlsLength);
|
|
|
} catch (error) {
|
|
|
errorCount.value += 1;
|
|
|
if (config.failover) {
|
|
@@ -228,11 +227,31 @@ onMounted(async () => {
|
|
|
}
|
|
|
// 下载完一个学生
|
|
|
finishedCount.value += 1;
|
|
|
- console.log(resultImgList.length, sheetUrlsLength);
|
|
|
if (resultImgList.length === sheetUrlsLength) {
|
|
|
+ let imgName = "";
|
|
|
+ if (config.template.lastIndexOf("/") > -1) {
|
|
|
+ imgName = config.template.slice(
|
|
|
+ config.template.lastIndexOf("/") + 1
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ imgName = config.template;
|
|
|
+ }
|
|
|
+ let n = imgName.slice(0, imgName.lastIndexOf("."));
|
|
|
+ let pdfName = n
|
|
|
+ .match(/{{.*?}}/g)
|
|
|
+ ?.map((item: any) => {
|
|
|
+ return item.replace("{{", "").replace("}}", "");
|
|
|
+ })
|
|
|
+ .filter((v) => !!v)
|
|
|
+ .map((item: any) => {
|
|
|
+ return item === "index" ? "" : student[item];
|
|
|
+ })
|
|
|
+ .filter((v) => !!v)
|
|
|
+ .join("-");
|
|
|
+
|
|
|
window.electron.saveToPDF(resultImgList, [
|
|
|
config.dir,
|
|
|
- `/pdfs/${store.env.examId}/${student.subjectCode}/${student.examNumber}.pdf`,
|
|
|
+ `/pdfs/${store.env.examId}/${student.subjectCode}/${pdfName}.pdf`,
|
|
|
]);
|
|
|
}
|
|
|
}
|