From c06fad18ee62f7ecdac9eaac5403efa9a5768f97 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 24 Mar 2023 18:08:14 +0800
Subject: [PATCH 1/2] fix

---
 src/components/drawers/CheckAnsware.vue                  | 1 +
 src/components/drawers/project/ProjectFaceTaskManage.vue | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/CheckAnsware.vue b/src/components/drawers/CheckAnsware.vue
index 4290ae04..5c75b541 100644
--- a/src/components/drawers/CheckAnsware.vue
+++ b/src/components/drawers/CheckAnsware.vue
@@ -147,6 +147,7 @@ export default {
             console.log(bool);
             if(bool == true) {
                 console.log(props.datasource)
+                console.log(props.answerId?props.answerId:props.datasource.answerId)
             }
         }
        const getQue = () => {
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index e90e2be4..bf47a3a3 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -121,7 +121,7 @@
       </div>
     </div>
   </a-drawer>
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="answerDatasource" :answerId="answerId"/>
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" :answerId="answerId"/>
   <!-- 查看作业抽屉 -->
   <CKWork
     v-model:CWvisible="CWvisible"
@@ -339,12 +339,9 @@ const batchFinish = () => {
   });
 };
 
-const answerDatasource = ref(props.datasource);
 const answerId = ref('');
-const showExamAnswer = (answerId) => {
-  console.log(answerDatasource.value,answerId)
-  answerDatasource.value.answerId = answerId;
-  answerId.value = answerId;
+const showExamAnswer = (id) => {
+  answerId.value = id;
   CAvisible.value = true;
 };
 

From 5371914b02e49ad74e510ee79fe2000745a01141 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 24 Mar 2023 19:13:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E4=BC=A0=E9=80=92=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d6fb0bc1..741033e5 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4296,7 +4296,6 @@ export default defineComponent({
       //      ]
       //      commonExport(heads,list,"课程导出")
       // })
-
       window.open(
         `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
           state.currentPage1
@@ -4306,8 +4305,8 @@ export default defineComponent({
           state.projectName ? state.projectName : ""
         }&name=${state.name ? state.name : ""}&createName=${
           state.createName ? state.createName : ""
-        }&endTime=${endTime ? endTime : ""}&beginTime=${
-          startTime ? startTime : ""
+        }&endTime=${endTime ? dayjs(new Date(state.projectTime[1].$d)).format('YYYY-MM-DD') : ""}&beginTime=${
+          startTime ? dayjs(new Date(state.projectTime[0].$d)).format('YYYY-MM-DD') : ""
         }&type=3`
       );