From f7a3aa6e538b2b7d1c284cd0d7bf112f2e2e9f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 20 Dec 2024 16:37:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=EF=BC=9A=E5=AD=A6=E7=A7=91=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/selectClass.vue | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue index e539610..0837584 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue @@ -61,14 +61,27 @@ const checkList = ref([])// 当前年级对应学科的课程， // 获取基础的学科 const getSubject = () => { //没有学科则不进行下面的步骤 - if(!userStore.subject) return - listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { - const arr = userStore.subject.split(',') - subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items) +// if(!userStore.subject) return +// listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { +// const arr = userStore.subject.split(',') +// 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'); - }) - // 默认读取一个学科 - handleUserEduStage(useClassTaskStore().experimentObj.edustage) + // 默认读取一个学科 + handleUserEduStage(useClassTaskStore().experimentObj.edustage) } // 展示有 实验科目的学科 const isExpList = (edusubject) => { -- 2.44.0.windows.1 From 7aa75794dc0043f18bb755cf312be77f2ed336ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 20 Dec 2024 17:16:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=EF=BC=9A=E6=89=B9=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/classTask/item-dialog-score.vue | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index 0c90c6c..1e23490 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -709,29 +709,33 @@ const acceptParams = async (params) => { } else { // 学生回答 if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') { - try { - // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入 - 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) => { - if ( - item.name.indexOf('jpg') > -1 || - item.name.indexOf('jpeg') > -1 || - item.name.indexOf('png') > -1 - ) { - teachImageList.value.push(item) - } else { - teachFileList.value.push(item) - } - }) - teacherFeedContentList.value.push(teachWorkFileList) - } + if(params.studentObj.worktype == '常规作业'){ + try { + // 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入 + 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) => { + if ( + item.name.indexOf('jpg') > -1 || + item.name.indexOf('jpeg') > -1 || + item.name.indexOf('png') > -1 + ) { + teachImageList.value.push(item) + } else { + teachFileList.value.push(item) + } + }) + teacherFeedContentList.value.push(teachWorkFileList) + } - } catch (error) { - console.error('Invalid JSON:', error) + } catch (error) { + console.error('Invalid JSON:', error) + } + }else{ + // TODO 科学实验 布置的活动 暂时不在批改中显示 2024-12-20 } params.studentQuizAllList.forEach((item) => { -- 2.44.0.windows.1 From 6b45fa61dd631aa760f4a5ad19163ad4568cc887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Fri, 20 Dec 2024 17:17:35 +0800 Subject: [PATCH 3/3] 1 --- .../views/classTask/container/classTask/item-dialog-score.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue index 1e23490..79a062e 100644 --- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue +++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue @@ -735,7 +735,7 @@ const acceptParams = async (params) => { console.error('Invalid JSON:', error) } }else{ - // TODO 科学实验 布置的活动 暂时不在批改中显示 2024-12-20 + // TODO 科学实验 老师布置的活动 暂时不在批改中显示 2024-12-20 } params.studentQuizAllList.forEach((item) => { -- 2.44.0.windows.1