Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/helpers/formateMusic.ts

@@ -843,12 +843,12 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 	while (!iterator.EndReached) {
 		// console.log({ ...iterator });
 		/** 多声轨合并显示，当前音符的时值取所有声轨中的最小值 */
-		// if (state.isCombineRender) {
-		// 	iterator.currentVoiceEntries = iterator.currentVoiceEntries.filter((item: any) => {
-		// 		const trackName = state.isEvxml && state.evxmlAddPartName ? item.parentVoice.parent.IdString || '' : item.parentVoice.parent.Name || '';
-		// 		return item.parentVoice.parent.IdString === firstTrackName
-		// 	});
-		// }
+		if (state.isCombineRender) {
+			iterator.currentVoiceEntries = iterator.currentVoiceEntries.filter((item: any) => {
+				const trackName = state.isEvxml && state.evxmlAddPartName ? item.parentVoice.parent.IdString || '' : item.parentVoice.parent.Name || '';
+				return trackName === firstTrackName
+			});
+		}
 		let minIndex = 0, elRealValue = 0
 		for (let index = 0; index < iterator.currentVoiceEntries.length; index++) {
 			const element = iterator.currentVoiceEntries[index];

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

@@ -156,7 +156,7 @@ export default defineComponent({
           checkErjiTimer = null;
           setTimeout(() => {
             evaluatingData.earphoneMode = false;
-          }, 3000);
+          }, 1500);
         } else {
           // 如果没有佩戴有限耳机，需要持续检测耳机状态
           checkErjiTimer = setTimeout(() => {

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

@@ -517,7 +517,7 @@ export default defineComponent({
         style={{
           "--detailDataPaddingLeft": detailData.paddingLeft,
           paddingLeft: detailData.paddingLeft,
-          background: state.setting.camera ? `rgba(${state.setting.eyeProtection ? "253,244,229" : "255,255,255"} ,${state.setting.cameraOpacity / 100}) !important` : "",
+          background: state.setting.camera && state.modeType === 'evaluating' ? `rgba(${state.setting.eyeProtection ? "253,244,229" : "255,255,255"} ,${state.setting.cameraOpacity / 100}) !important` : "",
         }}
       >
         {bgJsonData.value ? 

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

@@ -490,7 +490,8 @@
     flex-wrap: wrap;
     margin-top: 16px;
     position: relative;
-    
+    padding-bottom: 22px;
+
     .item {
         width: 50%;
         display: flex;