|
@@ -68,19 +68,22 @@
|
|
<template #icon>{{ item.score }}分</template>
|
|
<template #icon>{{ item.score }}分</template>
|
|
</van-grid-item>
|
|
</van-grid-item>
|
|
<van-grid-item text="音准" class="van-hairline--right">
|
|
<van-grid-item text="音准" class="van-hairline--right">
|
|
- <template #icon
|
|
|
|
- ><span style="color: #01c1b5">{{ item.intonation }}分</span></template
|
|
|
|
- >
|
|
|
|
|
|
+ <template #icon>
|
|
|
|
+ <span style="color: #01c1b5" v-if="item.isPercussion">--</span>
|
|
|
|
+ <span style="color: #01c1b5" v-else>{{ item.intonation }}分</span>
|
|
|
|
+ </template>
|
|
</van-grid-item>
|
|
</van-grid-item>
|
|
<van-grid-item text="节奏" class="van-hairline--right">
|
|
<van-grid-item text="节奏" class="van-hairline--right">
|
|
- <template #icon
|
|
|
|
- ><span style="color: #ff802c">{{ item.cadence }}分</span></template
|
|
|
|
- >
|
|
|
|
|
|
+ <template #icon>
|
|
|
|
+ <span style="color: #ff802c" v-if="item.isPercussion">--</span>
|
|
|
|
+ <span style="color: #ff802c" v-else>{{ item.cadence }}分</span>
|
|
|
|
+ </template>
|
|
</van-grid-item>
|
|
</van-grid-item>
|
|
<van-grid-item text="完成度">
|
|
<van-grid-item text="完成度">
|
|
- <template #icon
|
|
|
|
- ><span style="color: #f79c00">{{ item.integrity }}分</span></template
|
|
|
|
- >
|
|
|
|
|
|
+ <template #icon>
|
|
|
|
+ <span style="color: #f79c00" v-if="item.isPercussion">--</span>
|
|
|
|
+ <span style="color: #f79c00" v-else>{{ item.integrity }}分</span>
|
|
|
|
+ </template>
|
|
</van-grid-item>
|
|
</van-grid-item>
|
|
</van-grid>
|
|
</van-grid>
|
|
</template>
|
|
</template>
|
|
@@ -170,6 +173,9 @@ export default {
|
|
this.$toast("本次评测未生成报告");
|
|
this.$toast("本次评测未生成报告");
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ isRhythmicExercises(examSongName) {
|
|
|
|
+ return examSongName.indexOf("节奏练习") > -1;
|
|
|
|
+ },
|
|
async getList() {
|
|
async getList() {
|
|
try {
|
|
try {
|
|
let res = await queryMusicCompareRecord(this.searchList);
|
|
let res = await queryMusicCompareRecord(this.searchList);
|
|
@@ -180,7 +186,10 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
let rows = result.rows || [];
|
|
let rows = result.rows || [];
|
|
- this.dataList.push(...rows);
|
|
|
|
|
|
+ this.dataList = this.dataList.concat(rows).map((item) => {
|
|
|
|
+ item.isPercussion = [23, 113, 121].includes(item.subjectId) || this.isRhythmicExercises(item.sysMusicScoreName);
|
|
|
|
+ return item;
|
|
|
|
+ });
|
|
if (this.searchList.page >= result.totalPage) {
|
|
if (this.searchList.page >= result.totalPage) {
|
|
this.finished = true;
|
|
this.finished = true;
|
|
}
|
|
}
|