Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/page-instrument/evaluat-model/index.tsx

@@ -568,7 +568,7 @@ export default defineComponent({
               // #11035,可能刚好关闭耳机弹窗的时候，第二次又出现了弹窗
               setTimeout(() => {
                 evaluatingData.earphoneMode = false;
-              }, 0);
+              }, 300);
               // handlePerformDetection();
               checkEarphoneStatus("start");
             }}

src/page-instrument/view-evaluat-report/component/share-top/index.tsx

@@ -408,7 +408,7 @@ export default defineComponent({
                       </div>
                     </>
                   )}
-                  {(itemType.value === "intonation" || itemType.value === "integrity") && (
+                  {itemType.value === "integrity" && (
                     <div>
                       <i style={{ background: bgColors.lack }}></i>
                       <span>时值不足</span>

src/page-instrument/view-evaluat-report/index.tsx

@@ -251,7 +251,7 @@ export default defineComponent({
       if (scoreData.itemType === "cadence") {
         return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.rhythmicAssessment.result));
       } else if (scoreData.itemType === "integrity") {
-        return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.integrityAssessment.result));
+        return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.integrityAssessment?.result));
       } else  {
         return detailData.musicalNotesPlayStats.filter((item: any) => {
           let result = item.pitchAssessment.result;
@@ -268,7 +268,8 @@ export default defineComponent({
       const notes = filterNotes();
       // console.log(1111,notes)
       for (const note of notes) {
-        const active = allNote.value[note.musicalNotesIndex];
+        const idx = note.musicalNotesIndex !== undefined ? note.musicalNotesIndex : note.index;
+        const active = allNote.value[idx];
         setTimeout(() => {
           if (useedid.value.includes(active.id)) {
             return;

src/state.ts

@@ -1105,6 +1105,8 @@ export const handleChangeSection = () => {
   if (state.sectionStatus) {
     togglePlay("paused");
     clearSelection();
+    // 重置速度和播放倍率
+    resetBaseRate(state.activeNoteIndex);
     //skipNotePlay(0, true);  取消选段的时候 不跳回开头
     state.sectionFirst = null;
     return;

src/view/transfer-to-img/index.tsx

@@ -51,7 +51,7 @@ export default defineComponent({
 			}
 			//课堂乐器,默认简谱
 			sessionStorage.setItem(productRenderType, detailData.product[detailData.step].type);
-
+			state.musicRenderType = detailData.product[detailData.step].type
 			showLoadingToast({ message: "生成中", duration: 0 });
 			setTimeout(() => {
 				detailData.isLoading = false;
@@ -75,6 +75,7 @@ export default defineComponent({
 			if (detailData.step !== detailData.product.length) {
 				//课堂乐器,默认简谱
 				sessionStorage.setItem(productRenderType, detailData.product[detailData.step].type);
+				state.musicRenderType = detailData.product[detailData.step].type
 				nextTick(() => {
 					detailData.isLoading = true;
 					setTimeout(() => {