fix: bug修改

src/page-instrument/custom-plugins/ExerciseStatistics/index.module.less

@@ -68,3 +68,7 @@
         }
     }
 }
+
+.hidden {
+    display: none;
+}

src/page-instrument/custom-plugins/ExerciseStatistics/index.tsx

@@ -4,6 +4,7 @@ import iconTime from "./icon-time.png";
 import request from "/src/utils/request";
 import { getSecondRPM } from "/src/utils";
 import state from '/src/state'
+import { headTopData } from "/src/page-instrument/header-top/index";
 
 // 练习统计
 export default defineComponent({
@@ -45,7 +46,7 @@ export default defineComponent({
 			getTime();
 		});
 		return () => (
-			<div class={styles.exerciseStatistics} onClick={() => (data.isHidden = !data.isHidden)}>
+			<div class={[styles.exerciseStatistics, headTopData.modeType !== 'show' && styles.hidden]} onClick={() => (data.isHidden = !data.isHidden)}>
 				<div class={[styles.btnTimeWrap, data.isHidden ? "" : styles.hide]}>
 					<img class={styles.icon} src={iconTime} />
 					<div class={styles.btnTietle}>练习时长</div>

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

@@ -4,6 +4,7 @@ import styles from "./index.module.less";
 import { api_lessonTrainingSubmitTraining, api_lessonTrainingTrainingStudentDetail } from "../../api";
 import state, { handleSetSpeed, hanldeDirectSelection, setSection } from "/src/state";
 import { getQuery } from "/src/utils/queryString";
+import { data as workData } from "../work-index"
 
 export default defineComponent({
 	name: "HomeWork",
@@ -43,6 +44,7 @@ export default defineComponent({
 			const workeData = props.workeData;
 			if (workeData.id) {
 				training.times = workeData.times || 0;
+				console.log('作业次数',workeData.trainingTimes)
 				training.trainingTimes = workeData.trainingTimes || 0;
 				training.trainingSpeed = workeData.trainingSpeed;
 				training.start = Number(workeData.start);
@@ -59,6 +61,7 @@ export default defineComponent({
 			const res = await api_lessonTrainingTrainingStudentDetail(props.workeData.id, 'homeWork');
 			if (res?.code === 200) {
 				training.trainingTimes = res.data.trainingTimes || 0;
+				workData.worke.trainingTimes = training.trainingTimes;
 			}
 		};
 

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

@@ -13,7 +13,7 @@ const workEvaluatRef = ref();
 export const data = reactive({
 	/** 作业类型：练习PRACTICE, 评测EVALUATION */
 	trainingType: "" as "PRACTICE" | "EVALUATION",
-	worke: {},
+	worke: {} as any,
 });
 
 export const HANDLE_WORK_ADD = () => {

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

@@ -406,10 +406,12 @@
             .plyr__controls {
                 .plyr__controls__item.plyr__control {
                     .icon--pressed {
+                        background-size: 100% 100%;
                         background: url("./image/pause2.png") no-repeat;
                     }
 
                     .icon--not-pressed {
+                        background-size: 100% 100%;
                         background: url("./image/play2.png") no-repeat;
                     }
                 }

src/page-instrument/view-evaluat-report/index.module.less

@@ -46,6 +46,13 @@
     #selectionBox {
       pointer-events: none;
     }
+
+    .vf-stavenote {
+      path {
+        fill: #ADADAD;
+        stroke: #ADADAD;
+      }
+    }
   }
 
   .headHeight {
@@ -100,22 +107,22 @@
 
 .right {
   path {
-    fill: #01B996;
-    stroke: #01B996;
+    fill: #01B996 !important;
+    stroke: #01B996 !important;
   }
 }
 
 .inaccuracy {
   path {
-    fill: #FF9200;
-    stroke: #FF9200;
+    fill: #FF9200 !important;
+    stroke: #FF9200 !important;
   }
 }
 
 .wrong {
   path {
-    fill: #8F4EFB;
-    stroke: #8F4EFB;
+    fill: #8F4EFB !important;
+    stroke: #8F4EFB !important;
   }
 }
 
@@ -129,56 +136,56 @@
 // 音准
 .intonation_wrong {
   path{
-    fill: #FF9200;
-    stroke: #FF9200;
+    fill: #FF9200 !important;
+    stroke: #FF9200 !important;
   }
 }
 
 // 音准高
 .intonation_high {
   path{
-    fill: #EF231D;
-    stroke: #EF231D;
+    fill: #EF231D !important;
+    stroke: #EF231D !important;
   }
 }
 
 // 音准低
 .intonation_low {
   path{
-    fill: #0E79FF;
-    stroke: #0E79FF;
+    fill: #0E79FF !important;
+    stroke: #0E79FF !important;
   }
 }
 
 // 节奏
 .cadence_wrong {
   path{
-    fill: #FF9200;
-    stroke: #FF9200;
+    fill: #FF9200 !important;
+    stroke: #FF9200 !important;
   }
 }
 
 // 节奏快
 .cadence_fast {
   path {
-    fill: #F63582;
-    stroke: #F63582;
+    fill: #F63582 !important;
+    stroke: #F63582 !important;
   }
 }
 
 // 节奏慢
 .cadence_slow {
   path {
-    fill: #FFAA00;
-    stroke: #FFAA00;
+    fill: #FFAA00 !important;
+    stroke: #FFAA00 !important;
   }
 }
 
 // 完成度
 .integrity_wrong {
   path {
-    fill: #FF8219;
-    stroke: #FF8219;
+    fill: #FF8219 !important;
+    stroke: #FF8219 !important;
   }
 }
 

src/state.ts

@@ -1189,7 +1189,7 @@ export const handleChangeSection = () => {
 // 重置设置
 export const resetSettings = () => {
   // 切换模式，清除选段
-  metronomeData.cursorMode = 2;
+  metronomeData.cursorMode = state.modeType === 'follow' ? 1 : 2;
   state.noSavePopShow = true;
   clearSelection();
   skipNotePlay(0, true);

src/view/fingering/fingering-config.ts

@@ -169,6 +169,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
       "Clarinet in Bb 2": 4,
       "Alto Clarinet in Eb": 4,
       "Bass Clarinet in Bb": 4,
+      "1st Clarinet in Bb": 4,
       Bassoon: 1,
       "Alto Saxophone": 5,
       "Tenor Saxophone": 5,
@@ -275,6 +276,8 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
       "Clarinet in Bb 2": 4,
       "Alto Clarinet in Eb": 4,
       "Bass Clarinet in Bb": 4,
+      "1st Clarinet in Bb": 4,
+      "2nd Clarinet in Bb": 4,
       Bassoon: 1,
       "Alto Saxophone": 5,
       "Alto Saxophone1": 5,
@@ -284,6 +287,8 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
       "Baritone": 15,
       "Trumpet in Bb 1": 12,
       "Trumpet in Bb 2": 12,
+      "1st Trumpet in Bb": 12,
+      "2nd Trumpet in Bb": 12,
       "Horn in F": 13,
       "Horn in F 1": 13,
       "Horn in F 2": 13,