From e599e82bc9bd390fb9ec5ce78c27043d74a6d2de Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 23 Mar 2023 13:23:52 +0800
Subject: [PATCH] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE=20=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BD=9C=E4=B8=9Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CheckWork.vue          |  4 +-
 .../drawers/project/ProjectFaceTaskManage.vue | 46 +++----------------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue
index 15d6a061..6aa0d086 100644
--- a/src/components/drawers/CheckWork.vue
+++ b/src/components/drawers/CheckWork.vue
@@ -106,8 +106,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
 
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 8f77d365..7843fb64 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -125,7 +125,7 @@
   <!-- 查看作业抽屉 -->
   <CKWork
     v-model:CWvisible="CWvisible"
-    :workId="props.datasource?.courseId"
+    :workId="homeWorkId"
     :stuId="stuId"
   />
   <ExportHomeWork
@@ -297,43 +297,11 @@ const columns = ref([
     key: "opacation",
     width: 100,
     align: "center",
-    customRender: (text) => {
-      return (
+    customRender: ({record:{workStatus,answerId,examinationScore,studentId}}) =>
         <div style="display:flex;justify-content:center;">
-          {
-            text.record.answerId ?
-              <a
-                class="opa"
-                style="margin-right:12px;"
-                onClick={() => {
-                  showExamAnswer(text);
-                }}>
-                查看答卷
-              </a>
-              : <div
-                  class="opa"
-                  style="margin-right:12px;color:#666">
-                  查看答卷
-                </div>
-          }
-          {
-            text.record.workScore !== -2 ?
-              <a
-                class="opa"
-                onClick={() => {
-                  showCWvisible(text.record.studentId);
-                }}>
-                查看作业
-              </a>
-              : <div
-                class="opa"
-                style="color:#666;">
-                查看作业
-              </div>
-          }
-
-        </div>);
-    }
+            <a class="opa" style={{color:examinationScore?'':'#666',marginRight:'12px'}} onClick={() =>examinationScore && showExamAnswer(answerId)}>查看答卷</a>
+            <a class="opa" style={{color:workStatus?'':'#666'}} onClick={() => workStatus && showCWvisible(studentId)}>查看作业</a>
+        </div>
   },
 ]);
 watch(() => data.value, () => {
@@ -373,9 +341,9 @@ const batchFinish = () => {
 
 const answerDatasource = ref(props.datasource);
 
-const showExamAnswer = (text) => {
+const showExamAnswer = (answerId) => {
   console.log(answerDatasource.value)
-  answerDatasource.value.answerId = String(text.record.answerId);
+  answerDatasource.value.answerId = answerId;
   CAvisible.value = true;
 };