Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2025-02-21 16:42:12 +08:00
commit a679a8fc44
2 changed files with 5 additions and 3 deletions

View File

@ -4,7 +4,7 @@
<el-tab-pane :label="item.label" style="text-align:left" stretch="true"> <el-tab-pane :label="item.label" style="text-align:left" stretch="true">
<template v-if="item.stuList.length > 0"> <template v-if="item.stuList.length > 0">
<template v-for="(stuItem,stuIndex) in item.stuList" :key="stuIndex"> <template v-for="(stuItem,stuIndex) in item.stuList" :key="stuIndex">
<el-tag style="margin:5px 10px 0 0" type="primary">{{ stuItem.studentname }}:{{ stuItem.getScore }}</el-tag> <el-tag style="margin:5px 10px 0 0" type="primary">{{ stuItem.studentname }}:{{ stuItem.point }}</el-tag>
</template> </template>
</template> </template>
<template v-else> <template v-else>
@ -93,6 +93,8 @@ watch(() => useOverview.tableList, () => {
}else{ }else{
hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item); hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
} }
console.log(hasStudents.value,'hasStudents.value');
showStudents(0) showStudents(0)
},{deep: true}) },{deep: true})
</script> </script>

View File

@ -376,12 +376,12 @@ const getClassWorkStudentList = (rowId) => {
} }
} }
} }
const allScore = evalarray.reduce((acc, cur) => acc + cur.score, 0) const allScore = evalarray.reduce((acc, cur) => acc + cur.teacherRating, 0)
//console.log(evalarray, 'evalarray------------------------------------') //console.log(evalarray, 'evalarray------------------------------------')
if (feedcount > 0) { if (feedcount > 0) {
// : /*100 // : /*100
response.rows[i].scoingRate = ((score / allScore) * 100).toFixed(0) + '%' response.rows[i].scoingRate = ((score / allScore) * 100).toFixed(0) + '%'
response.rows[i].getScore = score response.rows[i].getScore = allScore
} else { } else {
response.rows[i].scoingRate = '0%' response.rows[i].scoingRate = '0%'
response.rows[i].getScore = 0 response.rows[i].getScore = 0