Browse Source

feat:老师端云教练样式

TIANYONG 10 months ago
parent
commit
3166ca1ff8
3 changed files with 6 additions and 5 deletions
  1. 1 0
      public/flexible.js
  2. 2 2
      src/state.ts
  3. 3 3
      src/view/music-score/index.tsx

+ 1 - 0
public/flexible.js

@@ -10,6 +10,7 @@
     if (window.location.search.includes('platform=pc') || window.location.search.includes('platform=PC')) {
       c = width / 21.7;
     }
+    console.log('fontSize:',c,'屏幕宽度:',width,'老师端:',window.location.search.includes('platform=pc'))
     f.style.fontSize = c + "px", k.rem = a.rem = c
     window.fontSize = c
   }

+ 2 - 2
src/state.ts

@@ -1124,8 +1124,8 @@ 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.originSpeed = state.speed = parseFloat(data.playSpeed) || 0;
+  // state.originSpeed = state.speed = data.playSpeed;
   // state.playIngSpeed = data.playSpeed;
   const track = data.code || data.track;
   state.track = track ? track.replace(/ /g, "").toLocaleLowerCase() : "";

+ 3 - 3
src/view/music-score/index.tsx

@@ -116,13 +116,13 @@ export default defineComponent({
 			// osmd.EngravingRules.CompactMode = true // 紧凑模式
 			osmd.EngravingRules.PageRightMargin = state.isSingleLine ? (window.innerWidth+200)/10 : 2;
 			osmd.EngravingRules.FixedMeasureWidth = state.isSingleLine ? true : false; // 是否固定小节的宽度(小节同一宽度渲染)
-			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 4 : 10; // 老师端顶部间距
+			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 6 : 10; // 老师端顶部间距
 			osmd.EngravingRules.PageTopMarginNarrow = 3;
 			osmd.EngravingRules.PageLeftMargin = 2;
 			// 老师端上课页面,左右两边有功能按钮,所以左右边距需要加大
 			if (state.isAttendClass && state.platform === IPlatform.PC) {
-				osmd.EngravingRules.PageLeftMargin = 6;
-				osmd.EngravingRules.PageRightMargin = 6;
+				osmd.EngravingRules.PageLeftMargin = 7;
+				osmd.EngravingRules.PageRightMargin = 7;
 			}
 			osmd.EngravingRules.PageBottomMargin = state.platform === IPlatform.PC ? 1 : 2;
 			osmd.EngravingRules.DYMusicScoreType =