刘洋 преди 10 месеца
родител
ревизия
4ff4b4243e
променени са 1 файла, в които са добавени 12 реда и са изтрити 3 реда
  1. 12 3
      src/features/ImageDownload/ImageDownload.vue

+ 12 - 3
src/features/ImageDownload/ImageDownload.vue

@@ -115,8 +115,11 @@ let students = [];
 const config = store.pageInputs["/image-download"];
 // console.log("config::", config);
 const storePassedToNodeJs = JSON.parse(JSON.stringify(store));
-const color = storePassedToNodeJs.config.watermark.color;
-const nextColor = storePassedToNodeJs.config.watermark.nextColor || "#0000ff";
+// const color = storePassedToNodeJs.config.watermark.color;
+const color = "#F53F3F";
+// const nextColor = storePassedToNodeJs.config.watermark.nextColor || "#0000ff";
+const nextColor = "#165DFF";
+const threeColor = "#FAAD14";
 // const otherColor = storePassedToNodeJs.config.watermark.otherColor;
 const otherColor = "#ddd";
 
@@ -180,7 +183,13 @@ const studentHandler = async (student: any, obj: any) => {
           } else {
             continue;
           }
-        } else if (len > 1) {
+        } else if (len == 2) {
+          if (!targetGroupObjKeys.includes(tag.userId + "")) {
+            colorMap[groupNumber + ""][tag.userId + ""] = threeColor;
+          } else {
+            continue;
+          }
+        } else if (len > 2) {
           if (!targetGroupObjKeys.includes(tag.userId + "")) {
             colorMap[groupNumber + ""][tag.userId + ""] = otherColor;
           } else {