|
@@ -131,7 +131,8 @@ onMounted(async () => {
|
|
for (const student of students) {
|
|
for (const student of students) {
|
|
let allTags = Object.values(student.tags || {})
|
|
let allTags = Object.values(student.tags || {})
|
|
.filter((x) => !!x)
|
|
.filter((x) => !!x)
|
|
- .flat();
|
|
|
|
|
|
+ .flat()
|
|
|
|
+ .filter((v: any) => v.userId != 0);
|
|
allTags.forEach((item: any) => {
|
|
allTags.forEach((item: any) => {
|
|
if (
|
|
if (
|
|
allTags.find((v: any) => {
|
|
allTags.find((v: any) => {
|
|
@@ -199,6 +200,7 @@ onMounted(async () => {
|
|
// colorMap[groupNumber + ""][tag.userId + ""] = c;
|
|
// colorMap[groupNumber + ""][tag.userId + ""] = c;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ console.log("allTags:", allTags);
|
|
// console.log("colorMap:", colorMap);
|
|
// console.log("colorMap:", colorMap);
|
|
let resultImgList: any[] = [];
|
|
let resultImgList: any[] = [];
|
|
let sheetUrlsLength = (student.sheetUrls || []).length;
|
|
let sheetUrlsLength = (student.sheetUrls || []).length;
|
|
@@ -240,6 +242,7 @@ onMounted(async () => {
|
|
// console.log(await imageRes.data.arrayBuffer());
|
|
// console.log(await imageRes.data.arrayBuffer());
|
|
// console.log(new Uint8Array(await imageRes.data.arrayBuffer()));
|
|
// console.log(new Uint8Array(await imageRes.data.arrayBuffer()));
|
|
let onlyUsePdf = config.pdf == "2";
|
|
let onlyUsePdf = config.pdf == "2";
|
|
|
|
+ console.log("colorMap:", colorMap);
|
|
let fileLocation = await window.electron.addWatermark(
|
|
let fileLocation = await window.electron.addWatermark(
|
|
storePassedToNodeJs,
|
|
storePassedToNodeJs,
|
|
arrayBuffer,
|
|
arrayBuffer,
|