Merge branch 'hotfix-11-11' into gym-online

src/page-instrument/custom-plugins/recording-time/index.tsx

@@ -15,8 +15,9 @@ const handleRecord = () => {
 	recordData.starTime = Date.now();
 	if (total < 0) total = 0;
 	const totalTime = total / 1000;
+	const query: any = getQuery();
 
-	const body = {
+	const body: any = {
 		clientType: storeData.user.clientType,
 		musicSheetId: state.examSongId,
 		sysMusicScoreId: state.examSongId,
@@ -26,6 +27,10 @@ const handleRecord = () => {
 		deviceType: browser().android ? "ANDROID" : "IOS",
 		behaviorId: getBehaviorId(),
 	};
+	// 如果是作业模式，需要添加作业id
+	if (query.workRecord || query.evaluatingRecord) {
+		body.lessonDetailId = query.workRecord || query.evaluatingRecord
+	}	
 	api_musicPracticeRecordSave(body);
 };
 

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

@@ -46,7 +46,7 @@ export default defineComponent({
       // 评测的速度，如果是选段，则选选段开头小节的速度
       const evaluatSpeed = state.sectionStatus && state.section.length === 2 && state.section[0].measureSpeed ? state.section[0].measureSpeed * state.basePlayRate : state.speed;  
       const rate = state.basePlayRate * state.originAudioPlayRate; // 播放倍率    
-      const body = {
+      const body: any = {
         deviceType: browser().android ? "ANDROID" : "IOS", // 设备类型
         intonation: evaluatingData.resultData.intonation, // 音准
         cadence: evaluatingData.resultData.cadence, // 节奏
@@ -66,8 +66,12 @@ export default defineComponent({
         recordFilePath: evaluatingData.resultData.url, // 录音文件路径
         delFlag: evaluatingData.oneselfCancleEvaluating,
         instrumentId: state.instrumentId,
-        playRate: rate
+        playRate: rate,
       };
+      // 如果是评测作业模式，需要添加作业id
+      if (query.evaluatingRecord) {
+        body.lessonDetailId = query.evaluatingRecord
+      }      
       data.saveLoading = true;
       const res = await api_musicPracticeRecordSave(body);
       if (res?.code === 200) {