Merge branch 'iteration-20240918-pdf' into jenkins

src/views/xiaoku-music/index.tsx

@@ -411,12 +411,12 @@ export default defineComponent({
           ? 'staff'
           : 'staff';
 
-      
           // pdf
       const musicSheetType = details?.musicSheetType;
       let musicPdfUrl: any = ''
       
       if(musicSheetType === "SINGLE" || data.musicInstrumentIndex === 999) {
+        
         if( data.showMusicImg === "first") {
           musicPdfUrl = details?.firstPdfUrl
         } else if(data.showMusicImg === 'fixed') {
@@ -424,16 +424,16 @@ export default defineComponent({
         } else {
           musicPdfUrl = details?.musicPdfUrl
         }
+        // console.log({
+        //   musicSheetType,
+        //   showMusicImg: data.showMusicImg,
+        //   musicPdfUrl,
+        // }, '22222222222222222222')
       } else {
         const trackList = data.trackList || []
         const selectTrack = trackList.find((item: any) => item.value === data.musicInstrumentIndex)
         const background = details?.background || []
         const selectItem = background.find((item: any) => item.track === selectTrack?.track && item.audioPlayType === "PLAY")
-        // console.log({
-        //   selectItem,
-        //   selectTrack,
-        //   background
-        // }, '11111')
         if(selectItem) {
           if( data.showMusicImg === "first") {
             musicPdfUrl = selectItem.firstPdfUrl
@@ -446,7 +446,7 @@ export default defineComponent({
       }
       data.musicPdfUrl = musicPdfUrl
       if(musicPdfUrl) {
-        // data.iframeSrc = `http://localhost:9002/pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
+        // data.iframeSrc = `https://test.kt.colexiu.com/classroom-app/pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
         data.iframeSrc = `${location.origin}/classroom-app/pdf/web/viewer.html?file=${encodeURIComponent(data.musicPdfUrl)}&t=${Date.now()}`;
       } else {
         data.iframeSrc = `${vaildMusicScoreUrl()}/instrument/?id=${
@@ -1034,10 +1034,9 @@ export default defineComponent({
                       v-model:value={data.showMusicImg}
                       onUpdate:value={async (val: any) => {
                         data.showMusicImg = val;
-                        // musicIframeLoad();
-                        if (isEnsemble.value) {
+                        // if (isEnsemble.value) {
                           musicIframeLoad();
-                        }
+                        // }
                       }}
                       // key={item.id}
                       class={[styles.popTrans]}>
@@ -1057,7 +1056,7 @@ export default defineComponent({
                 </div>
 
                 <div class={styles.staffImgs}>
-                  {data.iframeSrc && (isEnsemble.value || musicImg.value.length === 0) ? (
+                  {data.iframeSrc && (data.musicPdfUrl || musicImg.value.length === 0) ? (
                     data.musicPdfUrl ? <iframe
                       id="staffIframeRef"
                       style={{