Browse Source

fix: 评测报告修改

TIANYONG 8 tháng trước cách đây
mục cha
commit
9ddf2a4eb2
1 tập tin đã thay đổi với 12 bổ sung7 xóa
  1. 12 7
      src/page-instrument/view-evaluat-report/index.tsx

+ 12 - 7
src/page-instrument/view-evaluat-report/index.tsx

@@ -238,8 +238,7 @@ export default defineComponent({
     };
 
     const filterNotes = () => {
-      // let include = detailData.isNewReport ? ["RIGHT", "WRONG", "NOT_PLAYED"] : ["RIGHT", "WRONG", "NOT_PLAY"];
-      let include = ["RIGHT", "WRONG", "NOT_PLAYED"]
+      let include = detailData.isNewReport ? ["RIGHT", "WRONG", "NOT_PLAYED"] : ["RIGHT", "WRONG", "NOT_PLAY"];
       if (scoreData.itemType === "intonation") {
         // 音准
         include.push(...["HIGH", "LOW"]);
@@ -248,7 +247,7 @@ export default defineComponent({
         include.push(...["EARLY", "LATE"]);
       } else if (scoreData.itemType === "integrity") {
         // 完整性
-        include = ["SHORT", "NORMAL", "NOT_PLAYED"];
+        include = detailData.isNewReport ? ["SHORT", "NORMAL", "NOT_PLAYED"] : ["INTEGRITY_WRONG", "RIGHT", "NOT_PLAY"];
       }
       if (scoreData.itemType === "cadence") {
         return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.rhythmicAssessment ? item.rhythmicAssessment.result : item.musicalErrorType));
@@ -285,7 +284,6 @@ export default defineComponent({
           } else {
             errType = note.musicalErrorType
           }
-          // console.log(1111222,errType)
           /**
            * 新版小酷AI不需要在当前的音符复制出来一个音符,所以注释掉isNeedCopyElement和copySvg
            */
@@ -294,12 +292,19 @@ export default defineComponent({
           // if (scoreData.itemType === "integrity") {
           //   errType = errType = note.pitchAssessment.result === "HIGH" || note.pitchAssessment.result === "LOW" || note.pitchAssessment.result === "WRONG" ? "RIGHT" : errType;
           // }
-          if (scoreData.itemType === "integrity") {
-            errType = errType = note.integrityAssessment.result === "NORMAL" ? "RIGHT" : note.integrityAssessment.result === "SHORT" ? "SHORT" : errType;
+          if (detailData.isNewReport) {
+            if (scoreData.itemType === "integrity") {
+              errType = errType = note.integrityAssessment.result === "NORMAL" ? "RIGHT" : note.integrityAssessment.result === "SHORT" ? "SHORT" : errType;
+            }
+          } else {
+            errType = note.musicalErrorType
+          }
+          if (!detailData.isNewReport) {
+            errType = errType == "NOT_PLAY" ? "NOT_PLAYED" : errType == "INTEGRITY_WRONG" ? "SHORT" : errType;
           }
           stemEl?.classList.add(colorsClass[errType]);
           svgEl?.classList.add(colorsClass[errType]);
-          // console.log(123456,'添加颜色',errType)
+          console.log(123456,'添加颜色',errType)
           // 评测过的音符,需要给小节添加背景色
           // if (errType !== "NOT_PLAYED") {
           //   const staveNote = svgEl?.parentNode?.parentNode?.querySelector(".vf-stave");