Merge branch 'iteration-20240809' into jenkins-test

src/views/co-ai/index.module.less

@@ -572,6 +572,20 @@
       margin-right: 5px;
     }
   }
+
+  .ensembleSection {
+    height: calc(100% - 78px);
+    display: flex;
+    flex-direction: column;
+
+    .iframeSection {
+      flex: 1 auto;
+
+      iframe {
+        height: 100%;
+      }
+    }
+  }
 }
 
 .rightBtns {
@@ -668,4 +682,4 @@
       font-size: 14px;
     }
   }
-}
+}

src/views/co-ai/index.tsx

@@ -286,6 +286,16 @@ export default defineComponent({
           if (Array.isArray(res?.data?.rows)) {
             data.musics = [...data.musics, ...res.data.rows];
             data.finshed = !res.data.next;
+
+            // 是否显示总谱
+            const selectMusic = data.musics[data.musicIndex];
+            if (
+              selectMusic &&
+              selectMusic.isScoreRender &&
+              data.musicIndex === 0
+            ) {
+              data.selectMusicInstrumentIndex = 999;
+            }
           } else {
             data.finshed = true;
           }
@@ -329,6 +339,7 @@ export default defineComponent({
       }&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${
         data.selectMusicInstrumentIndex
       }&musicRenderType=${musicRenderType}`;
+
       console.log('地址', data.iframeSrc);
     };
 
@@ -482,10 +493,23 @@ export default defineComponent({
         .filter((item: any) => item.canselect)
         .sort((a: any, b: any) => a.sortId - b.sortId);
       data.trackList = arr;
-      let track = arr.find(
-        (item: any) => item.value === data.selectMusicInstrumentIndex
-      )?.track;
-      track = trackToCode(track);
+      // 是否显示总谱
+      const selectMusic = data.musics[data.musicIndex];
+      if (selectMusic) {
+        selectMusic.isScoreRender &&
+          data.trackList.unshift({
+            text: '总谱',
+            value: 999,
+            sortId: 0,
+            canselect: true,
+            track: 999
+          });
+      }
+
+      // let track = arr.find(
+      //   (item: any) => item.value === data.selectMusicInstrumentIndex
+      // )?.track;
+      // track = trackToCode(track);
 
       // let musicRenderType: 'staff' | 'first' | 'fixed' = 'staff';
       // let canTrans = true;
@@ -576,9 +600,11 @@ export default defineComponent({
           data.vipMember = res.data.vipMember;
         }
       };
-      if (!isEnsemble.value) {
+      if (isEnsemble.value) {
         await analyzeXml();
       }
+
+      musicIframeLoad();
       listenerMessage('webViewOnResume', () => {
         console.log('页面显示', data.iframeSrc);
         getUserInfo();
@@ -708,8 +734,18 @@ export default defineComponent({
                           ? styles.musicActive
                           : styles.disableNotic
                       ]}
-                      onClick={() => {
+                      onClick={async () => {
                         data.musicIndex = index;
+
+                        await analyzeXml();
+                        // 是否显示总谱
+                        const selectMusic = data.musics[data.musicIndex];
+                        console.log(selectMusic, 'selected music');
+                        if (selectMusic && selectMusic.isScoreRender) {
+                          data.selectMusicInstrumentIndex = 999;
+                        } else {
+                          data.selectMusicInstrumentIndex = 0;
+                        }
                         musicIframeLoad();
                       }}>
                       <div class={styles.musicAvtor}>
@@ -783,17 +819,17 @@ export default defineComponent({
                 <div
                   class={styles.iconTransfer}
                   onClick={() => (data.showChangeVoice = true)}>
-                  切换声轨
+                  切换声部
                 </div>
               )}
 
-              <div ref={downRef}>
+              <div class={styles.ensembleSection} ref={downRef}>
                 <div class={styles['right-musicName']}>
                   {data.musics[data.musicIndex]?.musicSheetName}
                 </div>
                 {/* ensembleDetail */}
                 {isEnsemble.value ? (
-                  <div>
+                  <div class={styles.iframeSection}>
                     <>
                       {/* {loading.value && (
                         <div>
@@ -811,10 +847,11 @@ export default defineComponent({
                             // opacity: loading.value ? 0 : 1
                           }}
                           src={data.iframeSrc}
-                          onLoad={async () => {
-                            await analyzeXml();
-                            musicIframeLoad();
-                          }}></iframe>
+                          // onLoad={async () => {
+                          //   await analyzeXml();
+                          //   musicIframeLoad();
+                          // }}
+                        ></iframe>
                       )}
                       {/* <OsmdPreview ref={osmdPreviewRef} /> */}
                     </>
@@ -884,6 +921,7 @@ export default defineComponent({
                   onSelect={(item: any) => {
                     data.showMusicImg = item.value;
                     data.popoverShow = false;
+                    // data.iframeSrc = '';
                     musicIframeLoad();
                   }}
                   // onSelect={onSelect}
@@ -971,6 +1009,7 @@ export default defineComponent({
               onConfirm={async (index: number) => {
                 data.selectMusicInstrumentIndex = index;
                 await analyzeXml();
+                // data.iframeSrc = '';
                 musicIframeLoad();
                 data.showChangeVoice = false;
               }}

src/views/courseware-play/component/musicScore.tsx

@@ -80,6 +80,7 @@ export default defineComponent({
         modelType: 'practise',
         Authorization: Authorization,
         showGuide: true,
+        showWebGuide: false,
         showCourseMember: true,
         iscurseplay: 'play'
       }

src/views/layout/auth.tsx

@@ -34,7 +34,6 @@ export default defineComponent({
     const setAuth = async () => {
       const { query } = route;
       const token = query.userInfo || query.Authorization;
-      console.log(query, 'query');
       if (token) {
         storage.set(ACCESS_TOKEN, token);
       }
@@ -64,7 +63,7 @@ export default defineComponent({
             // 判断是否登录状态
             if (query.platform) {
               // 判断是否在应用中
-              if(window.parent && window.parent !== window) {
+              if (window.parent && window.parent !== window) {
                 window.parent.postMessage(
                   {
                     api: 'onLogin'
@@ -75,12 +74,10 @@ export default defineComponent({
                   window.location.href = `${location.origin}/classroom`;
                 }, 500);
               } else {
-                  window.location.href = `${location.origin}/classroom`;
+                window.location.href = `${location.origin}/classroom`;
               }
-
             } else {
               setLogout();
-
             }
           }
         }