|
@@ -120,7 +120,7 @@ export default defineComponent({
|
|
|
? JSON.parse(sessionStorage.getItem('musicSubjectList') as any)
|
|
|
: [];
|
|
|
const resultList: any[] = [];
|
|
|
- console.log(tempSubjectList, subjectList, 'subjectList');
|
|
|
+ // console.log(tempSubjectList, subjectList, 'subjectList');
|
|
|
tempSubjectList.forEach((item: any) => {
|
|
|
const hasItem = subjectList.find((s: any) => s.id === item.id);
|
|
|
if (hasItem) {
|
|
@@ -168,7 +168,7 @@ export default defineComponent({
|
|
|
}
|
|
|
|
|
|
if (res?.code === 200 && Array.isArray(res?.data?.rows)) {
|
|
|
- console.log(res?.data?.rows);
|
|
|
+ // console.log(res?.data?.rows);
|
|
|
const tempResult = res?.data?.rows || [];
|
|
|
tempResult.forEach((item: any) => {
|
|
|
item.audioPlayTypeArray = item.audioPlayTypes
|
|
@@ -176,7 +176,7 @@ export default defineComponent({
|
|
|
: [];
|
|
|
});
|
|
|
data.list = [...data.list, ...res.data.rows];
|
|
|
- data.finshed = res.data.rows.length < forms.rows;
|
|
|
+ data.finshed = forms.page >= res.data.pages //res.data.rows.length < forms.rows;
|
|
|
|
|
|
// 是否显示总谱
|
|
|
const selectMusic = data.list[data.listActive];
|
|
@@ -830,6 +830,9 @@ export default defineComponent({
|
|
|
if (data.loading) return;
|
|
|
forms.name = val;
|
|
|
data.reshing = true;
|
|
|
+ document
|
|
|
+ .querySelector('.musicList-container')
|
|
|
+ ?.scroll(0, 0);
|
|
|
handleGetList();
|
|
|
}}
|
|
|
/>
|
|
@@ -848,7 +851,7 @@ export default defineComponent({
|
|
|
await analyzeXml();
|
|
|
// 是否显示总谱
|
|
|
const selectMusic = data.list[data.listActive];
|
|
|
- console.log(selectMusic, 'selected music');
|
|
|
+ // console.log(selectMusic, 'selected music');
|
|
|
if (selectMusic && selectMusic.isScoreRender) {
|
|
|
data.musicInstrumentIndex = 999;
|
|
|
} else {
|
|
@@ -1054,7 +1057,10 @@ export default defineComponent({
|
|
|
// key={item.id}
|
|
|
class={[styles.popSelect]}>
|
|
|
<NButton round class={[styles.textBtn]}>
|
|
|
- {data.trackName}
|
|
|
+ {data.trackList.find(
|
|
|
+ (item: any) =>
|
|
|
+ item.value === data.musicInstrumentIndex
|
|
|
+ )?.label || '切换声部'}
|
|
|
<i class={styles.iconArrow}></i>
|
|
|
</NButton>
|
|
|
</NPopselect>
|