Merge branch 'feature-tianyong' into gym-test

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

@@ -226,7 +226,6 @@ export default defineComponent({
         const end = difftime + (item.sourceRelaEndtime || item.relaEndtime) - starTime;
         const isStaccato = note.noteElement.voiceEntry.isStaccato();
         const noteRate = isStaccato ? 0.5 : 1;
-        debugger
         if (note.formatLyricsEntries.contains("Play") || note.formatLyricsEntries.contains("Play...")) {
           ListenMode = false;
         }
@@ -446,6 +445,7 @@ export default defineComponent({
       // 非选段状态，从头开始评测，重置速度
       if (!state.sectionStatus && state.section.length === 0) {
         state.activeNoteIndex = 0;
+        state.activeMeasureIndex = 1;
         state.speed = state.times[0].measureSpeed * state.basePlayRate
       }
       initSetPlayRate();

src/page-instrument/simple-detail/index.tsx

@@ -101,6 +101,7 @@ export default defineComponent({
 			const id = query.id || '';
 			detailData.backgroundRendMode = query.backgroundRendMode;
 			state.isSimplePage = true;
+			state.partIndex = query["part-index"] ? Number(query["part-index"]) : 0;
 			await getMusicDetail(id, 'open');
 			detailData.isLoading = false;
 			state.isSingleLine = true;

src/state.ts

@@ -1472,7 +1472,7 @@ const getMusicInfo = async (res: any) => {
     }
   }
   // 设置音源  track 为当前的声轨 index为当前的
-  const { track, index, musicalInstrumentId } = state.isSimplePage ? { track:tracks[0], index:0, musicalInstrumentId: '' } : initMusicSource(res.data, tracks, partIndex, workRecordInstrumentId)
+  const { track, index, musicalInstrumentId } = state.isSimplePage ? { track:tracks[0], index: state.partIndex, musicalInstrumentId: '' } : initMusicSource(res.data, tracks, partIndex, workRecordInstrumentId)
   // 这里返回的track可能和实际的对不上，所以重新筛选一下
   const realTrack = musicalInstrumentId && res.data?.musicalInstruments?.length ? res.data?.musicalInstruments.find((item: any) => item?.id == musicalInstrumentId)?.code?.split(',')?.[0] : '';
   const musicInfo = {

src/view/selection/index.module.less

@@ -62,7 +62,7 @@
     // margin-top: -17PX;
     border-radius: 4Px;
     opacity: var(--corsor-opacity);
-    transform: translate(4PX, -53%);
+    transform: translate(4PX, -50%);
 }
 .eyeLine {
     background-color: rgb(255, 159, 88);
@@ -205,7 +205,7 @@
     position: relative;
     width: fit-content;
     left: 50%;
-    top: -10px;
+    top: -40px;
     transform: translate(-50%);
     > img {
         width: auto;