Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zouyf_dev
This commit is contained in:
commit
a75e4bcc52
|
@ -1,28 +0,0 @@
|
||||||
import { defineStore } from 'pinia'
|
|
||||||
import { } from '@/api/classTask/index.js'
|
|
||||||
import { listClassmain } from '@/api/classManage/index'
|
|
||||||
|
|
||||||
const useClassTaskStore = defineStore('classTask',{
|
|
||||||
state: () => ({
|
|
||||||
classListIds: [],
|
|
||||||
}),
|
|
||||||
actions: {
|
|
||||||
listClassmain(params) {
|
|
||||||
// 获取班级列表
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
listClassmain(params)
|
|
||||||
.then((res) => {
|
|
||||||
this.classListIds = res.rows&&res.rows.map((item) => item.id)
|
|
||||||
resolve(res)
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
reject(error)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
},
|
|
||||||
},
|
|
||||||
persist: true
|
|
||||||
})
|
|
||||||
export default useClassTaskStore
|
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,6 @@ import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
|
||||||
import { useToolState } from '@/store/modules/tool'
|
import { useToolState } from '@/store/modules/tool'
|
||||||
import { getCurrentTime, getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date'
|
import { getCurrentTime, getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date'
|
||||||
import useUserStore from '@/store/modules/user'
|
import useUserStore from '@/store/modules/user'
|
||||||
import useClassTaskStore from "@/store/modules/classTask";
|
|
||||||
import {createWindow} from '@/utils/tool'
|
import {createWindow} from '@/utils/tool'
|
||||||
import {sessionStore} from '@/utils/store'
|
import {sessionStore} from '@/utils/store'
|
||||||
import {debounce } from '@/utils/comm'
|
import {debounce } from '@/utils/comm'
|
||||||
|
@ -69,7 +68,6 @@ import {debounce } from '@/utils/comm'
|
||||||
|
|
||||||
const toolState = useToolState();
|
const toolState = useToolState();
|
||||||
|
|
||||||
const classTaskStore = useClassTaskStore()
|
|
||||||
const userStore = useUserStore().user
|
const userStore = useUserStore().user
|
||||||
// const itemDialogRef = ref(null)
|
// const itemDialogRef = ref(null)
|
||||||
const tabOptions = ref(['待批改', '已批改'])
|
const tabOptions = ref(['待批改', '已批改'])
|
||||||
|
@ -96,15 +94,16 @@ const loading = ref(false)
|
||||||
const activeDataList = computed(() => {
|
const activeDataList = computed(() => {
|
||||||
return classWorkList.value
|
return classWorkList.value
|
||||||
})
|
})
|
||||||
|
const doneDataList = computed(() => {
|
||||||
|
return classWorkList.value
|
||||||
|
})
|
||||||
const deleteReserv = (item) => {
|
const deleteReserv = (item) => {
|
||||||
console.log('删除待开发', item)
|
console.log('删除待开发', item)
|
||||||
// dataList.value = dataList.value.filter((is) => {
|
// dataList.value = dataList.value.filter((is) => {
|
||||||
// return is.id !== item.id
|
// return is.id !== item.id
|
||||||
// })
|
// })
|
||||||
}
|
}
|
||||||
const doneDataList = computed(() => {
|
|
||||||
return classWorkList.value
|
|
||||||
})
|
|
||||||
|
|
||||||
// 当日之后的日期禁用
|
// 当日之后的日期禁用
|
||||||
const disabledDate = (time) => {
|
const disabledDate = (time) => {
|
||||||
|
@ -120,36 +119,22 @@ const changeStartEndDate = (val) => {
|
||||||
const getData = async () => {
|
const getData = async () => {
|
||||||
classWorkList.value = []
|
classWorkList.value = []
|
||||||
loading.value = true
|
loading.value = true
|
||||||
// 1、班级列表
|
// 1、班级作业
|
||||||
// getClassList()
|
|
||||||
// 2、班级作业
|
|
||||||
await getClassWorkList()
|
await getClassWorkList()
|
||||||
// 3、班级学生作业 包含多个班级
|
// 2、班级学生作业 包含多个班级
|
||||||
getStudentClassWorkData()
|
getStudentClassWorkData()
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1、获取班级列表数据
|
* 1、获取班级作业
|
||||||
* TODO 这里暂时取班级id的list,后续需要在修改
|
|
||||||
*/
|
|
||||||
const getClassList = () => {
|
|
||||||
if(classTaskStore.classListIds.length==0){
|
|
||||||
// 获取 班级列表ids 这里暂时取班级id的list,后续需要在修改
|
|
||||||
classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* 2、获取班级作业
|
|
||||||
*/
|
*/
|
||||||
const getClassWorkList = async () => {
|
const getClassWorkList = async () => {
|
||||||
//if(classTaskStore.classListIds.length>0){
|
|
||||||
{
|
|
||||||
// 班级作业数据,包含多个班级 homeworklist
|
// 班级作业数据,包含多个班级 homeworklist
|
||||||
const response = await listByDeadDate({
|
const response = await listByDeadDate({
|
||||||
edituserid: userStore.userId, // 老师的id
|
edituserid: userStore.userId, // 老师的id
|
||||||
edustage: userStore.edustage, // 学段
|
edustage: userStore.edustage, // 学段
|
||||||
edusubject: userStore.edusubject,//学科
|
edusubject: userStore.edusubject,//学科
|
||||||
// deaddate: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改:明天,已批改:选择的日期 弃用
|
|
||||||
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
|
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
|
||||||
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改:明天,已批改:选择的日期
|
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改:明天,已批改:选择的日期
|
||||||
status: tabActive.value === '待批改'? '1' : '2', // 作业状态:1-已发布
|
status: tabActive.value === '待批改'? '1' : '2', // 作业状态:1-已发布
|
||||||
|
@ -157,26 +142,12 @@ const getClassWorkList = async () => {
|
||||||
pageSize: 100,
|
pageSize: 100,
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 2024-11-02 需求更改;弃用
|
|
||||||
* 2024-10-17 由于 后面截止时间加了 时分,特加判断
|
|
||||||
* 1、待批改、以前是以明天判断。现改为传当天的日期,并根据当前日期的时分与截止日期进行判断,
|
|
||||||
* 2、已批改、以前默认是以明天判断。现依然以明天为判断,并根据当前日期时分大于截止日期时分判断。
|
|
||||||
*/
|
|
||||||
// let list = [];
|
|
||||||
// if(tabActive.value === '待批改'){
|
|
||||||
// // 待批改 当前日期时间 小于 截止 日期时间
|
|
||||||
// list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 待批改
|
|
||||||
// }else{
|
|
||||||
// list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已批改
|
|
||||||
// }
|
|
||||||
|
|
||||||
let list = response.rows || [];
|
let list = response.rows || [];
|
||||||
for (var i = 0; i < list.length; i++) {
|
for (var i = 0; i < list.length; i++) {
|
||||||
// 初始化部分新增字段值
|
// 初始化部分新增字段值
|
||||||
list[i].workdatalist = []
|
list[i].workdatalist = [] // 当前任务中有多少个学生的数据集合
|
||||||
list[i].workdatalistVisible = false
|
list[i].workdatalistVisible = false
|
||||||
list[i].workdatafeedbackcount = 0 // 已交人数
|
list[i].feedtimelength = 0 // 已交的学生人中,汇总计算用时
|
||||||
list[i].feedtimelength = 0
|
|
||||||
list[i].rightAnswerCount = 0
|
list[i].rightAnswerCount = 0
|
||||||
list[i].scoingRate = 0 + '%' // 得分率
|
list[i].scoingRate = 0 + '%' // 得分率
|
||||||
list[i].averagetime = 0 // 平均用时
|
list[i].averagetime = 0 // 平均用时
|
||||||
|
@ -206,6 +177,7 @@ const getClassWorkList = async () => {
|
||||||
list[i].entpcourseworklistarray = []
|
list[i].entpcourseworklistarray = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 显示分配人数(workdataresultsum)>0 的
|
// 显示分配人数(workdataresultsum)>0 的
|
||||||
if (list && list.length > 0) {
|
if (list && list.length > 0) {
|
||||||
classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
|
classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
|
||||||
|
@ -217,39 +189,24 @@ const getClassWorkList = async () => {
|
||||||
}
|
}
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 3、获取多个班级学生作业数据
|
* 2、获取多个班级学生作业数据
|
||||||
|
* 查询已交的列表
|
||||||
|
* @param workList :需要更新的作业list
|
||||||
|
* @param Refresh :true 不用刷新,false 需要刷新
|
||||||
*/
|
*/
|
||||||
const getStudentClassWorkData = async() => {
|
const getStudentClassWorkData = async(workList = [], Refresh = true) => {
|
||||||
// const { chapterId } = await useGetHomework(props.bookobj.node)
|
// 获取 已交的 列表数据(workdataresultcount 已交的学生数)
|
||||||
// this.entpcourseid = chapterId
|
let SubmitClWorkList = [];
|
||||||
//if(classTaskStore.classListIds.length>0){
|
if(Refresh){
|
||||||
// listClassworkdataByDeadDate({
|
SubmitClWorkList = classWorkList.value.filter((item) => item.workdataresultcount > 0) ;
|
||||||
// edituserid: userStore.userId, // 老师的id
|
}else{
|
||||||
// classids: classTaskStore.classListIds.join(','),
|
SubmitClWorkList = workList;
|
||||||
// edusubject: userStore.edusubject,//学科
|
}
|
||||||
// deaddate: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改:明天,已批改:选择的日期
|
|
||||||
// deaddate: EndDate.value,// 待批改:明天,已批改:选择的日期
|
|
||||||
// startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
|
|
||||||
// deaddate:tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),
|
|
||||||
// //status: tabActive.value === '待批改'? '1' : '2', // 作业状态:1-已发布
|
|
||||||
// orderby: "deaddate DESC",//
|
|
||||||
// pageSize: 1000,
|
|
||||||
// })
|
|
||||||
|
|
||||||
// listClassworkdataNew({
|
console.log('有提交的作业', SubmitClWorkList)
|
||||||
// classworkids: ids, // 作业id
|
const ids = SubmitClWorkList&&SubmitClWorkList.map((item) => item.id).join(',');
|
||||||
// edituserid: userStore.userId, // 老师的id
|
|
||||||
// edusubject: userStore.edusubject,//学科
|
|
||||||
// evalStatus: 1,
|
|
||||||
// pageSize: 1000,
|
|
||||||
// })
|
|
||||||
|
|
||||||
|
|
||||||
{
|
|
||||||
const ids = classWorkList.value.map((item) => item.id).join(',');
|
|
||||||
if (ids == '') {
|
if (ids == '') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -259,13 +216,14 @@ const getStudentClassWorkData = async() => {
|
||||||
}).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++) {
|
||||||
|
// finishtimelength != '0' 已交
|
||||||
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
|
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
|
||||||
console.log('==================')
|
console.log('==================')
|
||||||
// 有几个学生完成/正在完成学习任务
|
// 有几个学生完成/正在完成学习任务
|
||||||
// 至少resultcount不是0
|
// 至少resultcount不是0
|
||||||
classWorkList.value[t].workdatafeedbackcount++
|
//classWorkList.value[t].workdataresultcount++
|
||||||
|
|
||||||
// 在参与学习任务的人中,汇总计算用时
|
// 已交的学生人中,汇总计算用时
|
||||||
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
|
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
|
||||||
|
|
||||||
// 计算得分率
|
// 计算得分率
|
||||||
|
@ -308,11 +266,10 @@ const getStudentClassWorkData = async() => {
|
||||||
classWorkList.value[t].workdatalist.push(res.rows[i])
|
classWorkList.value[t].workdatalist.push(res.rows[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 计算完成进度 workdataresultsum人数要大于0
|
|
||||||
if (
|
|
||||||
classWorkList.value[t].workdataresultcount > 0 &&
|
// 计算完成进度: workdataresultcount 学生提交了的个数; workdataresultsum 人数要大于0;
|
||||||
classWorkList.value[t].workdataresultsum > 0
|
if (classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0 ) {
|
||||||
) {
|
|
||||||
classWorkList.value[t].finishpercent = parseInt(
|
classWorkList.value[t].finishpercent = parseInt(
|
||||||
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
|
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
|
||||||
)
|
)
|
||||||
|
@ -324,7 +281,6 @@ const getStudentClassWorkData = async() => {
|
||||||
// workdataresultsum 人数 teacherrationgcount 已批阅人数
|
// workdataresultsum 人数 teacherrationgcount 已批阅人数
|
||||||
// 已批阅百分比: (人数-已批阅数) / 人数 * 100
|
// 已批阅百分比: (人数-已批阅数) / 人数 * 100
|
||||||
if (classWorkList.value[t].workdataresultsum > 0) {
|
if (classWorkList.value[t].workdataresultsum > 0) {
|
||||||
// teacherCorrectionProgress 老师已批阅进度条:
|
|
||||||
classWorkList.value[t].teacherCorrectionProgress = parseInt(
|
classWorkList.value[t].teacherCorrectionProgress = parseInt(
|
||||||
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
|
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
|
||||||
)
|
)
|
||||||
|
@ -335,16 +291,13 @@ const getStudentClassWorkData = async() => {
|
||||||
// 以下四个参数,都要计算
|
// 以下四个参数,都要计算
|
||||||
// 2024-04-12,酉阳,by jackyshen
|
// 2024-04-12,酉阳,by jackyshen
|
||||||
|
|
||||||
// 计算参与学习任务的平均用时
|
// 计算参与学习任务的平均用时:学生总用时/ 提交学生数
|
||||||
if (classWorkList.value[t].workdatafeedbackcount > 0) {
|
if (classWorkList.value[t].workdataresultcount > 0) {
|
||||||
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
|
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdataresultcount / 60).toFixed(0)
|
||||||
} else {
|
} else {
|
||||||
classWorkList.value[t].averagetime = 0
|
classWorkList.value[t].averagetime = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// 计算批阅异常,需要获取每个题目的类型,找出主观题
|
|
||||||
// 暂缓
|
|
||||||
|
|
||||||
// 计算平均得分率: 正确题数/(题目总数*学生人数)*100
|
// 计算平均得分率: 正确题数/(题目总数*学生人数)*100
|
||||||
if (
|
if (
|
||||||
classWorkList.value[t].entpcourseworklistarray &&
|
classWorkList.value[t].entpcourseworklistarray &&
|
||||||
|
@ -359,11 +312,9 @@ const getStudentClassWorkData = async() => {
|
||||||
} else {
|
} else {
|
||||||
classWorkList.value[t].scoingRate = '0%'
|
classWorkList.value[t].scoingRate = '0%'
|
||||||
}
|
}
|
||||||
// 设定典型作答,需要获取每个题目的类型,找出主观题
|
|
||||||
// 暂缓
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -424,91 +375,56 @@ onUnmounted(() => {
|
||||||
|
|
||||||
// [作业反馈] - 实际查询逻辑
|
// [作业反馈] - 实际查询逻辑
|
||||||
const getStudentVisible = async () => {
|
const getStudentVisible = async () => {
|
||||||
if (classTaskStore.classListIds.length <= 0) {
|
if(!classWorkList.value.length>0){
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
// 班级作业数据,多个班级
|
|
||||||
const response = await listByDeadDate({
|
const response = await listByDeadDate({
|
||||||
classidarray: classTaskStore.classListIds.join(','),
|
|
||||||
edituserid: userStore.userId, // 老师的id
|
edituserid: userStore.userId, // 老师的id
|
||||||
edustage: userStore.edustage, // 学段
|
edustage: userStore.edustage, // 学段
|
||||||
edusubject: userStore.edusubject,//学科
|
edusubject: userStore.edusubject,//学科
|
||||||
// deaddate: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改:明天,已批改:选择的日期
|
|
||||||
// deaddate: EndDate.value,// 待批改:明天,已批改:选择的日期
|
|
||||||
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
|
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
|
||||||
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),
|
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改:明天,已批改:选择的日期
|
||||||
status: tabActive.value === '待批改'? '1' : '2', // 作业状态:1-已发布
|
status: tabActive.value === '待批改'? '1' : '2', // 作业状态:1-已发布
|
||||||
// orderby: 'concat(deaddate,uniquekey) DESC',
|
|
||||||
orderby: 'deaddate DESC',
|
orderby: 'deaddate DESC',
|
||||||
pageSize: 100
|
pageSize: 100,
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
let list = response.rows || [];
|
||||||
* 2024-10-17 由于 后面截止时间加了 时分,特加判断
|
|
||||||
* 1、待批改、以前是以明天判断。现改为传当天的日期,并根据当前日期的时分与截止日期进行判断,
|
let newList = [];
|
||||||
* 2、已批改、以前默认是以明天判断。现依然以明天为判断,并根据当前日期时分大于截止日期时分判断。
|
for(let i = 0; i < classWorkList.value.length; i++){
|
||||||
*/
|
// 父list的id与子list的id相等,在进行对比;若是不等? 有可能是老师批阅完了这个list数据,变成了已批改状态中,则父list数据需要删除
|
||||||
let list = [];
|
const isList = list.filter((item) => item.id === classWorkList.value[i].id);
|
||||||
if(tabActive.value === '待批改'){
|
if(isList.length === 0){
|
||||||
// 待批改 当前日期时间 小于 截止 日期时间
|
// 父list的id与子list的id不相等,则删除父list数据
|
||||||
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 待批改
|
classWorkList.value.splice(i,1);
|
||||||
}else{
|
|
||||||
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已批改
|
|
||||||
}
|
}
|
||||||
|
for(let j = 0; j < list.length; j++){
|
||||||
const curWorkList = list
|
// workdataresultcount 学生提交了的个数;
|
||||||
|
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].workdataresultcount != list[j].workdataresultcount){
|
||||||
/**
|
// 学生提交数 != 学生提交数?
|
||||||
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
|
newList.push(list[j]);
|
||||||
* 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
|
|
||||||
*/
|
|
||||||
for (let t = 0; t < classWorkList.value.length; t++) {
|
|
||||||
// 当前时间超过[作业任务]截止时间的跳过
|
|
||||||
// if( getDateTime > classWorkList.value[t].deaddate ){
|
|
||||||
// continue;
|
|
||||||
// }
|
|
||||||
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
|
|
||||||
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
|
|
||||||
// workdataresultcount 完成人数 workdataresultsum人数要大于0
|
|
||||||
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0) {
|
|
||||||
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
|
|
||||||
// 桌面端貌似不需要进度条了?
|
|
||||||
classWorkList.value[t].finishpercent = parseInt(
|
|
||||||
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
|
|
||||||
)
|
|
||||||
// 计算参与学习任务的平均用时
|
|
||||||
if (classWorkList.value[t].workdatafeedbackcount > 0) {
|
|
||||||
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
|
|
||||||
} else {
|
|
||||||
classWorkList.value[t].averagetime = 0
|
|
||||||
}
|
}
|
||||||
|
// teacherrationgcount 已批阅人数
|
||||||
} else {
|
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].teacherrationgcount != list[j].teacherrationgcount){
|
||||||
// 学生未完成,但是老师批改了?
|
// 更新批阅进度条
|
||||||
if(curWork && curWork.workdataresultcount == 0){
|
if (classWorkList.value[i].workdataresultsum > 0) {
|
||||||
// 更新批改数
|
// 更新批阅数、 进度条
|
||||||
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
|
classWorkList.value[i].teacherrationgcount = list[j].teacherrationgcount;
|
||||||
}
|
classWorkList.value[i].teacherCorrectionProgress = parseInt(
|
||||||
classWorkList.value[t].finishpercent = 0
|
((list[j].teacherrationgcount) / list[j].workdataresultsum) * 100
|
||||||
}
|
|
||||||
|
|
||||||
/** 计算 已批阅进度 */
|
|
||||||
// workdataresultsum 人数 teacherrationgcount 已批阅人数
|
|
||||||
// 已批阅百分比: (人数-已批阅数) / 人数 * 100
|
|
||||||
if (curWork && curWork.workdataresultsum > 0) {
|
|
||||||
// 更新批阅数
|
|
||||||
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
|
|
||||||
|
|
||||||
// teacherCorrectionProgress 老师已批阅进度条:
|
|
||||||
classWorkList.value[t].teacherCorrectionProgress = parseInt(
|
|
||||||
((curWork.teacherrationgcount) / curWork.workdataresultsum) * 100
|
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
classWorkList.value[t].teacherCorrectionProgress = 0
|
classWorkList.value[i].teacherCorrectionProgress = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return 1
|
}
|
||||||
|
if(newList.length>0){
|
||||||
|
// 更新学生提交后的数据? 作业进度条、平均用时、得分率
|
||||||
|
const list = newList&&newList.filter((item) => item.workdataresultcount > 0) ;
|
||||||
|
getStudentClassWorkData(list,false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -516,16 +432,27 @@ const getStudentVisible = async () => {
|
||||||
watch(
|
watch(
|
||||||
() => [dataList, toolState.isTaskWin],
|
() => [dataList, toolState.isTaskWin],
|
||||||
() => {
|
() => {
|
||||||
console.log('=监听到批改窗口打开了===', toolState.isTaskWin)
|
console.log('监听--批改窗口是否打开===', toolState.isTaskWin)
|
||||||
if(!toolState.isTaskWin){
|
if(!toolState.isTaskWin){
|
||||||
|
if(tabActive.value === '待批改'){
|
||||||
closeDialog();// 开启轮询
|
closeDialog();// 开启轮询
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
watch(tabActive, (newVal,oldVal)=>{
|
watch(tabActive, (newVal,oldVal)=>{
|
||||||
console.log('newVal',newVal);
|
console.log('newVal',newVal);
|
||||||
getData() // 加载数据
|
getData() // 加载数据
|
||||||
|
if(newVal === '待批改'){
|
||||||
|
// 轮询查询
|
||||||
|
console.log('监听---开启轮询')
|
||||||
|
closeDialog();
|
||||||
|
}else{
|
||||||
|
// 关闭轮询
|
||||||
|
console.log('监听---关闭轮询')
|
||||||
|
clearInterval(pollingST.value);
|
||||||
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,9 @@
|
||||||
<div class="class-left flex">
|
<div class="class-left flex">
|
||||||
<div class="class-name flex">
|
<div class="class-name flex">
|
||||||
<span class="name">{{ item.uniquekey }}</span>
|
<span class="name">{{ item.uniquekey }}</span>
|
||||||
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
|
<!-- <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
|
||||||
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已批改' : '待批改' }}</el-tag>
|
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已批改' : '待批改' }}</el-tag> -->
|
||||||
|
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">待批改</el-tag>
|
||||||
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
|
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
|
||||||
</div>
|
</div>
|
||||||
<div class="class-time">{{ item.classcaption }} | 截止时间:{{ item.deaddate }} </div>
|
<div class="class-time">{{ item.classcaption }} | 截止时间:{{ item.deaddate }} </div>
|
||||||
|
@ -53,8 +54,9 @@ const getHomework = async () => {
|
||||||
try {
|
try {
|
||||||
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
|
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
|
||||||
// 只展示待批改的
|
// 只展示待批改的
|
||||||
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
|
//homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
|
||||||
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算待批改 弃用
|
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算待批改 弃用
|
||||||
|
homeworkList.value = rows || [];
|
||||||
homeworkList.value.forEach((item) => {
|
homeworkList.value.forEach((item) => {
|
||||||
// 处理任务类型的UI
|
// 处理任务类型的UI
|
||||||
if (item.worktype == '学习目标定位') {
|
if (item.worktype == '学习目标定位') {
|
||||||
|
@ -101,7 +103,8 @@ const onClickItem = (item) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const tagType = (time) => {
|
const tagType = (time) => {
|
||||||
return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
|
return 'warning';
|
||||||
|
//return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue