|
|
@@ -557,8 +557,8 @@ export default defineComponent({
|
|
|
const instrumentSort = (list: Array<any>) => {
|
|
|
list.sort((a, b) => {
|
|
|
return (
|
|
|
- (sortList[getInstrumentName(a.track)] || 20) -
|
|
|
- (sortList[getInstrumentName(b.track)] || 20)
|
|
|
+ (sortList[getInstrumentName({}, a.track)] || 20) -
|
|
|
+ (sortList[getInstrumentName({}, b.track)] || 20)
|
|
|
)
|
|
|
})
|
|
|
return list
|
|
|
@@ -613,7 +613,7 @@ export default defineComponent({
|
|
|
|
|
|
staffData.instrumentName =
|
|
|
musicDetail.value?.musicSheetType === 'CONCERT'
|
|
|
- ? getInstrumentName(staffData.partList[staffData.partIndex]?.track)
|
|
|
+ ? getInstrumentName({}, staffData.partList[staffData.partIndex]?.track)
|
|
|
: ''
|
|
|
|
|
|
if (musicDetail.value?.musicSheetType === 'SINGLE') {
|
|
|
@@ -692,7 +692,7 @@ export default defineComponent({
|
|
|
const currentXml = onlyVisible(xml, staffData.partXmlIndex)
|
|
|
iframeRef.contentWindow.renderXml(currentXml, 0)
|
|
|
|
|
|
- staffData.instrumentName = getInstrumentName(
|
|
|
+ staffData.instrumentName = getInstrumentName({},
|
|
|
staffData.partList[staffData.partIndex]?.track
|
|
|
)
|
|
|
}
|
|
|
@@ -716,7 +716,7 @@ export default defineComponent({
|
|
|
return staffData.partList.map((item: any, index: number) => {
|
|
|
const instrumentName =
|
|
|
musicDetail.value?.musicSheetType === 'CONCERT'
|
|
|
- ? getInstrumentName(item.track)
|
|
|
+ ? getInstrumentName({}, item.track)
|
|
|
: ''
|
|
|
return {
|
|
|
text: item.track + (instrumentName ? `(${instrumentName})` : ''),
|
