Merge remote-tracking branch 'origin/develop' into develop

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 = () => {

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;
 };
 

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`
       );