diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue index d02ba7f..f29b2f3 100644 --- a/src/renderer/src/views/classTask/classTask.vue +++ b/src/renderer/src/views/classTask/classTask.vue @@ -140,7 +140,7 @@ const getClassWorkList = () => { edustage: userStore.edustage,// 学段 edusubject: userStore.edusubject,//学科 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中:明天,已结束:选择的日期 - orderby: 'uniquekey DESC', + orderby: 'concat(deaddate,uniquekey) DESC', pageSize: 100 }).then((response) => { for (var i = 0; i < response.rows.length; i++) { @@ -213,7 +213,8 @@ const getStudentClassWorkData = () => { edustage: userStore.edustage,// 学段 edusubject: userStore.edusubject,//学科 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中:明天,已结束:选择的日期 - orderby: "uniquekey DESC", + status: '1', // 作业状态:1-已发布 + orderby: "uniquekey DESC",// TODO: 这里是否加 deaddate 的排序,后续看 pageSize: 1000 }).then((res) => { for (var t = 0; t < classWorkList.value.length; t++) { @@ -369,7 +370,8 @@ const getStudentVisible = async () => { edustage: userStore.edustage,// 学段 edusubject: userStore.edusubject,//学科 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中:明天,已结束:选择的日期 - orderby: 'uniquekey DESC', + status: '1', // 作业状态:1-已发布 + orderby: 'concat(deaddate,uniquekey) DESC', pageSize: 100 }) const curWorkList = response.rows diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue index 31d0e34..44e84de 100644 --- a/src/renderer/src/views/classTask/container/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue @@ -150,6 +150,7 @@ :min-scale="0.2" :preview-src-list="stuItem.imagefile" :initial-index="4" + fit="contain" /> @@ -233,6 +234,7 @@ .map((item) => item.url) " :initial-index="4" + fit="contain" /> @@ -276,6 +278,7 @@ .map((item) => item.url) " :initial-index="4" + fit="contain" /> @@ -314,102 +317,102 @@ - - -
- - - - -
- - - 得分: - {{ - classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2) - }} - - - - 得分: - - + +
+ + + + +
+ + + 得分: + {{ + classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2) + }} + + + + 得分: + + + + - - -
-
- {{ score.ratingValue }} +
+
+ {{ score.ratingValue }} +
-
- - - - -