Compare commits

..

No commits in common. "e07d01f0a15218e4448594e07533e79cf70b443c" and "5c60a30a8ada2cacbe9ae70bca99ba9510765c6b" have entirely different histories.

6 changed files with 330 additions and 385 deletions

View File

@ -167,64 +167,3 @@ export function getTomorrow() {
return tomorrow; return tomorrow;
} }
/**
* 当前日期的 前几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式 false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtherDay(index, format=true) {
let date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()- index < 10 ? '0' + (date.getDate()- index) : date.getDate()- index
// 前 index 天的时间
if(format){
let tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
let tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* 当前日期的 后几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式 false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtheNextDay(index, format=true) {
const date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()+ index < 10 ? '0' + (date.getDate()+ index) : date.getDate()+ index
// 前 index 天的时间
if(format){
const tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
const tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 转为日期格式: YYYY-MM-DD
*
* @param {*} format
* @returns
*/
export const getDateFormatDate = (newDate)=> {
const now = newDate; // new Date();
const year = now.getFullYear();
const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
}

View File

@ -4,26 +4,30 @@
<div class="class-reserv-tabs"> <div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" /> <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
</div> </div>
<div v-if="tabActive === '已批改'"> <div v-if="tabActive === '已结束'">
<div class="demo-date-picker"> <div class="demo-date-picker">
<div class="block">
<el-date-picker <el-date-picker
v-model="startEndDate" v-model="EndDate"
type="daterange" type="date"
start-placeholder="Start Date" format="YYYY-MM-DD"
end-placeholder="End Date" value-format="YYYY-MM-DD"
:default-time="defaultTime" placeholder="请选择截止日期"
@change="changeStartEndDate" size="large"
:disabled-date="disabledDate"
@change="changeEndDate"
/> />
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="class-reserv-body"> <div class="class-reserv-body">
<!-- loading <el-skeleton :rows="5" animated />--> <!-- loading <el-skeleton :rows="5" animated />-->
<el-skeleton :rows="5" :loading="loading" animated /> <el-skeleton :rows="5" :loading="loading" animated />
<div v-if="classWorkList.length > 0"> <div v-if="classWorkList.length > 0">
<task-item <task-item
v-for="(item, index) in activeDataList" v-for="(item, index) in activeDataList"
v-show="tabActive === '待批改'" v-show="tabActive === '进行中'"
:key="index" :key="index"
:item="item" :item="item"
:tabactive="tabActive" :tabactive="tabActive"
@ -32,7 +36,7 @@
></task-item> ></task-item>
<task-item <task-item
v-for="(item, index) in doneDataList" v-for="(item, index) in doneDataList"
v-show="tabActive === '已批改'" v-show="tabActive === '已结束'"
:key="index" :key="index"
:item="item" :item="item"
:tabactive="tabActive" :tabactive="tabActive"
@ -59,8 +63,9 @@ import { listByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/classTask/task-item.vue' import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
// import ItemDialog from '@/views/classTask/container/item-dialog.vue' // import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import { getCurrentTime, getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date' import { getCurrentTime } 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'
@ -68,21 +73,13 @@ 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(['进行中', '已结束'])
const tabActive = ref('待批改') const tabActive = ref('进行中')
const dataList = ref([]) const dataList = ref([])
// 23 const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
const startEndDate = ref([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
const defaultTime = ref<[Date, Date]>([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
// //
const classWorkList = ref([]) const classWorkList = ref([])
@ -94,24 +91,23 @@ 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) => {
return time.getTime() > Date.now() return time.getTime() > Date.now()
} }
//
const changeStartEndDate = (val) => { const changeEndDate = (val) => {
console.log('止日期改变', val) console.log('止日期改变', val)
getData() // getData() //
} }
@ -119,35 +115,63 @@ 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()
// 2 // 3
getStudentClassWorkData() getStudentClassWorkData()
loading.value = false loading.value = false
} }
/** /**
* 1获取班级作业 * 1获取班级列表数据
* TODO 这里暂时取班级id的list后续需要在修改
*/
const getClassList = () => {
if(classTaskStore.classListIds.length==0){
// ids idlist
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,//
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]), // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// deaddate: EndDate.value,//
status: tabActive.value === '待批改'? '1' : '2', // 1- status: '1', // 1-
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100, pageSize: 100,
}) })
let list = response.rows || []; /**
* 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); //
}
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
// //
list[i].workdatalist = [] // list[i].workdatalist = []
list[i].workdatacount = 0 //
list[i].workdatalistVisible = false list[i].workdatalistVisible = false
list[i].feedtimelength = 0 // list[i].workdatafeedbackcount = 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 //
@ -176,11 +200,19 @@ const getClassWorkList = async () => {
} else { } else {
list[i].entpcourseworklistarray = [] list[i].entpcourseworklistarray = []
} }
// classworkdatastudentids
if (
list[i].classworkdatastudentids != '' &&
list[i].classworkdatastudentids != null &&
list[i].classworkdatastudentids != 'null'
) {
const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
list[i].workdatacount = stuList.length
} }
}
// (workdataresultsum)>0 // (workdatacount)>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.workdatacount > 0)
//TODO total //TODO total
total.value = 0 total.value = 0
}else{ }else{
@ -188,25 +220,38 @@ const getClassWorkList = async () => {
total.value = 0 total.value = 0
} }
loading.value = false loading.value = false
}
} }
/** /**
* 2获取多个班级学生作业数据 * 3获取多个班级学生作业数据
* 查询已交的列表
* @param workList 需要更新的作业list
* @param Refresh true 不用刷新false 需要刷新
*/ */
const getStudentClassWorkData = async(workList = [], Refresh = true) => { const getStudentClassWorkData = async() => {
// (workdataresultcount ) // const { chapterId } = await useGetHomework(props.bookobj.node)
let SubmitClWorkList = []; // this.entpcourseid = chapterId
if(Refresh){ //if(classTaskStore.classListIds.length>0){
SubmitClWorkList = classWorkList.value.filter((item) => item.workdataresultcount > 0) ; // listClassworkdataByDeadDate({
}else{ // edituserid: userStore.userId, // id
SubmitClWorkList = workList; // classids: classTaskStore.classListIds.join(','),
} // edusubject: userStore.edusubject,//
// deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
// deaddate: EndDate.value,//
// //status: '1', // 1-
// orderby: "deaddate DESC",//
// pageSize: 1000,
// })
console.log('有提交的作业', SubmitClWorkList) // listClassworkdataNew({
const ids = SubmitClWorkList&&SubmitClWorkList.map((item) => item.id).join(','); // classworkids: ids, // id
// 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;
} }
@ -216,14 +261,13 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
}).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('==================')
// / // /
// resultcount0 // resultcount0
//classWorkList.value[t].workdataresultcount++ classWorkList.value[t].workdatafeedbackcount++
// //
classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength) classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
// //
@ -261,43 +305,36 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
} }
} }
} }
// workdataresultsum // workdatacount
if (res.rows[i].classworkid == classWorkList.value[t].id) { if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdatalist.push(res.rows[i]) classWorkList.value[t].workdatalist.push(res.rows[i])
} }
} }
// workdatacount0
if (
// : workdataresultcount ; workdataresultsum 0; classWorkList.value[t].workdataresultcount > 0 &&
if (classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0 ) { classWorkList.value[t].workdatacount > 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].workdatacount) * 100
) )
} else { } else {
classWorkList.value[t].finishpercent = 0 classWorkList.value[t].finishpercent = 0
} }
/** 计算 已批阅进度 */
// workdataresultsum teacherrationgcount
// (-) / * 100
if (classWorkList.value[t].workdataresultsum > 0) {
classWorkList.value[t].teacherCorrectionProgress = parseInt(
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].teacherCorrectionProgress = 0
}
// //
// 2024-04-12by jackyshen // 2024-04-12by jackyshen
// / //
if (classWorkList.value[t].workdataresultcount > 0) { if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdataresultcount / 60).toFixed(0) classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 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 &&
@ -306,15 +343,17 @@ const getStudentClassWorkData = async(workList = [], Refresh = true) => {
var dd = var dd =
(classWorkList.value[t].rightAnswerCount / (classWorkList.value[t].rightAnswerCount /
(classWorkList.value[t].entpcourseworklistarray.length * (classWorkList.value[t].entpcourseworklistarray.length *
classWorkList.value[t].workdataresultsum)) * classWorkList.value[t].workdatacount)) *
100 100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%' classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else { } else {
classWorkList.value[t].scoingRate = '0%' classWorkList.value[t].scoingRate = '0%'
} }
//
//
} }
}) })
}
} }
@ -340,7 +379,6 @@ const getStudentClassWorkDataPolling = () => {
getStudentVisible() getStudentVisible()
// //
pollingST.value = setInterval(() => { pollingST.value = setInterval(() => {
console.log('轮询查询学生作业进度')
getStudentVisible() getStudentVisible()
}, 1000 * 10) }, 1000 * 10)
} }
@ -375,56 +413,75 @@ onUnmounted(() => {
// [] - // [] -
const getStudentVisible = async () => { const getStudentVisible = async () => {
if(!classWorkList.value.length>0){ if (classTaskStore.classListIds.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,//
startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]), // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// deaddate: EndDate.value,//
status: tabActive.value === '待批改'? '1' : '2', // 1- status: '1', // 1-
// orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100, pageSize: 100
}) })
let list = response.rows || []; /**
* 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 newList = []; const curWorkList = list
for(let i = 0; i < classWorkList.value.length; i++){
// listidlistid listlist /**
const isList = list.filter((item) => item.id === classWorkList.value[i].id); * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
if(isList.length === 0){ * 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
// listidlistidlist */
classWorkList.value.splice(i,1); for (let t = 0; t < classWorkList.value.length; t++) {
} // []
for(let j = 0; j < list.length; j++){ // if( getDateTime > classWorkList.value[t].deaddate ){
// workdataresultcount ; // continue;
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].workdataresultcount != list[j].workdataresultcount){ // }
// = // (index)
newList.push(list[j]); let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
} // workdataresultcount workdatacount0
// teacherrationgcount if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].teacherrationgcount != list[j].teacherrationgcount){ classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// //
if (classWorkList.value[i].workdataresultsum > 0) { classWorkList.value[t].finishpercent = parseInt(
// (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
classWorkList.value[i].teacherrationgcount = list[j].teacherrationgcount;
classWorkList.value[i].teacherCorrectionProgress = parseInt(
((list[j].teacherrationgcount) / list[j].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 { } else {
classWorkList.value[i].teacherCorrectionProgress = 0 classWorkList.value[t].averagetime = 0
}
//
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
} else {
//
if(curWork && curWork.workdataresultcount == 0){
//
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
}
classWorkList.value[t].finishpercent = 0
} }
} }
}
} return 1
if(newList.length>0){
//
const list = newList&&newList.filter((item) => item.workdataresultcount > 0) ;
getStudentClassWorkData(list,false);
}
} }
@ -432,27 +489,16 @@ 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>

View File

@ -14,40 +14,31 @@
&nbsp;|&nbsp; 截止时间{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }} &nbsp;|&nbsp; 截止时间{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }}
</div> </div>
</div> </div>
<div class="class-reserv-item-tool">
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.finishpercent" :color="'#000fff'" style="cursor: pointer"></el-progress>
<span>
已交(
<span> <span>
<span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span> <span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
<span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span> <span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
/{{ item.workdataresultsum }} /{{ item.workdatacount }}</span>
</span> <span>已交</span>
)
</span>
</div> </div>
<div class="class-reserv-item-tool">
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress"> <!-- 总人数-已批阅人数 -->
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.teacherCorrectionProgress" :color="'#ff7f00'" style="cursor: pointer"></el-progress> <span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdatacount - item.teacherrationgcount:item.workdatacount }}</span>
<span> <span>待批阅</span>
已批阅(<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount}}</span>)
</span>
</div> </div>
<!-- TODO 练习次数引用次数 这里随便的假数据-->
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultsum }}</span>
<span>练习次数</span>
</div>
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdataresultsum - item.teacherrationgcount:item.workdataresultsum }}</span>
<span>引用次数</span>
</div>
<div class="class-reserv-item-tool"> <div class="class-reserv-item-tool">
<span> <span>
<!-- {{ item.averagetime?item.averagetime:0 }} -->
<!-- <span v-if=" item.averagetime<60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span>
<span v-if=" item.averagetime==60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">1</span>小时
</span>
<span v-if=" item.averagetime>60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime / 60)}}</span>小时
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime % 60)}}</span>分钟
</span> -->
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟 <span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span> </span>
<span>平均用时</span> <span>平均用时</span>
@ -106,11 +97,6 @@ const props = defineProps({
} }
} }
} }
.class-reserv-item-progress {
width: 200px;
padding: 0 10px;
font-size: 14px;
}
.class-reserv-item-tool { .class-reserv-item-tool {
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;

View File

@ -251,7 +251,6 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue' import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user const userStore = useUserStore().user
@ -878,19 +877,7 @@ const showExamAnalyseDrawer = (row) => {
onMounted(async() => { onMounted(() => {
//
const name = userStore.edustage + userStore.edusubject;
const jyCT = await JYApiListCT(proxy, name);
if (jyCT.length == 0) {
ElMessage.error('获取题型失败!');
return;
}
entpCourseWorkTypeList.value = jyCT;
//
entpCourseWorkYearList.value = JYApiListOriginYear();
entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
}) })
watch(() => props.propsformobj.uniquekey, (newVal) => { watch(() => props.propsformobj.uniquekey, (newVal) => {

View File

@ -14,9 +14,8 @@
<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,10 +52,9 @@ const getHomework = async () => {
const { edustage, edusubject } = user const { edustage, edusubject } = user
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 == '学习目标定位') {
@ -104,8 +102,7 @@ const onClickItem = (item) => {
} }
const tagType = (time) => { const tagType = (time) => {
return 'warning'; return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
// return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
} }

View File

@ -43,16 +43,6 @@ export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
let classWorkList = [] let classWorkList = []
// 将标签中的双引号增加转义
const escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
result = str.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
return result;
}
/** /**
* 获取班级作业 * 获取班级作业
*/ */
@ -62,8 +52,8 @@ export const getClassWorkList = async (id) => {
/** /**
* 2024-10-17 由于 后面截止时间加了 时分特加判断 * 2024-10-17 由于 后面截止时间加了 时分特加判断
* 1待批改以前是以明天判断现改为传当天的日期并根据当前日期的时分与截止日期进行判断 * 1进行中以前是以明天判断现改为传当天的日期并根据当前日期的时分与截止日期进行判断
* 2批改以前默认是以明天判断现依然以明天为判断并根据当前日期时分大于截止日期时分判断 * 2结束以前默认是以明天判断现依然以明天为判断并根据当前日期时分大于截止日期时分判断
*/ */
let list = response.rows let list = response.rows