修改显示

public/osmd/index.html

@@ -14,9 +14,9 @@
     }
 
     body {
-      padding-bottom: 60px;
+      /* padding-bottom: 60px;
       height: 600px;
-      overflow: hidden;
+      overflow: hidden; */
     }
 
     /* .vf-text {
@@ -55,7 +55,7 @@
     osmd.EngravingRules.RenderMultipleRestMeasures = true;
     osmd.EngravingRules.CompactMode = true;
     osmd.EngravingRules.PageTopMarginNarrow = 6.0; // for compact mode
-    osmd.EngravingRules.PageBottomMargin = 15.0;
+    osmd.EngravingRules.PageBottomMargin = 2.0;
     osmd.EngravingRules.PageLeftMargin = 1.0
     osmd.EngravingRules.PageRightMargin = 1.0
 

src/views/accompany/music-detail.module.less

@@ -34,7 +34,7 @@
   display: flex;
   align-items: center;
   flex-direction: column;
-  padding: 10px 20px 8;
+  padding: 10px 20px 0;
 
   .musicImg {
     margin-top: -32px;
@@ -112,6 +112,12 @@
   // flex: 1 auto;
   // overflow: hidden;
 
+  &.pdfContainer {
+    height: calc(100vh - var(--header-height) - var(--footer-height) - 124px);
+    padding: 0;
+    margin-top: 8px;
+  }
+
 
   .musicImg {
     width: 100%;

src/views/accompany/music-detail.tsx

@@ -116,31 +116,12 @@ export default defineComponent({
     const renderStaff = async () => {
       try {
         if (staffData.musicPdfUrl) {
-          // staffData.iframeSrc =
-          //   "/pdf/web/viewer.html?file=" +
-          //   encodeURIComponent(staffData.musicPdfUrl) + "&t=" + Date.now();
-          // https://cdn.oss.dayaedu.com/daya202409/UOFW4q5.pdf
-          // https://cdn.oss.dayaedu.com/daya202409/UOFVK2A.pdf
-          // https://cdn.oss.dayaedu.com/daya202409/UODQffO.pdf
-
-          // staffData.iframeSrc = `${location.origin}${
-          //   location.pathname
-          // }pdf/web/viewer.html?file=${encodeURIComponent(staffData.musicPdfUrl)}&t=${Date.now()}`
-
-          // const iframeRef = document.querySelector("#staffIframeRef") as any
-          // iframeRef.contentWindow.location.replace("/pdf/web/viewer.html?file=" +
-          // encodeURIComponent(staffData.musicPdfUrl) + "&t=" + Date.now());
 
           const iframeRef = document.querySelector("#staffIframeRef") as any
           iframeRef.contentWindow.location.replace( `${location.origin}${
               location.pathname
             }pdf/web/viewer.html?file=${encodeURIComponent(staffData.musicPdfUrl)}&t=${Date.now()}`);
         } else {
-          // staffData.iframeSrc = `/osmd/index.html`;
-          // staffData.iframeSrc = `${location.origin}${location.pathname}osmd/index.html`
-          // const iframeRef = document.querySelector("#staffIframeRef") as any
-          // iframeRef.contentWindow.location.replace(`/osmd/index.html`);
-
           const iframeRef = document.querySelector("#staffIframeRef") as any
           iframeRef.contentWindow.location.replace(`${location.origin}${location.pathname}osmd/index.html`);
           
@@ -177,12 +158,6 @@ export default defineComponent({
           return item
         }
       }
-      // for (let key of instruments) {
-      //   const _key = key.toLocaleLowerCase().replace(/ /g, '')
-      //   if (name.includes(_key)) {
-      //     return key
-      //   }
-      // }
       return ''
     }
 
@@ -192,6 +167,8 @@ export default defineComponent({
         staffData.musicPdfUrl = row.musicPdfUrl
         return
       }
+      
+
       staffData.partNames = await getPartNames(row.xmlFileUrl)
       let partList = row.background || []
       partList = partList.filter(
@@ -213,22 +190,19 @@ export default defineComponent({
       staffData.selectedPartName = defaultShowStaff.instrumentName
       staffData.partXmlIndex = defaultShowStaff.xmlIndex
 
-      if (row.musicSheetType === 'SINGLE') {
+      // 是否为并
+      if(staffData.isComberRender) {
         staffData.musicPdfUrl = row.musicPdfUrl
       } else {
-        // 是否为并
-        if(staffData.isComberRender) {
-          staffData.musicPdfUrl = row.musicPdfUrl
+        const item = getInstrumentItem(
+          staffData.details?.background || [],
+          partColumns.value[staffData.selectedPartIndex]?.track
+        )
+        console.log(item, 'item', staffData.details?.background, partColumns.value[staffData.selectedPartIndex]?.track)
+        if (item) {
+          staffData.musicPdfUrl = item.musicPdfUrl
         } else {
-          const item = getInstrumentItem(
-            staffData.details?.background || [],
-            partColumns.value[staffData.selectedPartIndex]?.track
-          )
-          if (item) {
-            staffData.musicPdfUrl = item.musicPdfUrl
-          } else {
-            staffData.musicPdfUrl = ''
-          }
+          staffData.musicPdfUrl = ''
         }
       }
     }
@@ -356,7 +330,7 @@ export default defineComponent({
             <div class={styles.musicImg}>
               <Image src={iconBg} />
             </div>
-            <div class={styles.info}>
+            {staffData.details.id && !staffData.musicPdfUrl && <div class={styles.info}>
               <p class={styles.names}>
                 {staffData.details.musicSheetName}
                 {staffData.details.musicSheetType === 'CONCERT' && staffData.selectedPartName
@@ -364,10 +338,11 @@ export default defineComponent({
                   : ''}
               </p>
               <p class={styles.author}>{staffData.details.composer}</p>
-            </div>
+            </div>}
+            
           </div>
 
-          <div class={styles.showImgContainer}>
+          <div class={[styles.showImgContainer, staffData.musicPdfUrl && styles.pdfContainer]}>
             {/* {staffData.details?.musicSheetType === 'CONCERT' ? (
               <> */}
             {loading.value && (