|
@@ -250,7 +250,13 @@ export default defineComponent({
|
|
|
if (scoreData.itemType === 'cadence') {
|
|
|
return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.rhythmicAssessment.result))
|
|
|
} else {
|
|
|
- return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.pitchAssessment.result))
|
|
|
+ return detailData.musicalNotesPlayStats.filter((item: any) => {
|
|
|
+ let result = item.pitchAssessment.result
|
|
|
+ if (scoreData.itemType === 'integrity') {
|
|
|
+ result = (result === 'HIGH' || result === 'LOW' || result === 'WRONG') ? 'RIGHT' : result
|
|
|
+ }
|
|
|
+ return include.includes(result)
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -267,11 +273,14 @@ export default defineComponent({
|
|
|
useedid.value.push(active.id)
|
|
|
const svgEl = document.getElementById('vf-' + active.id)
|
|
|
const stemEl = document.getElementById('vf-' + active.id + '-stem')
|
|
|
- const errType = scoreData.itemType === 'cadence' ? note.rhythmicAssessment.result : note.pitchAssessment.result
|
|
|
+ let errType = scoreData.itemType === 'cadence' ? note.rhythmicAssessment.result : note.pitchAssessment.result
|
|
|
// console.log(1111222,errType)
|
|
|
- const isNeedCopyElement = ['HIGH', 'LOW', 'EARLY', 'LATE'].includes(
|
|
|
+ const isNeedCopyElement = scoreData.itemType === 'integrity' ? false : ['HIGH', 'LOW', 'EARLY', 'LATE'].includes(
|
|
|
errType
|
|
|
)
|
|
|
+ if (scoreData.itemType === 'integrity') {
|
|
|
+ errType = errType = (note.pitchAssessment.result === 'HIGH' || note.pitchAssessment.result === 'LOW' || note.pitchAssessment.result === 'WRONG') ? 'RIGHT' : errType
|
|
|
+ }
|
|
|
stemEl?.classList.add(colorsClass[errType])
|
|
|
svgEl?.classList.add(colorsClass[errType])
|
|
|
if (svgEl && isNeedCopyElement) {
|