zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge pull request 'baigl' (#167) from baigl into main 

Reviewed-on: #167
This commit is contained in:
baigl 2024-12-20 17:19:17 +08:00
parent 4095390f45 ea5ed4b6ac
commit 94e23c3d69
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,29 +709,33 @@ const acceptParams = async (params) => {
} else { } else {
// 学生回答 // 学生回答
if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') { if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') {
try { if(params.studentObj.worktype == '常规作业'){
// 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入 try {
const res = await getClassworkdata(params.studentObj.id); // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入
if(res.data.datacontent != ''){ const res = await getClassworkdata(params.studentObj.id);
const teachWorkFileList = JSON.parse(res.data.datacontent); if(res.data.datacontent != ''){
console.log(teachWorkFileList, '老师filelist-------------') const teachWorkFileList = JSON.parse(res.data.datacontent);
teachWorkFileList && console.log(teachWorkFileList, '老师filelist-------------')
teachWorkFileList.forEach((item) => { teachWorkFileList &&
if ( teachWorkFileList.forEach((item) => {
item.name.indexOf('jpg') > -1 || if (
item.name.indexOf('jpeg') > -1 || item.name.indexOf('jpg') > -1 ||
item.name.indexOf('png') > -1 item.name.indexOf('jpeg') > -1 ||
) { item.name.indexOf('png') > -1
teachImageList.value.push(item) ) {
} else { teachImageList.value.push(item)
teachFileList.value.push(item) } else {
} teachFileList.value.push(item)
}) }
teacherFeedContentList.value.push(teachWorkFileList) })
} teacherFeedContentList.value.push(teachWorkFileList)
}
} catch (error) { } catch (error) {
console.error('Invalid JSON:', error) console.error('Invalid JSON:', error)
}
}else{
// TODO 科学实验 老师布置的活动 暂时不在批改中显示 2024-12-20
} }
params.studentQuizAllList.forEach((item) => { params.studentQuizAllList.forEach((item) => {

27
src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
View File

@ -61,14 +61,27 @@ const checkList = ref([])// 当前年级对应学科的课程，
// 获取基础的学科 // 获取基础的学科
const getSubject = () => { const getSubject = () => {
//没有学科则不进行下面的步骤 //没有学科则不进行下面的步骤
if(!userStore.subject) return // if(!userStore.subject) return
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { // listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
const arr = userStore.subject.split(',') // const arr = userStore.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items) // subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
// console.log(subjectList,'subjectList');
// })
//这里获取死数据 学科list
const edustageList = ['小学','初中','高中'];
const subList = ['数学','物理','化学','生物','科学'];
edustageList.forEach((item) => {
subList.forEach((subItems) => {
subjectList.value.push({
edustage: item,
edusubject: subItems,
itemtitle: subItems
})
})
})
console.log(subjectList,'subjectList'); console.log(subjectList,'subjectList');
}) // 默认读取一个学科
// 默认读取一个学科 handleUserEduStage(useClassTaskStore().experimentObj.edustage)
handleUserEduStage(useClassTaskStore().experimentObj.edustage)
} }
// 展示有 实验科目的学科 // 展示有 实验科目的学科
const isExpList = (edusubject) => { const isExpList = (edusubject) => {