|
@@ -373,6 +373,7 @@ export default defineComponent({
|
|
}
|
|
}
|
|
try {
|
|
try {
|
|
//extConfigJson: {"repeatedBeats":0,"gradualTimes":{"75":"02:38:60","77":"02:43:39"}}
|
|
//extConfigJson: {"repeatedBeats":0,"gradualTimes":{"75":"02:38:60","77":"02:43:39"}}
|
|
|
|
+ let audioPlayTypes = [] as any;
|
|
let musicSheetSoundList = [];
|
|
let musicSheetSoundList = [];
|
|
let musicSheetType = forms.musicSheetType;
|
|
let musicSheetType = forms.musicSheetType;
|
|
if (state.fSongFile) {
|
|
if (state.fSongFile) {
|
|
@@ -381,8 +382,12 @@ export default defineComponent({
|
|
audioFileUrl: state.fSongFile,
|
|
audioFileUrl: state.fSongFile,
|
|
audioPlayType: 'SING'
|
|
audioPlayType: 'SING'
|
|
})
|
|
})
|
|
|
|
+ audioPlayTypes.push("SING")
|
|
}
|
|
}
|
|
if (musicSheetType == 'SINGLE') {
|
|
if (musicSheetType == 'SINGLE') {
|
|
|
|
+ if (forms.musicSheetSoundList_YZ && forms.musicSheetSoundList_YZ.length > 0) {
|
|
|
|
+ audioPlayTypes.push("PLAY")
|
|
|
|
+ }
|
|
forms.musicSheetSoundList_YZ.forEach((musicSheetSound: any) => {
|
|
forms.musicSheetSoundList_YZ.forEach((musicSheetSound: any) => {
|
|
if (forms.musicalInstrumentIdList.includes(musicSheetSound.musicalInstrumentId) &&
|
|
if (forms.musicalInstrumentIdList.includes(musicSheetSound.musicalInstrumentId) &&
|
|
forms.multiInstrumentSelection.includes(musicSheetSound.musicalInstrumentId)) {
|
|
forms.multiInstrumentSelection.includes(musicSheetSound.musicalInstrumentId)) {
|
|
@@ -393,6 +398,9 @@ export default defineComponent({
|
|
}
|
|
}
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
|
|
+ if (forms.musicSheetSoundList_YY && forms.musicSheetSoundList_YY.length > 0) {
|
|
|
|
+ audioPlayTypes.push("PLAY")
|
|
|
|
+ }
|
|
forms.musicSheetSoundList_YY.forEach((musicSheetSound: any) => {
|
|
forms.musicSheetSoundList_YY.forEach((musicSheetSound: any) => {
|
|
if (forms.multiTracksSelection.includes(musicSheetSound.musicalInstrumentId)) {
|
|
if (forms.multiTracksSelection.includes(musicSheetSound.musicalInstrumentId)) {
|
|
musicSheetSoundList.push({
|
|
musicSheetSoundList.push({
|
|
@@ -411,9 +419,13 @@ export default defineComponent({
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
const obj = {
|
|
const obj = {
|
|
...forms,
|
|
...forms,
|
|
|
|
+ audioPlayTypes: audioPlayTypes.join(','),
|
|
musicTag: '-1',
|
|
musicTag: '-1',
|
|
multiTracksSelection: musicSheetType == 'SINGLE' ? "" : forms.multiTracksSelection.join(','),
|
|
multiTracksSelection: musicSheetType == 'SINGLE' ? "" : forms.multiTracksSelection.join(','),
|
|
// musicSheetSoundList: forms.musicSheetSoundList.filter((next: any) => {
|
|
// musicSheetSoundList: forms.musicSheetSoundList.filter((next: any) => {
|