feat: 老师端云教练修改

public/flexible.js

@@ -6,6 +6,10 @@
     b / i > 640 && (b = 640 * i);
     b / i < 375 && (b = 375 * i);
     var c = b / 10;
+    // 老师端，fontsize计算
+    if (window.location.search.includes('platform=pc') || window.location.search.includes('platform=PC')) {
+      c = width / 21.7;
+    }
     f.style.fontSize = c + "px", k.rem = a.rem = c
     window.fontSize = c
   }

src/page-colexiu/detail/index.tsx

@@ -98,6 +98,7 @@ export default defineComponent({
 			state.midiUrl = data.midiUrl;
 			state.parentCategoriesId = data.musicTag;
 			state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
+			// state.originSpeed = state.speed = parseFloat(data.playSpeed) || 0;
 			state.originSpeed = state.speed = data.playSpeed;
 			state.track = data.track;
 			state.enableNotation = data.notation ? true : false;

src/page-instrument/App.tsx

@@ -70,20 +70,21 @@ export default defineComponent({
       setBehaviorId(getRandomKey());
     });
 
+    // 老师端云教练，上下键切资源
     const onKeyBoard = (e: KeyboardEvent) => {
-      if (e.code === "ArrowLeft") {
+      if (e.code === "ArrowUp") {
         window.parent.postMessage(
           {
             api: "documentBodyKeyup",
-            code: "ArrowLeft",
+            code: "ArrowUp",
           },
           "*"
         );
-      } else if (e.code === "ArrowRight") {
+      } else if (e.code === "ArrowDown") {
         window.parent.postMessage(
           {
             api: "documentBodyKeyup",
-            code: "ArrowRight",
+            code: "ArrowDown",
           },
           "*"
         );

src/page-instrument/header-top/index.tsx

@@ -289,7 +289,7 @@ export default defineComponent({
 
     /** 课件播放 */
     const changePlay = (res: any) => {
-      console.log('监听上课页面message',res)
+      // console.log('监听上课页面message',res)
       if (res?.data?.api === "setPlayState") {
         togglePlay("paused");
       }

src/state.ts

@@ -1124,6 +1124,7 @@ const setState = (data: any, index: number) => {
   state.musicSheetCategoriesId = data.musicCategoryId;
   state.bizMusicCategoryId = data.bizMusicCategoryId
   state.playMode = data.playMode === "MP3" ? "MP3" : "MIDI";
+  // state.originSpeed = state.speed = parseFloat(data.playSpeed) || 0;
   state.originSpeed = state.speed = data.playSpeed;
   // state.playIngSpeed = data.playSpeed;
   const track = data.code || data.track;

src/view/music-score/index.tsx

@@ -121,8 +121,8 @@ export default defineComponent({
 			osmd.EngravingRules.PageLeftMargin = 2;
 			// 老师端上课页面，左右两边有功能按钮，所以左右边距需要加大
 			if (state.isAttendClass && state.platform === IPlatform.PC) {
-				osmd.EngravingRules.PageLeftMargin = 4;
-				osmd.EngravingRules.PageRightMargin = 4;
+				osmd.EngravingRules.PageLeftMargin = 6;
+				osmd.EngravingRules.PageRightMargin = 6;
 			}
 			osmd.EngravingRules.PageBottomMargin = state.platform === IPlatform.PC ? 1 : 2;
 			osmd.EngravingRules.DYMusicScoreType =

src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -75,6 +75,7 @@
   &.pcContainer {
     width: 500PX;
     height: 380PX;
+    border-radius: 16PX;
     .button {
       margin-bottom: 30PX;
     }
@@ -101,4 +102,7 @@
 .pcPartTop {
   z-index: 9999;
   height: 12px;
+  &.pcPartTopZIndex {
+    z-index: 1;
+  }
 }

src/view/plugins/toggleMusicSheet/choosePartName/index.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
 		});
     return () => (
       <div class={[styles.container, state.platform === IPlatform.PC && styles.pcContainer]}>
-        { state.platform === IPlatform.PC && <div class={[styles.pcPartTop,'top_drag']}></div> }
+        { state.platform === IPlatform.PC && <div class={[!state.guideInfo?.teacherDrag && styles.pcPartTopZIndex ,styles.pcPartTop,'top_drag']}></div> }
         <div class={styles.top}>
           <div class={styles.title}>请选择您练习的乐器</div>
           {/* <Icon name="cross" size={24} onClick={() => emit('close')} /> */}

src/view/plugins/toggleMusicSheet/index.module.less

@@ -12,4 +12,7 @@
 .popup{
     border-radius: 4px;
     overflow: hidden;
+}
+.pcPartPop {
+    overflow: initial !important;
 }

src/view/plugins/toggleMusicSheet/index.tsx

@@ -107,7 +107,7 @@ export default defineComponent({
     }
 
     return () => (
-      <Popup class={styles.popup} v-model:show={toggleMusicSheet.show} class="switchBoxClass_drag" style={positionInfo.styleDrag.value}>
+      <Popup class={styles.popup} v-model:show={toggleMusicSheet.show} class={[state.platform === IPlatform.PC && styles.pcPartPop ,"switchBoxClass_drag"]} style={positionInfo.styleDrag.value}>
         <ChoosePartName
           partIndex={trackIdx.value || 0}
           partListNames={partListNames.value}