zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

yangws #344

Merged
yangws merged 3 commits from yangws into main 2024-10-20 01:36:44 +08:00
Conversation 0 Commits 3 Files Changed 6 +37 -23
5 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b63235084 - Show all commits

20
src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue
View File

@ -88,12 +88,20 @@ function initChart() {
// 获取表的数据
const showEcharts =() => {
useOverview.tableList.forEach((item,index) => {
if(item.rating === 0) return // 没批改不计数
dataList.value.forEach((item1,index1) => {
if(item1.min <= Number(item.scoingRate) && Number(item.scoingRate) <= item1.max ){
item1.value ++
}
})
if(item.rating === 0){
dataList.value.forEach((item1,index1) => {
if(item1.min <= Number(item.scoingRate) && Number(item.scoingRate) <= item1.max ){
item1.value ++
}
})
}else{
dataList.value.forEach((item1,index1) => {
if(item1.rating == item.rating){
item1.value ++
}
})
}
})
}
watch(() => useOverview.tableList,() => {

8
src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue
View File

@ -65,11 +65,17 @@ const handelChange = (item) => {
}
//取区域的学生
const showStudents = (index) => {
console.log(useOverview.tableList,'useOverview.tableList');
leftList.value[index].stuList = useOverview.tableList.filter(item => {
if(item.rating > 0){
if(item.rating === 0){
if(leftList.value[index].min <= Number(item.scoingRate || 0) && Number(item.scoingRate || 0) <= leftList.value[index].max ){
return item
}
}else{
if(item.rating == leftList.value[index].rating){
return item
}
}
})
}

10
src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
View File

@ -501,11 +501,11 @@ const classWorkFormScore = reactive({
teacherremark: '' //评分说明
})
const teacherRatingList = ref([
{ ratingKey: '1', ratingValue: '优' },
{ ratingKey: '2', ratingValue: '优-' },
{ ratingKey: '3', ratingValue: '良' },
{ ratingKey: '4', ratingValue: '良-' },
{ ratingKey: '5', ratingValue: '差' }
{ ratingKey: '1', ratingValue: '完美' },
{ ratingKey: '2', ratingValue: '优秀' },
{ ratingKey: '3', ratingValue: '良好' },
{ ratingKey: '4', ratingValue: '及格' },
{ ratingKey: '5', ratingValue: '不及格' }
])
// 确定的线上图片数据
//#region 文件内容相关

10
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -94,19 +94,19 @@
</template>
<!-- 1-优 2-优减 3-良 4-良减 5-差 -->
<template v-if="scope.row.teacherRating == 1"
><el-tag type="danger">优</el-tag></template
><el-tag type="danger">完美</el-tag></template
>
<template v-if="scope.row.teacherRating == 2"
><el-tag type="danger">优-</el-tag></template
><el-tag type="danger">优秀</el-tag></template
>
<template v-if="scope.row.teacherRating == 3"
><el-tag type="warning">良</el-tag></template
><el-tag type="warning">良好</el-tag></template
>
<template v-if="scope.row.teacherRating == 4"
><el-tag type="info">良-</el-tag></template
><el-tag type="info">及格</el-tag></template
>
<template v-if="scope.row.teacherRating == 5"
><el-tag type="info">差</el-tag></template
><el-tag type="info">不及格</el-tag></template
>
</template>
</el-table-column>

10
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -84,19 +84,19 @@
</template>
<!-- 1-优 2-优减 3-良 4-良减 5-差 -->
<template v-if="scope.row.teacherRating == 1"
><el-tag type="danger">优</el-tag></template
><el-tag type="danger">完美</el-tag></template
>
<template v-if="scope.row.teacherRating == 2"
><el-tag type="danger">优-</el-tag></template
><el-tag type="danger">优秀</el-tag></template
>
<template v-if="scope.row.teacherRating == 3"
><el-tag type="warning">良</el-tag></template
><el-tag type="warning">良好</el-tag></template
>
<template v-if="scope.row.teacherRating == 4"
><el-tag type="info">良-</el-tag></template
><el-tag type="info">及格</el-tag></template
>
<template v-if="scope.row.teacherRating == 5"
><el-tag type="info">差</el-tag></template
><el-tag type="info">不及格</el-tag></template
>
</template>
</el-table-column>