Merge pull request 'zouyf_dev' (#288) from zouyf_dev into main

Reviewed-on: #288

src/renderer/src/api/classTask/index.js

@@ -27,6 +27,15 @@ export function listClassworkdata(query) {
   })
 }
 
+// 新接口---查询classworkdata列表 班级作业列表
+export function listClassworkdataNew(query) {
+  return request({
+    url: '/education/classworkdata/new/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询entpcoursework列表 课程作业列表
 export function listEntpcoursework(query) {
   return request({

src/renderer/src/views/classTask/classTask.vue

@@ -63,7 +63,7 @@
 
 <script setup>
 import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
-import { listByDeadDate, listClassworkdata } from '@/api/classTask'
+import { listByDeadDate, listClassworkdata, listClassworkdataNew } from '@/api/classTask'
 
 import TaskItem from '@/views/classTask/container/task-item.vue'
 // import ItemDialog from '@/views/classTask/container/item-dialog.vue'
@@ -119,7 +119,7 @@ const getData = async () => {
   classWorkList.value = []
   loading.value = true
   // 1、班级列表
-  getClassList()
+  //getClassList()
   // 2、班级作业
   await getClassWorkList()
   // 3、班级学生作业 包含多个班级 
@@ -140,10 +140,11 @@ const getClassList = () => {
  * 2、获取班级作业
  */
 const getClassWorkList = async () => {
-  if(classTaskStore.classListIds.length>0){
+  //if(classTaskStore.classListIds.length>0){
+  {
     // 班级作业数据，包含多个班级 homeworklist
     const response = await listByDeadDate({
-      classidarray: classTaskStore.classListIds.join(','),
+      //classidarray: classTaskStore.classListIds.join(','),
       edituserid: userStore.userId, // 老师的id
       edustage: userStore.edustage, // 学段
       edusubject: userStore.edusubject,//学科
@@ -218,7 +219,7 @@ const getClassWorkList = async () => {
 const getStudentClassWorkData = async() => {
   // const { chapterId } = await useGetHomework(props.bookobj.node)
     // this.entpcourseid = chapterId
-  if(classTaskStore.classListIds.length>0){
+  //if(classTaskStore.classListIds.length>0){
     // listClassworkdataByDeadDate({
     //   edituserid: userStore.userId,   // 老师的id
     //   classids: classTaskStore.classListIds.join(','),
@@ -228,7 +229,21 @@ const getStudentClassWorkData = async() => {
     //   orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
     //   pageSize: 1000,
     // })
+
+    // listClassworkdataNew({
+    //   classworkids: ids,              // 作业id
+    //   edituserid: userStore.userId,   // 老师的id
+    //   edusubject: userStore.edusubject,//学科
+    //   evalStatus: 1,
+    //   pageSize: 1000,
+    // })
+
+    
+  {
     const ids = classWorkList.value.map((item) => item.id).join(',');
+    if (ids == '') {
+      return;
+    }
     listClassworkdata({
       classworkids: ids,
       pageSize: 1000,

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

@@ -349,7 +349,7 @@ const getClassWorkStudentList = (rowId) => {
           // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
           // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
           response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
-          console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
+          //console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
           const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
           var scoingCount = 0
           var feedcount = 0
@@ -362,7 +362,7 @@ const getClassWorkStudentList = (rowId) => {
               }
             }
           }
-          console.log(evalarray, 'evalarray------------------------------------')
+          //console.log(evalarray, 'evalarray------------------------------------')
           if (feedcount > 0) {
             // 多个题目的总得分率: 正确题数/（题目数*100）
             response.rows[i].scoingRate = ((scoingCount / feedcount) * 100).toFixed(0) + '%'

src/renderer/src/views/classTask/container/quizStats.vue

@@ -345,6 +345,7 @@ watchEffect(() => { initData() })
         }
         .t-left{width: 160px;text-align: left;}
         .c-respond{
+          text-align: left;
           .el-tag{margin: 0 5px;}
         }
       }

src/renderer/src/views/classTask/teachClassTask.vue

@@ -341,7 +341,7 @@ const getClassWorkStudentList = (rowId) => {
           // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
           // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
           response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
-          console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
+          //console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
           const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
           var scoingCount = 0
           var feedcount = 0
@@ -354,7 +354,7 @@ const getClassWorkStudentList = (rowId) => {
               }
             }
           }
-          console.log(evalarray, 'evalarray------------------------------------')
+          //console.log(evalarray, 'evalarray------------------------------------')
           if (feedcount > 0) {
             // 多个题目的总得分率: 正确题数/（题目数*100）
             response.rows[i].scoingRate = ((scoingCount / feedcount) * 100).toFixed(0) + '%'
@@ -531,6 +531,7 @@ const workHandle = (type) => {
   classWorkAnalysis.view = type
   const isClose = type != 'quizStats' && !! classWorkActiveData.timerId
   const isOpen = type == 'quizStats' && !classWorkActiveData.timerId
+  // 每次进来都重新调用一次
   if(type == 'quizStats') {
     getWorkFeedList();
   }