lex-xin 2 months ago
parent
commit
8e87dd21c0
2 changed files with 22 additions and 38 deletions
  1. 14 21
      src/tenant/music/music-detail/new-index.tsx
  2. 8 17
      src/views/music/music-detail/index.tsx

+ 14 - 21
src/tenant/music/music-detail/new-index.tsx

@@ -552,6 +552,9 @@ export default defineComponent({
             text: '总谱',
             value: 0,
             xmlIndex: 999,
+            musicPdfUrl: row.musicPdfUrl,
+            firstPdfUrl: row.firstPdfUrl,
+            jianPdfUrl: row.jianPdfUrl,
             track: '',
             name: '总谱'
           })
@@ -1281,34 +1284,24 @@ export default defineComponent({
             columns={partColumns.value}
             defaultIndex={staffData.selectedPartIndex}
             onConfirm={value => {
-              staffData.open = false
-              staffData.selectedPartIndex = value.value
-              staffData.imgs = []
+              staffData.open = false;
+              staffData.selectedPartIndex = value.value;
+              staffData.imgs = [];
               nextTick(() => {
-                let tempPdf = ''
-                if (staffData.isComberRender && value.xmlIndex === 999) {
-                  if (getCurrentPdf(staffData.list, staff.radio)) {
-                    tempPdf = getCurrentPdf(staffData.list, staff.radio)
-                  }
-                } else {
-                  const item = getInstrumentItem(staffData.list, value.track)
-                  if (item && getCurrentPdf(item, staff.radio)) {
-                    tempPdf = getCurrentPdf(item, staff.radio)
-                  }
-                }
-                staffData.musicPdfUrl = tempPdf
+                const item = partColumns.value.find((child: any) => child.value === value.value)
+                const tempPdf = getCurrentPdf(item, staff.radio)
+                staffData.musicPdfUrl = tempPdf;
                 if (tempPdf) {
-                  renderStaff()
+                  renderStaff();
                 } else {
-                  loading.value = true
+                  loading.value = true;
                   if (staffData.musicPdfUrl) {
-                    staffData.musicPdfUrl = ''
-                    renderStaff()
+                    resetRender();
                   } else {
-                    resetRender()
+                    renderStaff();
                   }
                 }
-              })
+              });
             }}
             onCancel={() => (staffData.open = false)}
           />

+ 8 - 17
src/views/music/music-detail/index.tsx

@@ -166,7 +166,6 @@ export default defineComponent({
       } else if (type == 'JIAN') {
         loading.value = false
         const tempPdf = staffData.details?.jianPdfUrl
-        console.log(tempPdf, 'tempPdf')
         initIframe(tempPdf, 'JIAN')
       } else {
         loading.value = false
@@ -662,6 +661,9 @@ export default defineComponent({
           text: "总谱",
           value: 0,
           xmlIndex: 999,
+          musicPdfUrl: row.musicPdfUrl,
+          firstPdfUrl: row.firstPdfUrl,
+          jianPdfUrl: row.jianPdfUrl,
           track: "",
           name: "总谱",
         });
@@ -701,7 +703,6 @@ export default defineComponent({
 
 
   const getPreViewCloud = (musicId: string, partIndex: number, track: string) => {
-    console.log(partIndex, track, 'getPreViewCloud')
     const Authorization = sessionStorage.getItem("Authorization") || "";
     const musicScorePath = "/klx-music-score/";
     const musicScoreUrl = getHttpOrigin() + musicScorePath;
@@ -737,7 +738,7 @@ export default defineComponent({
   const renderStaff = async () => {
     try {
       nextTick(() => {
-        console.log(staffData.musicPdfUrl, 'staffData.musicPdfUrl')
+        // console.log(staffData.musicPdfUrl, 'staffData.musicPdfUrl')
         if (staffData.musicPdfUrl) {
           const url = `${location.origin}${
             location.pathname
@@ -1380,27 +1381,17 @@ export default defineComponent({
                 staffData.selectedPartIndex = value.value;
                 staffData.imgs = [];
                 nextTick(() => {
-                  let tempPdf = "";
-                  if (staffData.isComberRender && value.xmlIndex === 999) {
-                    if (getCurrentPdf(staffData.list, staff.radio)) {
-                      tempPdf = getCurrentPdf(staffData.list, staff.radio);
-                    }
-                  } else {
-                    const item = getInstrumentItem(staffData.list, value.track);
-                    if (item && getCurrentPdf(item, staff.radio)) {
-                      tempPdf = getCurrentPdf(item, staff.radio);
-                    }
-                  }
+                  const item = partColumns.value.find((child: any) => child.value === value.value)
+                  const tempPdf = getCurrentPdf(item, staff.radio)
                   staffData.musicPdfUrl = tempPdf;
                   if (tempPdf) {
                     renderStaff();
                   } else {
                     loading.value = true;
                     if (staffData.musicPdfUrl) {
-                      staffData.musicPdfUrl = "";
-                      renderStaff();
-                    } else {
                       resetRender();
+                    } else {
+                      renderStaff();
                     }
                   }
                 });