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

Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zouyf_dev

This commit is contained in:
“zouyf” 2024-11-05 14:04:35 +08:00
parent 09914eb8f9 1cc0bf965e
commit 6c87321900
8 changed files with 266 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/renderer/src/api/classTask/index.js
View File

@ -89,6 +89,13 @@ export function updateClassworkdata(data) {
data: data data: data
}) })
} }
export function updateClassWorkDataAutoFinish(data) {
return request({
url: '/education/classworkdata/updAutoFinish',
method: 'put',
data: data
})
}
// 修改classwork // 修改classwork
export function updateClasswork(data) { export function updateClasswork(data) {
@ -118,90 +125,90 @@ export function addClassworkeval(data) {
// 查询evaluationclue列表 // 查询evaluationclue列表
export function listEvaluationclue(query) { export function listEvaluationclue(query) {
return request({ return request({
url: '/education/evaluationclue/list', url: '/education/evaluationclue/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询evaluationclue详细 // 查询evaluationclue详细
export function getEvaluationclue(id) { export function getEvaluationclue(id) {
return request({ return request({
url: '/education/evaluationclue/' + id, url: '/education/evaluationclue/' + id,
method: 'get' method: 'get'
}) })
} }
// 新增evaluationclue // 新增evaluationclue
export function addEvaluationclueReturnId(data) { export function addEvaluationclueReturnId(data) {
return request({ return request({
url: '/education/evaluationclue/addReturnId', url: '/education/evaluationclue/addReturnId',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 新增evaluationclue // 新增evaluationclue
export function addEvaluationclue(data) { export function addEvaluationclue(data) {
return request({ return request({
url: '/education/evaluationclue', url: '/education/evaluationclue',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改evaluationclue // 修改evaluationclue
export function updateEvaluationclue(data) { export function updateEvaluationclue(data) {
return request({ return request({
url: '/education/evaluationclue', url: '/education/evaluationclue',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除evaluationclue // 删除evaluationclue
export function delEvaluationclue(id) { export function delEvaluationclue(id) {
return request({ return request({
url: '/education/evaluationclue/' + id, url: '/education/evaluationclue/' + id,
method: 'delete' method: 'delete'
}) })
} }
// 新增evaluationclue，保存base64图片 // 新增evaluationclue，保存base64图片
export function saveBase64File(data) { export function saveBase64File(data) {
return request({ return request({
url: '/education/evaluationclue/saveBase64File', url: '/education/evaluationclue/saveBase64File',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 新增evaluationclue，上传 // 新增evaluationclue，上传
export function saveEvaluationClueUploadFile(data) { export function saveEvaluationClueUploadFile(data) {
return request({ return request({
url: '/education/evaluationclue/saveUploadFile', url: '/education/evaluationclue/saveUploadFile',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 读取文件内容 // 读取文件内容
export function readFile(data) { export function readFile(data) {
return fetch(import.meta.env.VITE_APP_RES_FILE_PATH + data.cluelink, { return fetch(import.meta.env.VITE_APP_RES_FILE_PATH + data.cluelink, {
method: "get", method: "get",
headers: { headers: {
'Content-Type': 'text/plain', // 请求头设置为纯文本 'Content-Type': 'text/plain', // 请求头设置为纯文本
'Accept': 'text/plain' // 接受头设置为纯文本 'Accept': 'text/plain' // 接受头设置为纯文本
}, },
}) })
.then(response => response.text()) .then(response => response.text())
.then(text => { .then(text => {
return Promise.resolve(text); return Promise.resolve(text);
}) })
.catch(error => { .catch(error => {
console.error('读取文件出错:', error); console.error('读取文件出错:', error);
return Promise.reject(); return Promise.reject();
}); });
/*return request({ /*return request({
url: '/education/evaluationclue/readFile', url: '/education/evaluationclue/readFile',
method: 'post', method: 'post',

58
src/renderer/src/utils/date.js
View File

@ -167,3 +167,61 @@ 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}`;
}

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

@ -4,20 +4,16 @@
<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>
@ -27,7 +23,7 @@
<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"
@ -36,7 +32,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"
@ -63,7 +59,7 @@ 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 } 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 useClassTaskStore from "@/store/modules/classTask";
import {createWindow} from '@/utils/tool' import {createWindow} from '@/utils/tool'
@ -76,10 +72,19 @@ const toolState = useToolState();
const classTaskStore = useClassTaskStore() 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([])
const EndDate = ref(getCurrentTime('YYYY-MM-DD')) // 默认起止时间：当前日期前2天后3天；默认查询一周的数据
const startEndDate = ref([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
const defaultTime = ref<[Date, Date]>([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
// 所有班级作业列表 // 所有班级作业列表
const classWorkList = ref([]) const classWorkList = ref([])
@ -105,9 +110,9 @@ const doneDataList = computed(() => {
const disabledDate = (time) => { const disabledDate = (time) => {
return time.getTime() > Date.now() return time.getTime() > Date.now()
} }
// 截止日期改变
const changeEndDate = (val) => { const changeStartEndDate = (val) => {
console.log('截止日期改变', val) console.log('起止日期改变', val)
getData() // 加载数据 getData() // 加载数据
} }
@ -144,31 +149,31 @@ const getClassWorkList = async () => {
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: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改：明天，已批改：选择的日期 弃用
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期 startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
status: '1', // 作业状态：1-已发布 deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100, pageSize: 100,
}) })
/** /** 2024-11-02 需求更改；弃用
* 2024-10-17 由于 后面截止时间加了 时分，特加判断 * 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断， * 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。 * 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/ */
let list = []; // let list = [];
if(tabActive.value === '进行中'){ // if(tabActive.value === '待批改'){
// 进行中 当前日期时间 小于 截止 日期时间 // // 待批改 当前日期时间 小于 截止 日期时间
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中 // list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 待批改
}else{ // }else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束 // list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已批改
} // }
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].workdatacount = 0 // 人数
list[i].workdatalistVisible = false list[i].workdatalistVisible = false
list[i].workdatafeedbackcount = 0 // 已交人数 list[i].workdatafeedbackcount = 0 // 已交人数
list[i].feedtimelength = 0 list[i].feedtimelength = 0
@ -200,19 +205,10 @@ 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
}
} }
// 显示分配人数(workdatacount)>0 的 // 显示分配人数(workdataresultsum)>0 的
if (list && list.length > 0) { if (list && list.length > 0) {
classWorkList.value = list && list.filter((item) => item.workdatacount > 0) classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看 //TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = 0 total.value = 0
}else{ }else{
@ -234,9 +230,11 @@ const getStudentClassWorkData = async() => {
// edituserid: userStore.userId, // 老师的id // edituserid: userStore.userId, // 老师的id
// classids: classTaskStore.classListIds.join(','), // classids: classTaskStore.classListIds.join(','),
// edusubject: userStore.edusubject,//学科 // edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 // deaddate: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改：明天，已批改：选择的日期
// deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期 // deaddate: EndDate.value,// 待批改：明天，已批改：选择的日期
// //status: '1', // 作业状态：1-已发布 // startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
// deaddate:tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),
// //status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
// orderby: "deaddate DESC",// // orderby: "deaddate DESC",//
// pageSize: 1000, // pageSize: 1000,
// }) // })
@ -305,23 +303,35 @@ const getStudentClassWorkData = async() => {
} }
} }
} }
// 当前这个学习任务，共推送给了几个学生，workdatacount // 当前这个学习任务，共推送给了几个学生，workdataresultsum
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])
} }
} }
// 计算完成进度 workdatacount人数要大于0 // 计算完成进度 workdataresultsum人数要大于0
if ( if (
classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultcount > 0 &&
classWorkList.value[t].workdatacount > 0 classWorkList.value[t].workdataresultsum > 0
) { ) {
classWorkList.value[t].finishpercent = parseInt( classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100 (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
) )
} else { } else {
classWorkList.value[t].finishpercent = 0 classWorkList.value[t].finishpercent = 0
} }
/** 计算 已批阅进度 */
// workdataresultsum 人数 teacherrationgcount 已批阅人数
// 已批阅百分比： (人数-已批阅数) / 人数 * 100
if (classWorkList.value[t].workdataresultsum > 0) {
// teacherCorrectionProgress 老师已批阅进度条:
classWorkList.value[t].teacherCorrectionProgress = parseInt(
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].teacherCorrectionProgress = 0
}
// 以下四个参数，都要计算 // 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen // 2024-04-12，酉阳，by jackyshen
@ -343,7 +353,7 @@ const getStudentClassWorkData = async() => {
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].workdatacount)) * classWorkList.value[t].workdataresultsum)) *
100 100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%' classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else { } else {
@ -379,6 +389,7 @@ const getStudentClassWorkDataPolling = () => {
getStudentVisible() getStudentVisible()
// 在轮询 // 在轮询
pollingST.value = setInterval(() => { pollingST.value = setInterval(() => {
console.log('轮询查询学生作业进度')
getStudentVisible() getStudentVisible()
}, 1000 * 10) }, 1000 * 10)
} }
@ -422,9 +433,11 @@ const getStudentVisible = async () => {
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: tabActive.value === '待批改'? getTomorrow() : EndDate.value,// 待批改：明天，已批改：选择的日期
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期 // deaddate: EndDate.value,// 待批改：明天，已批改：选择的日期
status: '1', // 作业状态：1-已发布 startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),
status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC', // orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100 pageSize: 100
@ -432,15 +445,15 @@ const getStudentVisible = async () => {
/** /**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断 * 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断， * 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。 * 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/ */
let list = []; let list = [];
if(tabActive.value === '进行中'){ if(tabActive.value === '待批改'){
// 进行中 当前日期时间 小于 截止 日期时间 // 待批改 当前日期时间 小于 截止 日期时间
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中 list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 待批改
}else{ }else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束 list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已批改
} }
const curWorkList = list const curWorkList = list
@ -456,12 +469,12 @@ const getStudentVisible = async () => {
// } // }
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界) // 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id) let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
// workdataresultcount 完成人数 workdatacount人数要大于0 // workdataresultcount 完成人数 workdataresultsum人数要大于0
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) { if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0) {
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// 桌面端貌似不需要进度条了？ // 桌面端貌似不需要进度条了？
classWorkList.value[t].finishpercent = parseInt( classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100 (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
) )
// 计算参与学习任务的平均用时 // 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) { if (classWorkList.value[t].workdatafeedbackcount > 0) {
@ -469,8 +482,7 @@ const getStudentVisible = async () => {
} else { } else {
classWorkList.value[t].averagetime = 0 classWorkList.value[t].averagetime = 0
} }
// 更新批阅数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
} else { } else {
// 学生未完成，但是老师批改了？ // 学生未完成，但是老师批改了？
if(curWork && curWork.workdataresultcount == 0){ if(curWork && curWork.workdataresultcount == 0){
@ -479,6 +491,21 @@ const getStudentVisible = async () => {
} }
classWorkList.value[t].finishpercent = 0 classWorkList.value[t].finishpercent = 0
} }
/** 计算 已批阅进度 */
// 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 {
classWorkList.value[t].teacherCorrectionProgress = 0
}
} }
return 1 return 1

11
src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
View File

@ -427,7 +427,7 @@ import useUserStore from '@/store/modules/user'
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
// import { Plus } from '@element-plus/icons-vue' // import { Plus } from '@element-plus/icons-vue'
import { ElMessageBox, ElMessage } from 'element-plus' import { ElMessageBox, ElMessage } from 'element-plus'
import { updateClassworkeval, updateClassworkdata, getClassworkdata, updateClassworkevalList } from '@/api/classTask' import { updateClassworkeval,updateClasswork, updateClassWorkDataAutoFinish, getClassworkdata, updateClassworkevalList } from '@/api/classTask'
import { getTimeDate } from '@/utils/date' import { getTimeDate } from '@/utils/date'
import ReFilePreview from '@/components/refile-preview/index.vue' import ReFilePreview from '@/components/refile-preview/index.vue'
import { quizStrToList } from '@/utils/comm'; import { quizStrToList } from '@/utils/comm';
@ -871,6 +871,13 @@ const onSubmit = () => {
}) })
return return
} }
/** 1、 更新当前作业是否已经批阅完成 */
// TODO updateClasswork
/** 2、 更新每个学生的批阅 */
var formd = { var formd = {
id: dialogProps.value.studentObj.id, // this.activeClassWork.id; id: dialogProps.value.studentObj.id, // this.activeClassWork.id;
@ -878,7 +885,7 @@ const onSubmit = () => {
updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm; updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm;
}; };
// 更新作业批改状态 // 更新作业批改状态
updateClassworkdata(formd).then(res => { updateClassWorkDataAutoFinish(formd).then(res => {
}) })
// 更新题目批改 // 更新题目批改

60
src/renderer/src/views/classTask/container/classTask/task-item.vue
View File

@ -14,31 +14,40 @@
&nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }} &nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }}
</div> </div>
</div> </div>
<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 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>
/{{ item.workdataresultsum }}
</span>
)
</span>
</div>
<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>
已批阅(<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount}}</span>)
</span>
</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>
<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>
/{{ item.workdatacount }}</span>
<span>已交</span>
</div>
<div class="class-reserv-item-tool">
<!-- 总人数-已批阅人数 -->
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdatacount - item.teacherrationgcount:item.workdatacount }}</span>
<span>待批阅</span>
</div>
<div class="class-reserv-item-tool">
<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>
@ -97,6 +106,11 @@ 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;

4
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -677,9 +677,7 @@ const handleClassOverviewOpen = (type) =>{
} }
} }
}) })
const allTeacherRating = allTopic.reduce((acc, cur) => { const allTeacherRating = allTopic.reduce((acc, cur) => acc + cur.teacherRating, 0)
return acc + cur.teacherRating;
},0)
rightAnswer > 0?item.scoingRate = (score/allTeacherRating * 100).toFixed(0):item.scoingRate = '' rightAnswer > 0?item.scoingRate = (score/allTeacherRating * 100).toFixed(0):item.scoingRate = ''
item.getScore = score item.getScore = score

9
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -15,13 +15,13 @@
<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 :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>
</div> </div>
<div class="class-right"> <div class="class-right">
<div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div> <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdataresultsum }}</div>
<div>已交</div> <div>已交</div>
</div> </div>
</li> </li>
@ -52,9 +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.forEach((item) => { homeworkList.value.forEach((item) => {
// 处理任务类型的UI // 处理任务类型的UI
if (item.worktype == '学习目标定位') { if (item.worktype == '学习目标定位') {
@ -72,7 +72,6 @@ const getHomework = async () => {
item.workclass = '' item.workclass = ''
} }
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
// 如果是习题训练任务，则检查一共有多少道 // 如果是习题训练任务，则检查一共有多少道
if (item.entpcourseworklist != '') { if (item.entpcourseworklist != '') {
item.entpcourseworklistarray = JSON.parse( item.entpcourseworklistarray = JSON.parse(

37
src/renderer/src/views/tool/createHomework.js
View File

@ -43,6 +43,15 @@ export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
let classWorkList = [] let classWorkList = []
// 将标签中的双引号增加转义
let escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
result = str.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
return result;
}
/** /**
* 获取班级作业 * 获取班级作业
*/ */
@ -52,8 +61,8 @@ export const getClassWorkList = async (id) => {
/** /**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断 * 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断， * 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。 * 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/ */
let list = response.rows let list = response.rows
@ -61,7 +70,6 @@ export const getClassWorkList = async (id) => {
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].workdatafeedbackcount = 0 // 已交人数 list[i].workdatafeedbackcount = 0 // 已交人数
list[i].feedtimelength = 0 list[i].feedtimelength = 0
@ -91,19 +99,10 @@ export const getClassWorkList = async (id) => {
} 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
}
} }
// 显示分配人数(workdatacount)>0 的 // 显示分配人数(workdataresultsum)>0 的
if (list && list.length > 0) { if (list && list.length > 0) {
classWorkList = list && list.filter((item) => item.workdatacount > 0) classWorkList = list && list.filter((item) => item.workdataresultsum > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看 //TODO： 这里没分页，貌似这个 total 不重要，后续看
} else { } else {
classWorkList = [] classWorkList = []
@ -171,18 +170,18 @@ export const getStudentClassWorkData = async () => {
} }
} }
} }
// 当前这个学习任务，共推送给了几个学生，workdatacount // 当前这个学习任务，共推送给了几个学生，workdataresultsum
if (res.rows[i].classworkid == classWorkList[t].id) { if (res.rows[i].classworkid == classWorkList[t].id) {
classWorkList[t].workdatalist.push(res.rows[i]) classWorkList[t].workdatalist.push(res.rows[i])
} }
} }
// 计算完成进度 workdatacount人数要大于0 // 计算完成进度 workdataresultsum 人数要大于0
if ( if (
classWorkList[t].workdataresultcount > 0 && classWorkList[t].workdataresultcount > 0 &&
classWorkList[t].workdatacount > 0 classWorkList[t].workdataresultsum > 0
) { ) {
classWorkList[t].finishpercent = parseInt( classWorkList[t].finishpercent = parseInt(
(classWorkList[t].workdataresultcount / classWorkList[t].workdatacount) * 100 (classWorkList[t].workdataresultcount / classWorkList[t].workdataresultsum) * 100
) )
} else { } else {
classWorkList[t].finishpercent = 0 classWorkList[t].finishpercent = 0
@ -211,7 +210,7 @@ export const getStudentClassWorkData = async () => {
var dd = var dd =
(classWorkList[t].rightAnswerCount / (classWorkList[t].rightAnswerCount /
(classWorkList[t].entpcourseworklistarray.length * (classWorkList[t].entpcourseworklistarray.length *
classWorkList[t].workdatacount)) * classWorkList[t].workdataresultsum)) *
100 100
classWorkList[t].scoingRate = dd.toFixed(0) + '%' classWorkList[t].scoingRate = dd.toFixed(0) + '%'
} else { } else {