From f5adb9f4919f4cbe6c718a5bfce1b46766a0bccb Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 22 Mar 2023 11:56:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E7=AE=A1=E7=90=86-=E6=9F=A5=E7=9C=8B=E7=AD=94?=
 =?UTF-8?q?=E5=8D=B7-=E6=9F=A5=E7=9C=8B=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectFaceTaskManage.vue | 69 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 2ada1820..c9c504fb 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -120,6 +120,12 @@
     </div>
   </a-drawer>
   <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
+  <!-- 查看作业抽屉 -->
+  <CKWork
+    v-model:CWvisible="CWvisible"
+    :workId="props.datasource?.courseId"
+    :stuId="stuId"
+  />
   <ExportHomeWork
     v-model:exportHomeWorkV="exportHomeWorkV"
     :downloadUrl="downloadUrl"
@@ -138,10 +144,12 @@ import CommonImport from "@/components/common/CommonImport";
 import CheckAnsware from "../CheckAnsware.vue";
 import {batchSendMessage} from "@/api/index1";
 import ExportHomeWork from "@/components/Modals/ExportHomeWork.vue";
+import CKWork from "../CheckWork.vue";
 
 const coursePlanIndex = ref(0);
 const tableRef = ref();
 const CAvisible = ref(false);
+const CWvisible = ref(false);
 const exportHomeWorkV = ref(false);
 const downloadUrl = ref();
 const emit = defineEmits([]);
@@ -193,6 +201,7 @@ const offcoursePlanId = computed(() => data.value[coursePlanIndex.value]?.id ||
 const homeWorkId = computed(() => data.value[coursePlanIndex.value]?.homeWorkId || "");
 const infoId = computed(() => props.type === 1 ? props.datasource.projectId : props.datasource.routerId);
 const scoreTemplateUrl = ref(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=0&type=3&pid=${offcoursePlanId.value}&thirdType=3`);
+const stuId = ref("");
 const columns = ref([
   {
     title: "工号",
@@ -284,9 +293,53 @@ const columns = ref([
     className: "h",
     dataIndex: "opacation",
     key: "opacation",
-    width: 50,
+    width: 100,
     align: "center",
-    customRender: (text) => <div class="opa" onClick={() => showExamAnswer(text)}>{data.value[coursePlanIndex.value]?.answerId ? "查看答卷" : ""}</div>
+    customRender: (text) => {
+      return (
+        <div style="display:flex;justify-content:center;">
+          <a 
+            class="opa" 
+            style="margin-right:12px;" 
+            onClick={() => {
+              showExamAnswer(text)
+            }}>
+            { text.record.answerId?"查看答卷":""}
+          </a>
+          {
+            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==1?
+            <a 
+              class="opa" 
+              onClick={() => {
+                showCWvisible(text.record.studentId)
+              }}>
+              查看作业
+            </a>
+            :<div 
+              class="opa" 
+              style="color:#666;">
+              查看作业
+            </div>
+          }
+          
+        </div>)
+    }
   },
 ]);
 watch(() => data.value.length, () => {
@@ -328,6 +381,11 @@ const showExamAnswer = () => {
   CAvisible.value = true;
 };
 
+const showCWvisible = (id) => {
+  stuId.value = id;
+  CWvisible.value = true;
+}
+
 const searchTaskList = () => tableRef.value.fetch();
 
 const exportTaskData = () => window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=3&pid=${offcoursePlanId.value}&thirdType=2`);
@@ -375,7 +433,12 @@ function resetStudentPage() {
     padding: 0px;
   }
 }
-
+.RouterFaceStu {
+  .ant-drawer-content-wrapper{
+    min-width: 1200px !important;
+    width: 1200px !important;
+  }
+}
 .CopyModal {
   .ant-modal {
     width: 424px !important;

From 535fb1e4cac5a902051dafd392b3f69db2ede039 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 22 Mar 2023 12:31:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E5=8F=91=E5=B8=83=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 2 +-
 src/views/projectcenter/TaskAdd.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 199544b8..a3b65f29 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -288,8 +288,8 @@
                             开课
                           </span>
                           <span
+                            v-if="!element.routerTaskId"
                             style="color: #4ea6ff;cursor: pointer;"
-                            :style="{marginRight:element.type===2?`6px`:`25px`,marginLeft:element.type===2?`6px`:`0px`}"
                             @click="editTaskForType(element,index)">
                             编辑
                           </span>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index a31e86fb..97b3cf2c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -258,8 +258,8 @@
                               开课
                             </span>
 								            <span 
+                              v-if="!element.projectTaskId"
                               style="color: #4ea6ff;cursor: pointer;" 
-                              :style="{marginRight:element.type==2?6+'px':25+'px',marginLeft:element.type==2?6+'px':0+'px'}"  
                               @click="editTaskForType(element,index)">
 															编辑
 														</span>