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

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

src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue

@@ -61,27 +61,14 @@ const checkList = ref([])// 当前年级对应学科的课程，
 // 获取基础的学科
 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');
-    // 默认读取一个学科
+  })
-    handleUserEduStage(useClassTaskStore().experimentObj.edustage)
+  // 默认读取一个学科
+  handleUserEduStage(useClassTaskStore().experimentObj.edustage)
 }
 // 展示有 实验科目的学科
 const isExpList = (edusubject) => {