lex 8 months ago
parent
commit
22ee74c49e

+ 2 - 4
src/teacher/music/upload/message-tip/index.tsx

@@ -59,11 +59,9 @@ export default defineComponent({
       let url = `${location.origin}/teacher/#/registerProtocol`
 
       if (type === 'question') {
-        // url = `${location.origin}/teacher/muic-standard/question.html`
-        url = `${location.origin}/teacher.html#/upload-protocol?type=question`
+        url = `${location.origin}/teacher/#/upload-protocol?type=question`
       } else if (type === 'music') {
-        // url = `${location.origin}/teacher/muic-standard/index.html`
-        url = `${location.origin}/teacher.html#/upload-protocol?type=music`
+        url = `${location.origin}/teacher/#/upload-protocol?type=music`
       }
 
       postMessage({

+ 13 - 4
src/tenant/music/music-detail/new-index.tsx

@@ -698,14 +698,23 @@ export default defineComponent({
         const tempPartList = [] as any
         staffData.xmlPartList.forEach((part: any) => {
           const item = tempList.find((item: any) => item.track === part.name)
-          tempPartList.push({
-            ...item,
-            index: part.value
-          })
+          if (item) {
+            tempPartList.push({
+              ...item,
+              index: part.value
+            })
+          }
         })
 
         staffData.partList = tempPartList
 
+        console.log(
+          staffData.partList,
+          tempPartList,
+          'staffData.partList',
+          tempList
+        )
+
         staffData.tempPartList = JSON.parse(JSON.stringify(staffData.partList))
         staffData.partList = instrumentSort(staffData.partList)
         // console.log(staffData.partList, ' staffData.partList')