From 81dd59f564ea9fde89662ea04a3bcf461665d608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Fri, 27 Sep 2024 16:16:55 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9]=20-=20?=
 =?UTF-8?q?=E7=94=B1=E5=8E=9F=E6=9D=A5=E7=8F=AD=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E7=94=A8=E6=88=B7id=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/classTask/index.js       |  9 +++++++
 .../src/views/classTask/classTask.vue         | 25 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/api/classTask/index.js b/src/renderer/src/api/classTask/index.js
index a738cb0..56f662d 100644
--- a/src/renderer/src/api/classTask/index.js
+++ b/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({
diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index 93d1970..8247aed 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/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,