diff --git a/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue b/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue index 5447495..1ff975c 100644 --- a/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue +++ b/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue @@ -78,7 +78,7 @@ function initChart() { return `${value}人 ${percentage}%`; // 显示为百分比形式 }, color: '#333', - fontSize: 12 + fontSize: 12 } }] }; @@ -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,() => { diff --git a/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue b/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue index c1de098..afbdac8 100644 --- a/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue +++ b/src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue @@ -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 + } } }) } diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index f8ca287..203ac9e 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -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 文件内容相关 diff --git a/src/renderer/src/views/classTask/container/item-dialog.vue b/src/renderer/src/views/classTask/container/item-dialog.vue index 1cb08cd..d35a0de 100644 --- a/src/renderer/src/views/classTask/container/item-dialog.vue +++ b/src/renderer/src/views/classTask/container/item-dialog.vue @@ -94,19 +94,19 @@ 完美 优秀 良好 及格 不及格 diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue index e87e553..df321eb 100644 --- a/src/renderer/src/views/classTask/teachClassTask.vue +++ b/src/renderer/src/views/classTask/teachClassTask.vue @@ -84,19 +84,19 @@ 完美 优秀 良好 及格 不及格