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

zouyf_dev #272

Merged
zouyf merged 4 commits from zouyf_dev into main 2024-09-26 14:13:58 +08:00
Conversation 0 Commits 4 Files Changed 4 +12 -8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a2a263a35a - Show all commits

20
src/renderer/src/views/classTask/classTask.vue
View File

@ -63,7 +63,7 @@
<script setup> <script setup>
import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue' import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue'
import { listByDeadDate, listClassworkdataByDeadDate } from '@/api/classTask' import { listByDeadDate, listClassworkdataByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/task-item.vue' import TaskItem from '@/views/classTask/container/task-item.vue'
import ItemDialog from '@/views/classTask/container/item-dialog.vue' import ItemDialog from '@/views/classTask/container/item-dialog.vue'
@ -138,12 +138,13 @@ const getClassWorkList = () => {
// 班级作业数据，包含多个班级 homeworklist // 班级作业数据，包含多个班级 homeworklist
listByDeadDate({ listByDeadDate({
classidarray: classTaskStore.classListIds.join(','), classidarray: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段 edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布 status: '1', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC', // orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'uniquekey DESC', orderby: 'deaddate DESC',
pageSize: 100, pageSize: 100,
}).then((response) => { }).then((response) => {
for (var i = 0; i < response.rows.length; i++) { for (var i = 0; i < response.rows.length; i++) {
@ -211,14 +212,17 @@ const getClassWorkList = () => {
*/ */
const getStudentClassWorkData = () => { const getStudentClassWorkData = () => {
if(classTaskStore.classListIds.length>0){ if(classTaskStore.classListIds.length>0){
listClassworkdataByDeadDate({ listClassworkdata({
//listClassworkdataByDeadDate({
edituserid: userStore.userId, // 老师的id
classids: classTaskStore.classListIds.join(','), classids: classTaskStore.classListIds.join(','),
edustage: userStore.edustage,// 学段 edustage: userStore.edustage,// 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布 //status: '1', // 作业状态：1-已发布
orderby: "uniquekey DESC",// TODO： 这里是否加 deaddate 的排序，后续看 //orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
pageSize: 1000 //entpcourseid: 8945,
pageSize: 1000,
}).then((res) => { }).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) { for (var t = 0; t < classWorkList.value.length; t++) {
for (var i = 0; i < res.rows.length; i++) { for (var i = 0; i < res.rows.length; i++) {
@ -375,7 +379,7 @@ const getStudentVisible = async () => {
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
status: '1', // 作业状态：1-已发布 status: '1', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC', // orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'uniquekey DESC', orderby: 'deaddate DESC',
pageSize: 100 pageSize: 100
}) })
const curWorkList = response.rows const curWorkList = response.rows