[作业批改] - 重新优化常规作业逻辑
This commit is contained in:
parent
5b1986afaf
commit
d9ddb1982b
|
@ -18,6 +18,14 @@ export function listClassworkdataByDeadDate(query) {
|
|||
})
|
||||
}
|
||||
|
||||
// 查询classworkdata详细
|
||||
export function getClassworkdata(id) {
|
||||
return request({
|
||||
url: '/education/classworkdata/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 查询classworkdata列表 班级作业列表
|
||||
export function listClassworkdata(query) {
|
||||
return request({
|
||||
|
|
|
@ -460,12 +460,13 @@ import useUserStore from '@/store/modules/user'
|
|||
import { ref, reactive } from 'vue'
|
||||
// import { Plus } from '@element-plus/icons-vue'
|
||||
import { ElMessageBox, ElMessage } from 'element-plus'
|
||||
import { updateClassworkeval, updateClassworkdata } from '@/api/classTask'
|
||||
import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask'
|
||||
import { getTimeDate } from '@/utils/date'
|
||||
import ReFilePreview from '@/components/refile-preview/index.vue'
|
||||
import { quizStrToList } from '@/utils/comm';
|
||||
|
||||
|
||||
|
||||
const userStore = useUserStore()
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
|
@ -644,7 +645,7 @@ const selectScore = (score) => {
|
|||
}
|
||||
|
||||
// 接收父组件传过来的参数
|
||||
const acceptParams = (params) => {
|
||||
const acceptParams = async (params) => {
|
||||
console.log(params)
|
||||
console.log(dialogProps, 'dialogProps')
|
||||
// 先重置一下 参数
|
||||
|
@ -709,8 +710,9 @@ const acceptParams = (params) => {
|
|||
if (params.studentObj.worktype == '常规作业') {
|
||||
try {
|
||||
// 老师布置的附件 datacontent TODO:常规作业、其他类型还未接入
|
||||
if (params.studentObj.datacontent != '') {
|
||||
const teachWorkFileList = JSON.parse(params.studentObj.datacontent)
|
||||
const res = await getClassworkdata(params.studentObj.id);
|
||||
if(res.data.datacontent != ''){
|
||||
const teachWorkFileList = JSON.parse(res.data.datacontent);
|
||||
console.log(teachWorkFileList, '老师filelist-------------')
|
||||
teachWorkFileList &&
|
||||
teachWorkFileList.forEach((item) => {
|
||||
|
@ -727,7 +729,6 @@ const acceptParams = (params) => {
|
|||
teacherFeedContentList.value.push(teachWorkFileList)
|
||||
}
|
||||
|
||||
dialogProps.value.studentObj.datacontent = dialogProps.value.studentObj.datacontent
|
||||
} catch (error) {
|
||||
console.error('Invalid JSON:', error)
|
||||
}
|
||||
|
|
|
@ -418,15 +418,15 @@ const getStudentClassWorkDataDetail = (row) => {
|
|||
wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
|
||||
|
||||
// 参考答案 去除下html标签
|
||||
wevalres.rows[w].rightanswer =
|
||||
wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
|
||||
? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
|
||||
: wevalres.rows[w].rightanswer
|
||||
// 学生回答 去除下html标签
|
||||
wevalres.rows[w].feedcontent =
|
||||
wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
|
||||
? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
|
||||
: wevalres.rows[w].feedcontent
|
||||
// wevalres.rows[w].rightanswer =
|
||||
// wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
|
||||
// ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
|
||||
// : wevalres.rows[w].rightanswer
|
||||
// // 学生回答 去除下html标签
|
||||
// wevalres.rows[w].feedcontent =
|
||||
// wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
|
||||
// ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
|
||||
// : wevalres.rows[w].feedcontent
|
||||
|
||||
if (classWorkAnalysis.row.worktype == '常规作业') {
|
||||
wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
|
||||
|
|
|
@ -410,15 +410,15 @@ const getStudentClassWorkDataDetail = (row) => {
|
|||
wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
|
||||
|
||||
// 参考答案 去除下html标签
|
||||
wevalres.rows[w].rightanswer =
|
||||
wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
|
||||
? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
|
||||
: wevalres.rows[w].rightanswer
|
||||
// 学生回答 去除下html标签
|
||||
wevalres.rows[w].feedcontent =
|
||||
wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
|
||||
? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
|
||||
: wevalres.rows[w].feedcontent
|
||||
// wevalres.rows[w].rightanswer =
|
||||
// wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
|
||||
// ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
|
||||
// : wevalres.rows[w].rightanswer
|
||||
// // 学生回答 去除下html标签
|
||||
// wevalres.rows[w].feedcontent =
|
||||
// wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
|
||||
// ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
|
||||
// : wevalres.rows[w].feedcontent
|
||||
|
||||
if (classWorkAnalysis.row.worktype == '常规作业') {
|
||||
wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
|
||||
|
|
Loading…
Reference in New Issue