Merge branch 'feature-tianyong'

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

@@ -20,6 +20,7 @@ import iconEvaluat from "./icons/evaluating.json";
 import { api_musicPracticeRecordVideoUpload } from "../api";
 import DelayCheck from "./delay-check";
 import { headTopData } from "../header-top/index";
+import { getQuery } from "/src/utils/queryString";
 
 // frequency 频率, amplitude 振幅, decibels 分贝
 type TCriteria = "frequency" | "amplitude" | "decibels";
@@ -35,6 +36,7 @@ let calculateInfo: any = {}
 export default defineComponent({
   name: "evaluat-model",
   setup() {
+    const query = getQuery();
     const evaluatModel = reactive({
       tips: true,
       evaluatUpdateAudio: false,
@@ -45,9 +47,13 @@ export default defineComponent({
      * 检测返回
      */
     const handleDelayBack = () => {
-      evaluatingData.soundEffectMode = false;
-      handleRessetState();
-      headTopData.modeType = "init";
+      if (query.workRecord) {
+        evaluatingData.soundEffectMode = false;
+      } else {
+        evaluatingData.soundEffectMode = false;
+        handleRessetState();
+        headTopData.modeType = "init";
+      }
     }
     /**
      * 执行检测

src/state.ts

@@ -552,7 +552,7 @@ export const setSection = (start: number, end: number, userSpeed?: number) => {
   const isCanRepeat = canRepeatInfo.canRepeat
   // 如果符合重播规则，但是lastEndNotes长度为1，则需要向前找，直到找到lastEndNotes长度为2
   let currentEndNum: number = end
-  const lastEndIndex = canRepeatInfo.repeatIdx
+  const lastEndIndex = state.repeatInfo[canRepeatInfo.repeatIdx]?.end || 0
   while (isCanRepeat && lastEndNotes.length === 1 && lastEndNotes[0].MeasureNumberXML <= lastEndIndex) {
     currentEndNum = currentEndNum - 1
     const newEndNotes = state.times.filter(