TIANYONG преди 1 година
родител
ревизия
bee4835fe2

+ 1 - 1
src/page-instrument/follow-model/index.module.less

@@ -41,7 +41,7 @@
 .pcEndBtn {
   width: 36px;
   height: 36px;
-  left: 32px;
+  left: 46px;
   bottom: 12px !important;
   margin-left: initial;
 }

+ 8 - 1
src/page-instrument/view-figner/index.module.less

@@ -957,7 +957,14 @@
         .dot {
             display: inline-block;
             position: absolute;
-            top: 0;
+            left: 50%;
+            transform: translateX(-50%);
+            &.topDot {
+                top: 0;
+            }
+            &.bottomDot {
+                top: initial;
+            }
         }
 
         .noteName {

+ 4 - 3
src/page-instrument/view-figner/index.tsx

@@ -136,6 +136,7 @@ export default defineComponent({
       const fignerData = FIGNER_INSTRUMENT_DATA[data.subject as keyof typeof FIGNER_INSTRUMENT_DATA];
       if (fignerData) {
         data.tones = fignerData.tones || [];
+        console.log('指法1',fignerData.tones)
         if (data.tones.length) {
           data.activeTone = data.tones[0];
           data.popupActiveTone = data.tones[0];
@@ -1251,14 +1252,14 @@ export default defineComponent({
                       <div>
                         全按作
                         <div class={[styles.noteKey, styles.noteKeyBtn]}>
-                          {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null}
-                          <span class={styles.dot}></span>
+                          {data.activeTone.step > 0 ? <span class={[styles.topDot, styles.dot]}></span> : null}
+                          {/* <span class={styles.dot}></span> */}
 
                           <div class={styles.noteName}>
                             <sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup>
                             {data.activeTone.key}
                           </div>
-                          {data.activeTone.step < 0 ? <span class={styles.dot}></span> : null}
+                          {data.activeTone.step < 0 ? <span class={[styles.bottomDot, styles.dot]}></span> : null}
                         </div>
                       </div>
                       <img src={icons.icon_arrow} />

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

@@ -116,7 +116,7 @@ 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 ? 8 : 10; // 老师端顶部间距
+			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 9 : 10; // 老师端顶部间距
 			osmd.EngravingRules.PageTopMarginNarrow = 3;
 			osmd.EngravingRules.PageLeftMargin = 2;
 			// 老师端上课页面,左右两边有功能按钮,所以左右边距需要加大

+ 11 - 0
src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -63,6 +63,16 @@
         //height: 80% !important;
       }
     }
+    &.pcPicker {
+      :global {
+        .van-ellipsis {
+          font-size: 20PX;
+        }
+        .van-picker-column__item {
+          height: 60px;
+        }
+      }
+    }
   }
 
   .button {
@@ -77,6 +87,7 @@
     height: 380PX;
     border-radius: 16PX;
     .button {
+      width: 40%;
       margin-bottom: 30PX;
     }
     .title {

+ 2 - 2
src/view/plugins/toggleMusicSheet/choosePartName/index.tsx

@@ -46,7 +46,7 @@ export default defineComponent({
         </div>
         <Picker
           ref={myPicker}
-          class={styles.picker}
+          class={[styles.picker, state.platform === IPlatform.PC && styles.pcPicker]}
           defaultIndex={props.partIndex}
           v-model={selValues.value}
           showToolbar={false}
@@ -59,7 +59,7 @@ export default defineComponent({
           }}
         />
         <Button class={styles.button} type="primary" round block onClick={() => {
-            console.log(1111,selectIndex.value)
+            // console.log(1111,selectIndex.value)
             if (partIndexChanged.value) {
               emit('close', selectIndex.value)
             } else {