Merge branch 'dev'

src/page-instrument/custom-plugins/work-home/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
 					console.log("🚀 ~ error:", error);
 				}
 				training.times = trainingContent.trainingTimes || 0;
-				training.trainingTimes = workeData.trainingTimes || "0";
+				training.trainingTimes = (workeData.trainingTimes / 60).toFixed(1) || "0";
 				training.trainingSpeed = trainingContent.practiceSpeed;
 				if (training.trainingSpeed && training.isAddOk === 0) {
 					handleSetSpeed(training.trainingSpeed);
@@ -55,13 +55,13 @@ export default defineComponent({
 		const getWorkDetail = async () => {
 			const res = await api_lessonTrainingTrainingStudentDetail(props.workeData.id);
 			if (res?.code === 200) {
-				training.trainingTimes = res.data.trainingTimes || "0";
+				training.trainingTimes = (res.data.trainingTimes / 60).toFixed(1) || "0";
 			}
 		};
 
 		/** 添加作业记录 */
 		const addHomeworkRecored = async () => {
-			let total = ((Date.now() - training.starTime) / 1000 / 60).toFixed(2);
+			let total = Math.ceil((Date.now() - training.starTime) / 1000);
 			try {
 				const res = await api_lessonTrainingSubmitTraining({
 					id: props.workeData.id,

src/page-instrument/evaluat-model/index.module.less

@@ -22,7 +22,7 @@
   .endBtn{
     position: fixed;
     left: 50%;
-    top: 16px;
+    bottom: 16px;
     width: 120px;
     height: 40px;
     margin-left: -70px;

src/view/fingering/fingering-config.ts

@@ -83,7 +83,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
 			Piano: 150,
 			1: 120,
 		  }
-		return subject[id];
+		return subject[id] || 0;
 	}
 	return 0;
 };