Merge branch 'iteration-20240912-pdf' into test-online

src/views/music-library/music-sheet/component/music-list.tsx

@@ -489,9 +489,7 @@ export default defineComponent({
             search.userId = null
           }
         }
-        const opt = { ...state.pagination, ...search }
-        opt.generateFirst && (opt.musicCategoryId = '100061')
-        const { data } = await musicSheetPage(opt)
+        const { data } = await musicSheetPage({ ...state.pagination, ...search })
         state.pagination.pageTotal = Number(data.total)
         const result = data.rows || []
         // 初始化场景

src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -568,9 +568,7 @@ export default defineComponent({
                 }
               }
             })
-          }
-
-          
+          }       
 
           // 总谱 伴唱判断
           if (forms.scoreAudioFileUrl || state.bSongFile) {
@@ -590,7 +588,7 @@ export default defineComponent({
           }
 
           // 判断是否有总谱
-          console.log(forms.scoreAudioFileUrl, 'forms.scoreAudioFileUrl')
+          // console.log(forms.scoreAudioFileUrl, 'forms.scoreAudioFileUrl')
           if (forms.scoreAudioFileUrl) {
             forms.musicSheetAccompanimentList.push({
               musicSheetId: props.data.id,
@@ -1355,6 +1353,11 @@ export default defineComponent({
           forms.midiFileUrl = data.midiFileUrl
           forms.isShowFingering = data.isShowFingering
           forms.isMixBeat = data.isMixBeat
+
+          forms.musicFirstImg = data.musicFirstImg
+          forms.musicJianImg = data.musicJianImg
+          forms.musicImg = data.musicImg
+
           forms.musicPdfUrl = data.musicPdfUrl
           forms.firstPdfUrl = data.firstPdfUrl
           forms.jianPdfUrl = data.jianPdfUrl
@@ -2592,12 +2595,12 @@ export default defineComponent({
             </NAlert>
             <NGrid cols={2}>
               <NFormItemGi
-                label="是否播放节拍器"
+                label="是否播放预备拍"
                 path="isPlaySingBeat"
                 rule={[
                   {
                     required: true,
-                    message: '请选择是否播放节拍器'
+                    message: '请选择是否播放预备拍'
                   }
                 ]}
               >
@@ -2618,8 +2621,8 @@ export default defineComponent({
                   ]}
                 >
                   <NRadioGroup v-model:value={forms.isUseSingSystemBeat}>
-                    <NRadio value={true}>系统节拍器</NRadio>
-                    <NRadio value={false}>MP3节拍器</NRadio>
+                    <NRadio value={true}>系统预备拍</NRadio>
+                    <NRadio value={false}>MP3预备拍</NRadio>
                   </NRadioGroup>
                 </NFormItemGi>
               )}