Merge branch 'beta' into HK

src/components/pages/components/classStudentComponents/worksDetail3.vue

@@ -1588,23 +1588,7 @@ export default {
                 time: "",
               };
             }
-
             workJson[stagetask].time = res.data[0][k].time;
-            for (var i = 0; i < worksDetail.length; i++) {
-              if (
-                res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task &&
-                res.data[0][k].tool == worksDetail[i].tool
-              ) {
-                workJson[stagetask].img.push({
-                  src: worksDetail[i].content,
-                  id: i,
-                  score: worksDetail[i].score
-                    ? JSON.parse(worksDetail[i].score).wScore
-                    : worksDetail[i].score,
-                });
-              }
-            }
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
@@ -1799,243 +1783,215 @@ export default {
                 this.checkJson[k].allRight = isCount / t.radio.length;
               }
             }
-            for (var i = 0; i < pptInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task &&
-                res.data[0][k].tool == pptInfo[i].tool
-              ) {
-                var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
-                if (
-                  a.indexOf(
-                    pptInfo[i].content
-                      .split(".")
-                      [
-                        pptInfo[i].content.split(".").length - 1
-                      ].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    pptInfo[i].content;
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: a,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = false;
-                } else if (
-                  pptInfo[i].content
-                    .split(".")
-                    [
-                      pptInfo[i].content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = true;
-                }
-              }
-            }
+          }
 
-            for (var i = 0; i < answerInfo.length; i++) {
-              if (
-                res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task &&
-                res.data[0][k].tool == answerInfo[i].tool
-              ) {
-                const element = answerInfo[i];
-                workJson[stagetask].answerInfo.push({
-                  answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score
-                    ? JSON.parse(answerInfo[i].score).wScore
-                    : answerInfo[i].score,
-                });
+          for (var i = 0; i < worksDetail.length; i++) {
+            workJson[worksDetail[i].stage + "-" + worksDetail[i].task].img.push(
+              {
+                src: worksDetail[i].content,
+                id: i,
+                score: worksDetail[i].score
+                  ? JSON.parse(worksDetail[i].score).wScore
+                  : worksDetail[i].score,
               }
+            );
+          }
+
+          for (var i = 0; i < pptInfo.length; i++) {
+            var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
+            if (
+              a.indexOf(
+                pptInfo[i].content
+                  .split(".")
+                  [pptInfo[i].content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                pptInfo[i].content;
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: a,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = false;
+            } else if (
+              pptInfo[i].content
+                .split(".")
+                [
+                  pptInfo[i].content.split(".").length - 1
+                ].toLocaleUpperCase() == "PDF"
+            ) {
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: pptInfo[i].content,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = true;
             }
-            for (var i = 0; i < pjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task &&
-                res.data[0][k].tool == pjInfo[i].tool
-              ) {
-                var pj = pjInfo[i];
-                var a =
-                  chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
-                    pjInfo[i].task
-                  ].toolChoose;
-                var rateJson = [];
-                for (var z = 0; z < a.length; z++) {
-                  if (a[z].tool[0] == 40) {
-                    rateJson = a[z].rateJson;
-                  }
-                }
-                workJson[stagetask].pjInfo.push({
-                  answer: JSON.parse(pj.content),
-                  rateJson: rateJson,
-                  score: pjInfo[i].score
-                    ? JSON.parse(pjInfo[i].score).wScore
-                    : pjInfo[i].score,
-                });
+          }
+
+          for (var i = 0; i < answerInfo.length; i++) {
+            const element = answerInfo[i];
+            workJson[
+              answerInfo[i].stage + "-" + answerInfo[i].task
+            ].answerInfo.push({
+              answerInfo: JSON.parse(element.content)[0],
+              score: answerInfo[i].score
+                ? JSON.parse(answerInfo[i].score).wScore
+                : answerInfo[i].score,
+            });
+          }
+          for (var i = 0; i < pjInfo.length; i++) {
+            var pj = pjInfo[i];
+            var a =
+              chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
+                pjInfo[i].task
+              ].toolChoose;
+            var rateJson = [];
+            for (var z = 0; z < a.length; z++) {
+              if (a[z].tool[0] == 40) {
+                rateJson = a[z].rateJson;
               }
             }
+            workJson[pjInfo[i].stage + "-" + pjInfo[i].task].pjInfo.push({
+              answer: JSON.parse(pj.content),
+              rateJson: rateJson,
+              score: pjInfo[i].score
+                ? JSON.parse(pjInfo[i].score).wScore
+                : pjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < xztkInfo.length; i++) {
-              if (
-                res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task &&
-                res.data[0][k].tool == xztkInfo[i].tool
-              ) {
-                if (xztkInfo[i].type == 7) {
-                  var xztk = xztkInfo[i];
-                  var a =
-                    chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
-                      xztkInfo[i].task
-                    ].toolChoose;
-                  var selectJson = [];
-                  for (var z = 0; z < a.length; z++) {
-                    if (a[z].tool[0] == 41) {
-                      selectJson = a[z].selectJson;
-                    }
-                  }
-                  workJson[stagetask].xztkInfo.push({
-                    answer: xztk.content.split(",").map(Number),
-                    selectJson: selectJson,
-                    score: xztkInfo[i].score
-                      ? JSON.parse(xztkInfo[i].score).wScore
-                      : xztkInfo[i].score,
-                  });
+          for (var i = 0; i < xztkInfo.length; i++) {
+            if (xztkInfo[i].type == 7) {
+              var xztk = xztkInfo[i];
+              var a =
+                chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
+                  xztkInfo[i].task
+                ].toolChoose;
+              var selectJson = [];
+              for (var z = 0; z < a.length; z++) {
+                if (a[z].tool[0] == 41) {
+                  selectJson = a[z].selectJson;
                 }
               }
+              workJson[
+                xztkInfo[i].stage + "-" + xztkInfo[i].task
+              ].xztkInfo.push({
+                answer: xztk.content.split(",").map(Number),
+                selectJson: selectJson,
+                score: xztkInfo[i].score
+                  ? JSON.parse(xztkInfo[i].score).wScore
+                  : xztkInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < lccjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task &&
-                res.data[0][k].tool == lccjInfo[i].tool
-              ) {
-                var lccj = lccjInfo[i];
-                workJson[stagetask].lccjInfo.push({
-                  lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score
-                    ? JSON.parse(lccjInfo[i].score).wScore
-                    : lccjInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < lccjInfo.length; i++) {
+            var lccj = lccjInfo[i];
+            workJson[lccjInfo[i].stage + "-" + lccjInfo[i].task].lccjInfo.push({
+              lccjInfo: JSON.parse(lccj.content)[0],
+              score: lccjInfo[i].score
+                ? JSON.parse(lccjInfo[i].score).wScore
+                : lccjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < bgInfo.length; i++) {
-              if (
-                res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task &&
-                res.data[0][k].tool == bgInfo[i].tool
-              ) {
-                var bg = bgInfo[i];
-                workJson[stagetask].bgInfo.push({
-                  bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score
-                    ? JSON.parse(bgInfo[i].score).wScore
-                    : bgInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < bgInfo.length; i++) {
+            var bg = bgInfo[i];
+            workJson[bgInfo[i].stage + "-" + bgInfo[i].task].bgInfo.push({
+              bgInfo: JSON.parse(bg.content),
+              score: bgInfo[i].score
+                ? JSON.parse(bgInfo[i].score).wScore
+                : bgInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < cocopiInfo.length; i++) {
-              if (
-                res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task &&
-                res.data[0][k].tool == cocopiInfo[i].tool
-              ) {
-                var cocopi = cocopiInfo[i];
-                var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-                var d = [
-                  "BMP",
-                  "PJP",
-                  "APNG",
-                  "PNG",
-                  "JPG",
-                  "GIF",
-                  "SVG",
-                  "JPEG",
-                  "JPG",
-                  "ICO",
-                  "PGPEG",
-                  "AVIF",
-                ];
-                var t = 0; //t = 1是图片 2是文档 3是pdf
-                if (
-                  d.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 1;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  c.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 2;
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    cocopi.content;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: a,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  cocopi.content
-                    .split(".")
-                    [
-                      cocopi.content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  t = 3;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                }
-              }
+          for (var i = 0; i < cocopiInfo.length; i++) {
+            var cocopi = cocopiInfo[i];
+            var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
+            var d = [
+              "BMP",
+              "PJP",
+              "APNG",
+              "PNG",
+              "JPG",
+              "GIF",
+              "SVG",
+              "JPEG",
+              "JPG",
+              "ICO",
+              "PGPEG",
+              "AVIF",
+            ];
+            var t = 0; //t = 1是图片 2是文档 3是pdf
+            if (
+              d.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 1;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              c.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 2;
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                cocopi.content;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: a,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              cocopi.content
+                .split(".")
+                [cocopi.content.split(".").length - 1].toLocaleUpperCase() ==
+              "PDF"
+            ) {
+              t = 3;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < wordInfo.length; i++) {
-              if (
-                res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task &&
-                res.data[0][k].tool == wordInfo[i].tool
-              ) {
-                var word = wordInfo[i];
-                workJson[stagetask].wordInfo.push({
-                  wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score
-                    ? JSON.parse(wordInfo[i].score).wScore
-                    : wordInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < wordInfo.length; i++) {
+            var word = wordInfo[i];
+            workJson[wordInfo[i].stage + "-" + wordInfo[i].task].wordInfo.push({
+              wordInfo: JSON.parse(word.content),
+              score: wordInfo[i].score
+                ? JSON.parse(wordInfo[i].score).wScore
+                : wordInfo[i].score,
+            });
           }
           // const result = workJson.filter((item, index, arr) => {
           //   return (
@@ -2060,7 +2016,7 @@ export default {
             // 如果第一个数字相同，则比较第二个数字
             return parseInt(x_parts[1]) - parseInt(y_parts[1]);
           });
-          result = resultNewArray
+          result = resultNewArray;
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2161,20 +2117,6 @@ export default {
             }
           }
 
-          // var resultNewArray = result.sort(function (x, y) {
-          //   // 以stagetask字段为排序依据
-          //   var x_parts = x.stagetask.split("-");
-          //   var y_parts = y.stagetask.split("-");
-
-          //   // 首先比较第一个数字
-          //   if (x_parts[0] !== y_parts[0]) {
-          //     return parseInt(x_parts[0]) - parseInt(y_parts[0]);
-          //   }
-
-          //   // 如果第一个数字相同，则比较第二个数字
-          //   return parseInt(x_parts[1]) - parseInt(y_parts[1]);
-          // });
-
           this.worksDetail = result;
 
           this.courseDetail = res.data[0][0];

src/components/pages/components/studentWorksDetail.vue

@@ -1962,23 +1962,7 @@ export default {
                 time: "",
               };
             }
-
             workJson[stagetask].time = res.data[0][k].time;
-            for (var i = 0; i < worksDetail.length; i++) {
-              if (
-                res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task &&
-                res.data[0][k].tool == worksDetail[i].tool
-              ) {
-                workJson[stagetask].img.push({
-                  src: worksDetail[i].content,
-                  id: i,
-                  score: worksDetail[i].score
-                    ? JSON.parse(worksDetail[i].score).wScore
-                    : worksDetail[i].score,
-                });
-              }
-            }
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
@@ -2173,243 +2157,215 @@ export default {
                 this.checkJson[k].allRight = isCount / t.radio.length;
               }
             }
-            for (var i = 0; i < pptInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task &&
-                res.data[0][k].tool == pptInfo[i].tool
-              ) {
-                var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
-                if (
-                  a.indexOf(
-                    pptInfo[i].content
-                      .split(".")
-                      [
-                        pptInfo[i].content.split(".").length - 1
-                      ].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    pptInfo[i].content;
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: a,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = false;
-                } else if (
-                  pptInfo[i].content
-                    .split(".")
-                    [
-                      pptInfo[i].content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = true;
-                }
-              }
-            }
+          }
 
-            for (var i = 0; i < answerInfo.length; i++) {
-              if (
-                res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task &&
-                res.data[0][k].tool == answerInfo[i].tool
-              ) {
-                const element = answerInfo[i];
-                workJson[stagetask].answerInfo.push({
-                  answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score
-                    ? JSON.parse(answerInfo[i].score).wScore
-                    : answerInfo[i].score,
-                });
+          for (var i = 0; i < worksDetail.length; i++) {
+            workJson[worksDetail[i].stage + "-" + worksDetail[i].task].img.push(
+              {
+                src: worksDetail[i].content,
+                id: i,
+                score: worksDetail[i].score
+                  ? JSON.parse(worksDetail[i].score).wScore
+                  : worksDetail[i].score,
               }
+            );
+          }
+
+          for (var i = 0; i < pptInfo.length; i++) {
+            var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
+            if (
+              a.indexOf(
+                pptInfo[i].content
+                  .split(".")
+                  [pptInfo[i].content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                pptInfo[i].content;
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: a,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = false;
+            } else if (
+              pptInfo[i].content
+                .split(".")
+                [
+                  pptInfo[i].content.split(".").length - 1
+                ].toLocaleUpperCase() == "PDF"
+            ) {
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: pptInfo[i].content,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = true;
             }
-            for (var i = 0; i < pjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task &&
-                res.data[0][k].tool == pjInfo[i].tool
-              ) {
-                var pj = pjInfo[i];
-                var a =
-                  chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
-                    pjInfo[i].task
-                  ].toolChoose;
-                var rateJson = [];
-                for (var z = 0; z < a.length; z++) {
-                  if (a[z].tool[0] == 40) {
-                    rateJson = a[z].rateJson;
-                  }
-                }
-                workJson[stagetask].pjInfo.push({
-                  answer: JSON.parse(pj.content),
-                  rateJson: rateJson,
-                  score: pjInfo[i].score
-                    ? JSON.parse(pjInfo[i].score).wScore
-                    : pjInfo[i].score,
-                });
+          }
+
+          for (var i = 0; i < answerInfo.length; i++) {
+            const element = answerInfo[i];
+            workJson[
+              answerInfo[i].stage + "-" + answerInfo[i].task
+            ].answerInfo.push({
+              answerInfo: JSON.parse(element.content)[0],
+              score: answerInfo[i].score
+                ? JSON.parse(answerInfo[i].score).wScore
+                : answerInfo[i].score,
+            });
+          }
+          for (var i = 0; i < pjInfo.length; i++) {
+            var pj = pjInfo[i];
+            var a =
+              chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
+                pjInfo[i].task
+              ].toolChoose;
+            var rateJson = [];
+            for (var z = 0; z < a.length; z++) {
+              if (a[z].tool[0] == 40) {
+                rateJson = a[z].rateJson;
               }
             }
+            workJson[pjInfo[i].stage + "-" + pjInfo[i].task].pjInfo.push({
+              answer: JSON.parse(pj.content),
+              rateJson: rateJson,
+              score: pjInfo[i].score
+                ? JSON.parse(pjInfo[i].score).wScore
+                : pjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < xztkInfo.length; i++) {
-              if (
-                res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task &&
-                res.data[0][k].tool == xztkInfo[i].tool
-              ) {
-                if (xztkInfo[i].type == 7) {
-                  var xztk = xztkInfo[i];
-                  var a =
-                    chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
-                      xztkInfo[i].task
-                    ].toolChoose;
-                  var selectJson = [];
-                  for (var z = 0; z < a.length; z++) {
-                    if (a[z].tool[0] == 41) {
-                      selectJson = a[z].selectJson;
-                    }
-                  }
-                  workJson[stagetask].xztkInfo.push({
-                    answer: xztk.content.split(",").map(Number),
-                    selectJson: selectJson,
-                    score: xztkInfo[i].score
-                      ? JSON.parse(xztkInfo[i].score).wScore
-                      : xztkInfo[i].score,
-                  });
+          for (var i = 0; i < xztkInfo.length; i++) {
+            if (xztkInfo[i].type == 7) {
+              var xztk = xztkInfo[i];
+              var a =
+                chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
+                  xztkInfo[i].task
+                ].toolChoose;
+              var selectJson = [];
+              for (var z = 0; z < a.length; z++) {
+                if (a[z].tool[0] == 41) {
+                  selectJson = a[z].selectJson;
                 }
               }
+              workJson[
+                xztkInfo[i].stage + "-" + xztkInfo[i].task
+              ].xztkInfo.push({
+                answer: xztk.content.split(",").map(Number),
+                selectJson: selectJson,
+                score: xztkInfo[i].score
+                  ? JSON.parse(xztkInfo[i].score).wScore
+                  : xztkInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < lccjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task &&
-                res.data[0][k].tool == lccjInfo[i].tool
-              ) {
-                var lccj = lccjInfo[i];
-                workJson[stagetask].lccjInfo.push({
-                  lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score
-                    ? JSON.parse(lccjInfo[i].score).wScore
-                    : lccjInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < lccjInfo.length; i++) {
+            var lccj = lccjInfo[i];
+            workJson[lccjInfo[i].stage + "-" + lccjInfo[i].task].lccjInfo.push({
+              lccjInfo: JSON.parse(lccj.content)[0],
+              score: lccjInfo[i].score
+                ? JSON.parse(lccjInfo[i].score).wScore
+                : lccjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < bgInfo.length; i++) {
-              if (
-                res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task &&
-                res.data[0][k].tool == bgInfo[i].tool
-              ) {
-                var bg = bgInfo[i];
-                workJson[stagetask].bgInfo.push({
-                  bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score
-                    ? JSON.parse(bgInfo[i].score).wScore
-                    : bgInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < bgInfo.length; i++) {
+            var bg = bgInfo[i];
+            workJson[bgInfo[i].stage + "-" + bgInfo[i].task].bgInfo.push({
+              bgInfo: JSON.parse(bg.content),
+              score: bgInfo[i].score
+                ? JSON.parse(bgInfo[i].score).wScore
+                : bgInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < cocopiInfo.length; i++) {
-              if (
-                res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task &&
-                res.data[0][k].tool == cocopiInfo[i].tool
-              ) {
-                var cocopi = cocopiInfo[i];
-                var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-                var d = [
-                  "BMP",
-                  "PJP",
-                  "APNG",
-                  "PNG",
-                  "JPG",
-                  "GIF",
-                  "SVG",
-                  "JPEG",
-                  "JPG",
-                  "ICO",
-                  "PGPEG",
-                  "AVIF",
-                ];
-                var t = 0; //t = 1是图片 2是文档 3是pdf
-                if (
-                  d.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 1;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  c.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 2;
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    cocopi.content;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: a,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  cocopi.content
-                    .split(".")
-                    [
-                      cocopi.content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  t = 3;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                }
-              }
+          for (var i = 0; i < cocopiInfo.length; i++) {
+            var cocopi = cocopiInfo[i];
+            var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
+            var d = [
+              "BMP",
+              "PJP",
+              "APNG",
+              "PNG",
+              "JPG",
+              "GIF",
+              "SVG",
+              "JPEG",
+              "JPG",
+              "ICO",
+              "PGPEG",
+              "AVIF",
+            ];
+            var t = 0; //t = 1是图片 2是文档 3是pdf
+            if (
+              d.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 1;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              c.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 2;
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                cocopi.content;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: a,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              cocopi.content
+                .split(".")
+                [cocopi.content.split(".").length - 1].toLocaleUpperCase() ==
+              "PDF"
+            ) {
+              t = 3;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < wordInfo.length; i++) {
-              if (
-                res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task &&
-                res.data[0][k].tool == wordInfo[i].tool
-              ) {
-                var word = wordInfo[i];
-                workJson[stagetask].wordInfo.push({
-                  wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score
-                    ? JSON.parse(wordInfo[i].score).wScore
-                    : wordInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < wordInfo.length; i++) {
+            var word = wordInfo[i];
+            workJson[wordInfo[i].stage + "-" + wordInfo[i].task].wordInfo.push({
+              wordInfo: JSON.parse(word.content),
+              score: wordInfo[i].score
+                ? JSON.parse(wordInfo[i].score).wScore
+                : wordInfo[i].score,
+            });
           }
           // const result = workJson.filter((item, index, arr) => {
           //   return (
@@ -2434,7 +2390,7 @@ export default {
             // 如果第一个数字相同，则比较第二个数字
             return parseInt(x_parts[1]) - parseInt(y_parts[1]);
           });
-          result = resultNewArray
+          result = resultNewArray;
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2535,20 +2491,6 @@ export default {
             }
           }
 
-          // var resultNewArray = result.sort(function (x, y) {
-          //   // 以stagetask字段为排序依据
-          //   var x_parts = x.stagetask.split("-");
-          //   var y_parts = y.stagetask.split("-");
-
-          //   // 首先比较第一个数字
-          //   if (x_parts[0] !== y_parts[0]) {
-          //     return parseInt(x_parts[0]) - parseInt(y_parts[0]);
-          //   }
-
-          //   // 如果第一个数字相同，则比较第二个数字
-          //   return parseInt(x_parts[1]) - parseInt(y_parts[1]);
-          // });
-
           this.worksDetail = result;
 
           this.courseDetail = res.data[0][0];

src/components/pages/components/worksDetail2.vue

@@ -1964,23 +1964,7 @@ export default {
                 time: "",
               };
             }
-
             workJson[stagetask].time = res.data[0][k].time;
-            for (var i = 0; i < worksDetail.length; i++) {
-              if (
-                res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task &&
-                res.data[0][k].tool == worksDetail[i].tool
-              ) {
-                workJson[stagetask].img.push({
-                  src: worksDetail[i].content,
-                  id: i,
-                  score: worksDetail[i].score
-                    ? JSON.parse(worksDetail[i].score).wScore
-                    : worksDetail[i].score,
-                });
-              }
-            }
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
@@ -2175,243 +2159,215 @@ export default {
                 this.checkJson[k].allRight = isCount / t.radio.length;
               }
             }
-            for (var i = 0; i < pptInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task &&
-                res.data[0][k].tool == pptInfo[i].tool
-              ) {
-                var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
-                if (
-                  a.indexOf(
-                    pptInfo[i].content
-                      .split(".")
-                      [
-                        pptInfo[i].content.split(".").length - 1
-                      ].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    pptInfo[i].content;
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: a,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = false;
-                } else if (
-                  pptInfo[i].content
-                    .split(".")
-                    [
-                      pptInfo[i].content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = true;
-                }
-              }
-            }
+          }
 
-            for (var i = 0; i < answerInfo.length; i++) {
-              if (
-                res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task &&
-                res.data[0][k].tool == answerInfo[i].tool
-              ) {
-                const element = answerInfo[i];
-                workJson[stagetask].answerInfo.push({
-                  answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score
-                    ? JSON.parse(answerInfo[i].score).wScore
-                    : answerInfo[i].score,
-                });
+          for (var i = 0; i < worksDetail.length; i++) {
+            workJson[worksDetail[i].stage + "-" + worksDetail[i].task].img.push(
+              {
+                src: worksDetail[i].content,
+                id: i,
+                score: worksDetail[i].score
+                  ? JSON.parse(worksDetail[i].score).wScore
+                  : worksDetail[i].score,
               }
+            );
+          }
+
+          for (var i = 0; i < pptInfo.length; i++) {
+            var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
+            if (
+              a.indexOf(
+                pptInfo[i].content
+                  .split(".")
+                  [pptInfo[i].content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                pptInfo[i].content;
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: a,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = false;
+            } else if (
+              pptInfo[i].content
+                .split(".")
+                [
+                  pptInfo[i].content.split(".").length - 1
+                ].toLocaleUpperCase() == "PDF"
+            ) {
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: pptInfo[i].content,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = true;
             }
-            for (var i = 0; i < pjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task &&
-                res.data[0][k].tool == pjInfo[i].tool
-              ) {
-                var pj = pjInfo[i];
-                var a =
-                  chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
-                    pjInfo[i].task
-                  ].toolChoose;
-                var rateJson = [];
-                for (var z = 0; z < a.length; z++) {
-                  if (a[z].tool[0] == 40) {
-                    rateJson = a[z].rateJson;
-                  }
-                }
-                workJson[stagetask].pjInfo.push({
-                  answer: JSON.parse(pj.content),
-                  rateJson: rateJson,
-                  score: pjInfo[i].score
-                    ? JSON.parse(pjInfo[i].score).wScore
-                    : pjInfo[i].score,
-                });
+          }
+
+          for (var i = 0; i < answerInfo.length; i++) {
+            const element = answerInfo[i];
+            workJson[
+              answerInfo[i].stage + "-" + answerInfo[i].task
+            ].answerInfo.push({
+              answerInfo: JSON.parse(element.content)[0],
+              score: answerInfo[i].score
+                ? JSON.parse(answerInfo[i].score).wScore
+                : answerInfo[i].score,
+            });
+          }
+          for (var i = 0; i < pjInfo.length; i++) {
+            var pj = pjInfo[i];
+            var a =
+              chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
+                pjInfo[i].task
+              ].toolChoose;
+            var rateJson = [];
+            for (var z = 0; z < a.length; z++) {
+              if (a[z].tool[0] == 40) {
+                rateJson = a[z].rateJson;
               }
             }
+            workJson[pjInfo[i].stage + "-" + pjInfo[i].task].pjInfo.push({
+              answer: JSON.parse(pj.content),
+              rateJson: rateJson,
+              score: pjInfo[i].score
+                ? JSON.parse(pjInfo[i].score).wScore
+                : pjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < xztkInfo.length; i++) {
-              if (
-                res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task &&
-                res.data[0][k].tool == xztkInfo[i].tool
-              ) {
-                if (xztkInfo[i].type == 7) {
-                  var xztk = xztkInfo[i];
-                  var a =
-                    chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
-                      xztkInfo[i].task
-                    ].toolChoose;
-                  var selectJson = [];
-                  for (var z = 0; z < a.length; z++) {
-                    if (a[z].tool[0] == 41) {
-                      selectJson = a[z].selectJson;
-                    }
-                  }
-                  workJson[stagetask].xztkInfo.push({
-                    answer: xztk.content.split(",").map(Number),
-                    selectJson: selectJson,
-                    score: xztkInfo[i].score
-                      ? JSON.parse(xztkInfo[i].score).wScore
-                      : xztkInfo[i].score,
-                  });
+          for (var i = 0; i < xztkInfo.length; i++) {
+            if (xztkInfo[i].type == 7) {
+              var xztk = xztkInfo[i];
+              var a =
+                chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
+                  xztkInfo[i].task
+                ].toolChoose;
+              var selectJson = [];
+              for (var z = 0; z < a.length; z++) {
+                if (a[z].tool[0] == 41) {
+                  selectJson = a[z].selectJson;
                 }
               }
+              workJson[
+                xztkInfo[i].stage + "-" + xztkInfo[i].task
+              ].xztkInfo.push({
+                answer: xztk.content.split(",").map(Number),
+                selectJson: selectJson,
+                score: xztkInfo[i].score
+                  ? JSON.parse(xztkInfo[i].score).wScore
+                  : xztkInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < lccjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task &&
-                res.data[0][k].tool == lccjInfo[i].tool
-              ) {
-                var lccj = lccjInfo[i];
-                workJson[stagetask].lccjInfo.push({
-                  lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score
-                    ? JSON.parse(lccjInfo[i].score).wScore
-                    : lccjInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < lccjInfo.length; i++) {
+            var lccj = lccjInfo[i];
+            workJson[lccjInfo[i].stage + "-" + lccjInfo[i].task].lccjInfo.push({
+              lccjInfo: JSON.parse(lccj.content)[0],
+              score: lccjInfo[i].score
+                ? JSON.parse(lccjInfo[i].score).wScore
+                : lccjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < bgInfo.length; i++) {
-              if (
-                res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task &&
-                res.data[0][k].tool == bgInfo[i].tool
-              ) {
-                var bg = bgInfo[i];
-                workJson[stagetask].bgInfo.push({
-                  bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score
-                    ? JSON.parse(bgInfo[i].score).wScore
-                    : bgInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < bgInfo.length; i++) {
+            var bg = bgInfo[i];
+            workJson[bgInfo[i].stage + "-" + bgInfo[i].task].bgInfo.push({
+              bgInfo: JSON.parse(bg.content),
+              score: bgInfo[i].score
+                ? JSON.parse(bgInfo[i].score).wScore
+                : bgInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < cocopiInfo.length; i++) {
-              if (
-                res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task &&
-                res.data[0][k].tool == cocopiInfo[i].tool
-              ) {
-                var cocopi = cocopiInfo[i];
-                var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-                var d = [
-                  "BMP",
-                  "PJP",
-                  "APNG",
-                  "PNG",
-                  "JPG",
-                  "GIF",
-                  "SVG",
-                  "JPEG",
-                  "JPG",
-                  "ICO",
-                  "PGPEG",
-                  "AVIF",
-                ];
-                var t = 0; //t = 1是图片 2是文档 3是pdf
-                if (
-                  d.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 1;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  c.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 2;
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    cocopi.content;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: a,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  cocopi.content
-                    .split(".")
-                    [
-                      cocopi.content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  t = 3;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                }
-              }
+          for (var i = 0; i < cocopiInfo.length; i++) {
+            var cocopi = cocopiInfo[i];
+            var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
+            var d = [
+              "BMP",
+              "PJP",
+              "APNG",
+              "PNG",
+              "JPG",
+              "GIF",
+              "SVG",
+              "JPEG",
+              "JPG",
+              "ICO",
+              "PGPEG",
+              "AVIF",
+            ];
+            var t = 0; //t = 1是图片 2是文档 3是pdf
+            if (
+              d.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 1;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              c.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 2;
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                cocopi.content;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: a,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              cocopi.content
+                .split(".")
+                [cocopi.content.split(".").length - 1].toLocaleUpperCase() ==
+              "PDF"
+            ) {
+              t = 3;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < wordInfo.length; i++) {
-              if (
-                res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task &&
-                res.data[0][k].tool == wordInfo[i].tool
-              ) {
-                var word = wordInfo[i];
-                workJson[stagetask].wordInfo.push({
-                  wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score
-                    ? JSON.parse(wordInfo[i].score).wScore
-                    : wordInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < wordInfo.length; i++) {
+            var word = wordInfo[i];
+            workJson[wordInfo[i].stage + "-" + wordInfo[i].task].wordInfo.push({
+              wordInfo: JSON.parse(word.content),
+              score: wordInfo[i].score
+                ? JSON.parse(wordInfo[i].score).wScore
+                : wordInfo[i].score,
+            });
           }
           // const result = workJson.filter((item, index, arr) => {
           //   return (
@@ -2436,7 +2392,7 @@ export default {
             // 如果第一个数字相同，则比较第二个数字
             return parseInt(x_parts[1]) - parseInt(y_parts[1]);
           });
-          result = resultNewArray
+          result = resultNewArray;
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2537,7 +2493,6 @@ export default {
             }
           }
 
-
           this.worksDetail = result;
 
           this.courseDetail = res.data[0][0];

src/components/pages/components/worksDetail3.vue

@@ -1588,23 +1588,7 @@ export default {
                 time: "",
               };
             }
-
             workJson[stagetask].time = res.data[0][k].time;
-            for (var i = 0; i < worksDetail.length; i++) {
-              if (
-                res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task &&
-                res.data[0][k].tool == worksDetail[i].tool
-              ) {
-                workJson[stagetask].img.push({
-                  src: worksDetail[i].content,
-                  id: i,
-                  score: worksDetail[i].score
-                    ? JSON.parse(worksDetail[i].score).wScore
-                    : worksDetail[i].score,
-                });
-              }
-            }
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
@@ -1799,243 +1783,215 @@ export default {
                 this.checkJson[k].allRight = isCount / t.radio.length;
               }
             }
-            for (var i = 0; i < pptInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task &&
-                res.data[0][k].tool == pptInfo[i].tool
-              ) {
-                var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
-                if (
-                  a.indexOf(
-                    pptInfo[i].content
-                      .split(".")
-                      [
-                        pptInfo[i].content.split(".").length - 1
-                      ].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    pptInfo[i].content;
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: a,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = false;
-                } else if (
-                  pptInfo[i].content
-                    .split(".")
-                    [
-                      pptInfo[i].content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = true;
-                }
-              }
-            }
+          }
 
-            for (var i = 0; i < answerInfo.length; i++) {
-              if (
-                res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task &&
-                res.data[0][k].tool == answerInfo[i].tool
-              ) {
-                const element = answerInfo[i];
-                workJson[stagetask].answerInfo.push({
-                  answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score
-                    ? JSON.parse(answerInfo[i].score).wScore
-                    : answerInfo[i].score,
-                });
+          for (var i = 0; i < worksDetail.length; i++) {
+            workJson[worksDetail[i].stage + "-" + worksDetail[i].task].img.push(
+              {
+                src: worksDetail[i].content,
+                id: i,
+                score: worksDetail[i].score
+                  ? JSON.parse(worksDetail[i].score).wScore
+                  : worksDetail[i].score,
               }
+            );
+          }
+
+          for (var i = 0; i < pptInfo.length; i++) {
+            var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
+            if (
+              a.indexOf(
+                pptInfo[i].content
+                  .split(".")
+                  [pptInfo[i].content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                pptInfo[i].content;
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: a,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = false;
+            } else if (
+              pptInfo[i].content
+                .split(".")
+                [
+                  pptInfo[i].content.split(".").length - 1
+                ].toLocaleUpperCase() == "PDF"
+            ) {
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: pptInfo[i].content,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = true;
             }
-            for (var i = 0; i < pjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task &&
-                res.data[0][k].tool == pjInfo[i].tool
-              ) {
-                var pj = pjInfo[i];
-                var a =
-                  chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
-                    pjInfo[i].task
-                  ].toolChoose;
-                var rateJson = [];
-                for (var z = 0; z < a.length; z++) {
-                  if (a[z].tool[0] == 40) {
-                    rateJson = a[z].rateJson;
-                  }
-                }
-                workJson[stagetask].pjInfo.push({
-                  answer: JSON.parse(pj.content),
-                  rateJson: rateJson,
-                  score: pjInfo[i].score
-                    ? JSON.parse(pjInfo[i].score).wScore
-                    : pjInfo[i].score,
-                });
+          }
+
+          for (var i = 0; i < answerInfo.length; i++) {
+            const element = answerInfo[i];
+            workJson[
+              answerInfo[i].stage + "-" + answerInfo[i].task
+            ].answerInfo.push({
+              answerInfo: JSON.parse(element.content)[0],
+              score: answerInfo[i].score
+                ? JSON.parse(answerInfo[i].score).wScore
+                : answerInfo[i].score,
+            });
+          }
+          for (var i = 0; i < pjInfo.length; i++) {
+            var pj = pjInfo[i];
+            var a =
+              chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
+                pjInfo[i].task
+              ].toolChoose;
+            var rateJson = [];
+            for (var z = 0; z < a.length; z++) {
+              if (a[z].tool[0] == 40) {
+                rateJson = a[z].rateJson;
               }
             }
+            workJson[pjInfo[i].stage + "-" + pjInfo[i].task].pjInfo.push({
+              answer: JSON.parse(pj.content),
+              rateJson: rateJson,
+              score: pjInfo[i].score
+                ? JSON.parse(pjInfo[i].score).wScore
+                : pjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < xztkInfo.length; i++) {
-              if (
-                res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task &&
-                res.data[0][k].tool == xztkInfo[i].tool
-              ) {
-                if (xztkInfo[i].type == 7) {
-                  var xztk = xztkInfo[i];
-                  var a =
-                    chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
-                      xztkInfo[i].task
-                    ].toolChoose;
-                  var selectJson = [];
-                  for (var z = 0; z < a.length; z++) {
-                    if (a[z].tool[0] == 41) {
-                      selectJson = a[z].selectJson;
-                    }
-                  }
-                  workJson[stagetask].xztkInfo.push({
-                    answer: xztk.content.split(",").map(Number),
-                    selectJson: selectJson,
-                    score: xztkInfo[i].score
-                      ? JSON.parse(xztkInfo[i].score).wScore
-                      : xztkInfo[i].score,
-                  });
+          for (var i = 0; i < xztkInfo.length; i++) {
+            if (xztkInfo[i].type == 7) {
+              var xztk = xztkInfo[i];
+              var a =
+                chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
+                  xztkInfo[i].task
+                ].toolChoose;
+              var selectJson = [];
+              for (var z = 0; z < a.length; z++) {
+                if (a[z].tool[0] == 41) {
+                  selectJson = a[z].selectJson;
                 }
               }
+              workJson[
+                xztkInfo[i].stage + "-" + xztkInfo[i].task
+              ].xztkInfo.push({
+                answer: xztk.content.split(",").map(Number),
+                selectJson: selectJson,
+                score: xztkInfo[i].score
+                  ? JSON.parse(xztkInfo[i].score).wScore
+                  : xztkInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < lccjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task &&
-                res.data[0][k].tool == lccjInfo[i].tool
-              ) {
-                var lccj = lccjInfo[i];
-                workJson[stagetask].lccjInfo.push({
-                  lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score
-                    ? JSON.parse(lccjInfo[i].score).wScore
-                    : lccjInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < lccjInfo.length; i++) {
+            var lccj = lccjInfo[i];
+            workJson[lccjInfo[i].stage + "-" + lccjInfo[i].task].lccjInfo.push({
+              lccjInfo: JSON.parse(lccj.content)[0],
+              score: lccjInfo[i].score
+                ? JSON.parse(lccjInfo[i].score).wScore
+                : lccjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < bgInfo.length; i++) {
-              if (
-                res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task &&
-                res.data[0][k].tool == bgInfo[i].tool
-              ) {
-                var bg = bgInfo[i];
-                workJson[stagetask].bgInfo.push({
-                  bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score
-                    ? JSON.parse(bgInfo[i].score).wScore
-                    : bgInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < bgInfo.length; i++) {
+            var bg = bgInfo[i];
+            workJson[bgInfo[i].stage + "-" + bgInfo[i].task].bgInfo.push({
+              bgInfo: JSON.parse(bg.content),
+              score: bgInfo[i].score
+                ? JSON.parse(bgInfo[i].score).wScore
+                : bgInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < cocopiInfo.length; i++) {
-              if (
-                res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task &&
-                res.data[0][k].tool == cocopiInfo[i].tool
-              ) {
-                var cocopi = cocopiInfo[i];
-                var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-                var d = [
-                  "BMP",
-                  "PJP",
-                  "APNG",
-                  "PNG",
-                  "JPG",
-                  "GIF",
-                  "SVG",
-                  "JPEG",
-                  "JPG",
-                  "ICO",
-                  "PGPEG",
-                  "AVIF",
-                ];
-                var t = 0; //t = 1是图片 2是文档 3是pdf
-                if (
-                  d.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 1;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  c.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 2;
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    cocopi.content;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: a,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  cocopi.content
-                    .split(".")
-                    [
-                      cocopi.content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  t = 3;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                }
-              }
+          for (var i = 0; i < cocopiInfo.length; i++) {
+            var cocopi = cocopiInfo[i];
+            var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
+            var d = [
+              "BMP",
+              "PJP",
+              "APNG",
+              "PNG",
+              "JPG",
+              "GIF",
+              "SVG",
+              "JPEG",
+              "JPG",
+              "ICO",
+              "PGPEG",
+              "AVIF",
+            ];
+            var t = 0; //t = 1是图片 2是文档 3是pdf
+            if (
+              d.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 1;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              c.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 2;
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                cocopi.content;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: a,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              cocopi.content
+                .split(".")
+                [cocopi.content.split(".").length - 1].toLocaleUpperCase() ==
+              "PDF"
+            ) {
+              t = 3;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < wordInfo.length; i++) {
-              if (
-                res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task &&
-                res.data[0][k].tool == wordInfo[i].tool
-              ) {
-                var word = wordInfo[i];
-                workJson[stagetask].wordInfo.push({
-                  wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score
-                    ? JSON.parse(wordInfo[i].score).wScore
-                    : wordInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < wordInfo.length; i++) {
+            var word = wordInfo[i];
+            workJson[wordInfo[i].stage + "-" + wordInfo[i].task].wordInfo.push({
+              wordInfo: JSON.parse(word.content),
+              score: wordInfo[i].score
+                ? JSON.parse(wordInfo[i].score).wScore
+                : wordInfo[i].score,
+            });
           }
           // const result = workJson.filter((item, index, arr) => {
           //   return (
@@ -2060,7 +2016,7 @@ export default {
             // 如果第一个数字相同，则比较第二个数字
             return parseInt(x_parts[1]) - parseInt(y_parts[1]);
           });
-          result = resultNewArray
+          result = resultNewArray;
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2161,20 +2117,6 @@ export default {
             }
           }
 
-          // var resultNewArray = result.sort(function (x, y) {
-          //   // 以stagetask字段为排序依据
-          //   var x_parts = x.stagetask.split("-");
-          //   var y_parts = y.stagetask.split("-");
-
-          //   // 首先比较第一个数字
-          //   if (x_parts[0] !== y_parts[0]) {
-          //     return parseInt(x_parts[0]) - parseInt(y_parts[0]);
-          //   }
-
-          //   // 如果第一个数字相同，则比较第二个数字
-          //   return parseInt(x_parts[1]) - parseInt(y_parts[1]);
-          // });
-
           this.worksDetail = result;
 
           this.courseDetail = res.data[0][0];

src/components/pages/myReport/components/MyLookComponent/worksDetail3.vue

@@ -1587,23 +1587,7 @@ export default {
                 time: "",
               };
             }
-
             workJson[stagetask].time = res.data[0][k].time;
-            for (var i = 0; i < worksDetail.length; i++) {
-              if (
-                res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task &&
-                res.data[0][k].tool == worksDetail[i].tool
-              ) {
-                workJson[stagetask].img.push({
-                  src: worksDetail[i].content,
-                  id: i,
-                  score: worksDetail[i].score
-                    ? JSON.parse(worksDetail[i].score).wScore
-                    : worksDetail[i].score,
-                });
-              }
-            }
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
@@ -1798,243 +1782,215 @@ export default {
                 this.checkJson[k].allRight = isCount / t.radio.length;
               }
             }
-            for (var i = 0; i < pptInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task &&
-                res.data[0][k].tool == pptInfo[i].tool
-              ) {
-                var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
-                if (
-                  a.indexOf(
-                    pptInfo[i].content
-                      .split(".")
-                      [
-                        pptInfo[i].content.split(".").length - 1
-                      ].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    pptInfo[i].content;
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: a,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = false;
-                } else if (
-                  pptInfo[i].content
-                    .split(".")
-                    [
-                      pptInfo[i].content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  workJson[stagetask].wpptInfo.push({
-                    wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score
-                      ? JSON.parse(pptInfo[i].score).wScore
-                      : pptInfo[i].score,
-                  });
-                  this.showPDF = true;
-                }
-              }
-            }
+          }
 
-            for (var i = 0; i < answerInfo.length; i++) {
-              if (
-                res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task &&
-                res.data[0][k].tool == answerInfo[i].tool
-              ) {
-                const element = answerInfo[i];
-                workJson[stagetask].answerInfo.push({
-                  answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score
-                    ? JSON.parse(answerInfo[i].score).wScore
-                    : answerInfo[i].score,
-                });
+          for (var i = 0; i < worksDetail.length; i++) {
+            workJson[worksDetail[i].stage + "-" + worksDetail[i].task].img.push(
+              {
+                src: worksDetail[i].content,
+                id: i,
+                score: worksDetail[i].score
+                  ? JSON.parse(worksDetail[i].score).wScore
+                  : worksDetail[i].score,
               }
+            );
+          }
+
+          for (var i = 0; i < pptInfo.length; i++) {
+            var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
+            if (
+              a.indexOf(
+                pptInfo[i].content
+                  .split(".")
+                  [pptInfo[i].content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                pptInfo[i].content;
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: a,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = false;
+            } else if (
+              pptInfo[i].content
+                .split(".")
+                [
+                  pptInfo[i].content.split(".").length - 1
+                ].toLocaleUpperCase() == "PDF"
+            ) {
+              workJson[pptInfo[i].stage + "-" + pptInfo[i].task].wpptInfo.push({
+                wpptInfo: pptInfo[i].content,
+                score: pptInfo[i].score
+                  ? JSON.parse(pptInfo[i].score).wScore
+                  : pptInfo[i].score,
+              });
+              this.showPDF = true;
             }
-            for (var i = 0; i < pjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task &&
-                res.data[0][k].tool == pjInfo[i].tool
-              ) {
-                var pj = pjInfo[i];
-                var a =
-                  chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
-                    pjInfo[i].task
-                  ].toolChoose;
-                var rateJson = [];
-                for (var z = 0; z < a.length; z++) {
-                  if (a[z].tool[0] == 40) {
-                    rateJson = a[z].rateJson;
-                  }
-                }
-                workJson[stagetask].pjInfo.push({
-                  answer: JSON.parse(pj.content),
-                  rateJson: rateJson,
-                  score: pjInfo[i].score
-                    ? JSON.parse(pjInfo[i].score).wScore
-                    : pjInfo[i].score,
-                });
+          }
+
+          for (var i = 0; i < answerInfo.length; i++) {
+            const element = answerInfo[i];
+            workJson[
+              answerInfo[i].stage + "-" + answerInfo[i].task
+            ].answerInfo.push({
+              answerInfo: JSON.parse(element.content)[0],
+              score: answerInfo[i].score
+                ? JSON.parse(answerInfo[i].score).wScore
+                : answerInfo[i].score,
+            });
+          }
+          for (var i = 0; i < pjInfo.length; i++) {
+            var pj = pjInfo[i];
+            var a =
+              chapters[0][pjInfo[i].stage].chapterInfo[0].taskJson[
+                pjInfo[i].task
+              ].toolChoose;
+            var rateJson = [];
+            for (var z = 0; z < a.length; z++) {
+              if (a[z].tool[0] == 40) {
+                rateJson = a[z].rateJson;
               }
             }
+            workJson[pjInfo[i].stage + "-" + pjInfo[i].task].pjInfo.push({
+              answer: JSON.parse(pj.content),
+              rateJson: rateJson,
+              score: pjInfo[i].score
+                ? JSON.parse(pjInfo[i].score).wScore
+                : pjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < xztkInfo.length; i++) {
-              if (
-                res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task &&
-                res.data[0][k].tool == xztkInfo[i].tool
-              ) {
-                if (xztkInfo[i].type == 7) {
-                  var xztk = xztkInfo[i];
-                  var a =
-                    chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
-                      xztkInfo[i].task
-                    ].toolChoose;
-                  var selectJson = [];
-                  for (var z = 0; z < a.length; z++) {
-                    if (a[z].tool[0] == 41) {
-                      selectJson = a[z].selectJson;
-                    }
-                  }
-                  workJson[stagetask].xztkInfo.push({
-                    answer: xztk.content.split(",").map(Number),
-                    selectJson: selectJson,
-                    score: xztkInfo[i].score
-                      ? JSON.parse(xztkInfo[i].score).wScore
-                      : xztkInfo[i].score,
-                  });
+          for (var i = 0; i < xztkInfo.length; i++) {
+            if (xztkInfo[i].type == 7) {
+              var xztk = xztkInfo[i];
+              var a =
+                chapters[0][xztkInfo[i].stage].chapterInfo[0].taskJson[
+                  xztkInfo[i].task
+                ].toolChoose;
+              var selectJson = [];
+              for (var z = 0; z < a.length; z++) {
+                if (a[z].tool[0] == 41) {
+                  selectJson = a[z].selectJson;
                 }
               }
+              workJson[
+                xztkInfo[i].stage + "-" + xztkInfo[i].task
+              ].xztkInfo.push({
+                answer: xztk.content.split(",").map(Number),
+                selectJson: selectJson,
+                score: xztkInfo[i].score
+                  ? JSON.parse(xztkInfo[i].score).wScore
+                  : xztkInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < lccjInfo.length; i++) {
-              if (
-                res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task &&
-                res.data[0][k].tool == lccjInfo[i].tool
-              ) {
-                var lccj = lccjInfo[i];
-                workJson[stagetask].lccjInfo.push({
-                  lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score
-                    ? JSON.parse(lccjInfo[i].score).wScore
-                    : lccjInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < lccjInfo.length; i++) {
+            var lccj = lccjInfo[i];
+            workJson[lccjInfo[i].stage + "-" + lccjInfo[i].task].lccjInfo.push({
+              lccjInfo: JSON.parse(lccj.content)[0],
+              score: lccjInfo[i].score
+                ? JSON.parse(lccjInfo[i].score).wScore
+                : lccjInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < bgInfo.length; i++) {
-              if (
-                res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task &&
-                res.data[0][k].tool == bgInfo[i].tool
-              ) {
-                var bg = bgInfo[i];
-                workJson[stagetask].bgInfo.push({
-                  bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score
-                    ? JSON.parse(bgInfo[i].score).wScore
-                    : bgInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < bgInfo.length; i++) {
+            var bg = bgInfo[i];
+            workJson[bgInfo[i].stage + "-" + bgInfo[i].task].bgInfo.push({
+              bgInfo: JSON.parse(bg.content),
+              score: bgInfo[i].score
+                ? JSON.parse(bgInfo[i].score).wScore
+                : bgInfo[i].score,
+            });
+          }
 
-            for (var i = 0; i < cocopiInfo.length; i++) {
-              if (
-                res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task &&
-                res.data[0][k].tool == cocopiInfo[i].tool
-              ) {
-                var cocopi = cocopiInfo[i];
-                var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
-                var d = [
-                  "BMP",
-                  "PJP",
-                  "APNG",
-                  "PNG",
-                  "JPG",
-                  "GIF",
-                  "SVG",
-                  "JPEG",
-                  "JPG",
-                  "ICO",
-                  "PGPEG",
-                  "AVIF",
-                ];
-                var t = 0; //t = 1是图片 2是文档 3是pdf
-                if (
-                  d.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 1;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  c.indexOf(
-                    cocopi.content
-                      .split(".")
-                      [cocopi.content.split(".").length - 1].toLocaleUpperCase()
-                  ) != -1
-                ) {
-                  t = 2;
-                  var a =
-                    "https://view.officeapps.live.com/op/view.aspx?src=" +
-                    cocopi.content;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: a,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                } else if (
-                  cocopi.content
-                    .split(".")
-                    [
-                      cocopi.content.split(".").length - 1
-                    ].toLocaleUpperCase() == "PDF"
-                ) {
-                  t = 3;
-                  workJson[stagetask].cocopiInfo.push({
-                    url: cocopi.content,
-                    type: t,
-                    score: cocopiInfo[i].score
-                      ? JSON.parse(cocopiInfo[i].score).wScore
-                      : cocopiInfo[i].score,
-                  });
-                }
-              }
+          for (var i = 0; i < cocopiInfo.length; i++) {
+            var cocopi = cocopiInfo[i];
+            var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
+            var d = [
+              "BMP",
+              "PJP",
+              "APNG",
+              "PNG",
+              "JPG",
+              "GIF",
+              "SVG",
+              "JPEG",
+              "JPG",
+              "ICO",
+              "PGPEG",
+              "AVIF",
+            ];
+            var t = 0; //t = 1是图片 2是文档 3是pdf
+            if (
+              d.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 1;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              c.indexOf(
+                cocopi.content
+                  .split(".")
+                  [cocopi.content.split(".").length - 1].toLocaleUpperCase()
+              ) != -1
+            ) {
+              t = 2;
+              var a =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                cocopi.content;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: a,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
+            } else if (
+              cocopi.content
+                .split(".")
+                [cocopi.content.split(".").length - 1].toLocaleUpperCase() ==
+              "PDF"
+            ) {
+              t = 3;
+              workJson[
+                cocopiInfo[i].stage + "-" + cocopiInfo[i].task
+              ].cocopiInfo.push({
+                url: cocopi.content,
+                type: t,
+                score: cocopiInfo[i].score
+                  ? JSON.parse(cocopiInfo[i].score).wScore
+                  : cocopiInfo[i].score,
+              });
             }
+          }
 
-            for (var i = 0; i < wordInfo.length; i++) {
-              if (
-                res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task &&
-                res.data[0][k].tool == wordInfo[i].tool
-              ) {
-                var word = wordInfo[i];
-                workJson[stagetask].wordInfo.push({
-                  wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score
-                    ? JSON.parse(wordInfo[i].score).wScore
-                    : wordInfo[i].score,
-                });
-              }
-            }
+          for (var i = 0; i < wordInfo.length; i++) {
+            var word = wordInfo[i];
+            workJson[wordInfo[i].stage + "-" + wordInfo[i].task].wordInfo.push({
+              wordInfo: JSON.parse(word.content),
+              score: wordInfo[i].score
+                ? JSON.parse(wordInfo[i].score).wScore
+                : wordInfo[i].score,
+            });
           }
           // const result = workJson.filter((item, index, arr) => {
           //   return (
@@ -2059,7 +2015,7 @@ export default {
             // 如果第一个数字相同，则比较第二个数字
             return parseInt(x_parts[1]) - parseInt(y_parts[1]);
           });
-          result = resultNewArray
+          result = resultNewArray;
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2160,20 +2116,6 @@ export default {
             }
           }
 
-          // var resultNewArray = result.sort(function (x, y) {
-          //   // 以stagetask字段为排序依据
-          //   var x_parts = x.stagetask.split("-");
-          //   var y_parts = y.stagetask.split("-");
-
-          //   // 首先比较第一个数字
-          //   if (x_parts[0] !== y_parts[0]) {
-          //     return parseInt(x_parts[0]) - parseInt(y_parts[0]);
-          //   }
-
-          //   // 如果第一个数字相同，则比较第二个数字
-          //   return parseInt(x_parts[1]) - parseInt(y_parts[1]);
-          // });
-
           this.worksDetail = result;
 
           this.courseDetail = res.data[0][0];