From ec533355d0bd37cc886df0ec12913b9018595be5 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 14 Feb 2023 00:39:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1ID=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue   |  1 +
 src/components/drawers/AddTest.vue        |  8 +-
 src/views/learningpath/LevelAddDetail.vue | 97 +++++++++++++----------
 3 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 7133c1a9..5f0c2f22 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -794,6 +794,7 @@ export default {
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 2,
+          id: props.taskIdDraft
         })
           .then(() => {
             //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index fa8df3fc..d080b9c2 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -427,6 +427,10 @@ export default {
       type: Number,
       default: null,
     },
+    taskCourseID: {
+      type: Number,
+      default: null,
+    },
     isactive: {
       type: Number,
       default: null,
@@ -667,7 +671,7 @@ export default {
           state.test.targetId = 0;
             state.test.type = 0;
             state.test.chapterId=0;
-            state.test.id = props.taskIdDraft;
+            state.test.id = props.taskCourseID;
             console.log("props.offCourseId",props.offCourseId);
             if (props.faceLevel && props.offCourseId > 0) {
               state.test.targetId = props.offCourseId;
@@ -755,7 +759,7 @@ export default {
             examinationName:state.test1.externalName,
             examinationExplain:state.test1.externalExplain,
             source:state.test1.source,
-            id: props.taskIdDraft
+            id: props.EditTestId
           }
           updateExternalExam(obj)
               .then(async (res) => {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 0f735dc8..bcc1e147 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -204,7 +204,7 @@
                 v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
                 v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId"
-                :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
+                :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <!-- 添加在线侧弹窗 -->
             <div class="lin"></div>
@@ -219,7 +219,7 @@
             <!-- 添加面授 -->
             <add-faceteach @changeData="updateTableData" v-model:edit="edit" v-model:isactive="isactive"
               v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
-              v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
+              v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             <!-- 添加面授 -->
             <div class="lin"></div>
           </div>
@@ -236,7 +236,7 @@
                 v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
                 v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId"
-                :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
+                :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <!-- 添加案例侧弹窗 -->
             <div class="lin"></div>
@@ -253,7 +253,7 @@
               <add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="isLevel"
                 @changeData="updateTableData" v-model:isactive="isactive" v-model:edit="edit"
                 v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
-                v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -269,7 +269,7 @@
               <add-test v-model:addtestVisible="addtestvisible" :isLevel="isLevel" @changeData="updateTableData"
                 v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId"
-                v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -283,7 +283,7 @@
             <div>
               <add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
                 v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
-                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -297,7 +297,7 @@
             <div>
               <add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
                 v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
-                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -313,7 +313,7 @@
               <add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData"
                 :isLevel="isLevel" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
-                v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -328,7 +328,7 @@
               <add-active v-model:addactiveVisible="addactivevisible" :isLevel="isLevel" v-model:edit="edit"
                 v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
-                v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" />
+                v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
             </div>
             <div class="lin"></div>
           </div>
@@ -344,7 +344,7 @@
                   v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
                   v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId"
-                  :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
+                  :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
               </div>
               <!-- 添加测评侧弹窗 -->
             </div>
@@ -361,7 +361,7 @@
                 <add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="isLevel" @changeData="updateTableData"
                   v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
                   v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId"
-                  v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
+                  v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
               </div>
               <!-- 添加评估侧弹窗 -->
             </div>
@@ -379,7 +379,7 @@
                 <add-vote v-model:addvoteVisible="addvotevisible" :isLevel="isLevel" @changeData="updateTableData"
                   v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
                   v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId"
-                  v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
+                  v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
               </div>
 
             </div>
@@ -396,7 +396,7 @@
                 <add-project v-model:addprojvisible="addprojvisible" :isLevel="isLevel" @changeData="updateTableData"
                   v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
                   v-model:chooseStageId="chooseStageId" v-model:EditProjectId="EditProjectId"
-                  v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" />
+                  v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft"  v-model:taskCourseID="taskCourseID" />
               </div>
             </div>
           </div>
@@ -550,7 +550,8 @@
                                 element.lei,
                                 element.courseId,
                                 element.id,
-                                element.routerTaskId
+                                element.routerTaskId,
+                                element.courseId
                               )">
                             编辑
                           </span>
@@ -958,6 +959,7 @@ export default {
       EditProjectId: "",
       routerTaskId: "",
       taskIdDraft: "",
+      taskCourseID: "",
       chapterId: "",
       stageId: "",
       cC: false,
@@ -1179,95 +1181,108 @@ export default {
     }
 
     //在线抽屉
-    const showDrawerAddOnline = (id, eleId, routerTaskId) => {
+    const showDrawerAddOnline = (id, eleId, routerTaskId, courseId) => {
       state.addonlinevisible = true;
       state.EditOnlineId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //面授抽屉
-    const showAddface = (id, eleId, routerTaskId) => {
+    const showAddface = (id, eleId, routerTaskId, courseId) => {
       state.addfaceteachVisible = true;
       state.EditFaceId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //案例抽屉
-    const showDrawerAddCase = (id, eleId, routerTaskId) => {
+    const showDrawerAddCase = (id, eleId, routerTaskId, courseId) => {
       state.addcasevisible = true;
       state.EditCaseId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     // 作业抽屉
-    const showDrawerAddHomework = (id, eleId, routerTaskId) => {
+    const showDrawerAddHomework = (id, eleId, routerTaskId, courseId) => {
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //考试抽屉
-    const showDrawerAddTest = (id, eleId, routerTaskId) => {
+    const showDrawerAddTest = (id, eleId, routerTaskId, courseId) => {
       state.addtestvisible = true;
       state.EditTestId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //测试抽屉
-    const showDrawerAddEval = (id, eleId, routerTaskId) => {
+    const showDrawerAddEval = (id, eleId, routerTaskId, courseId) => {
       state.addevalvisible = true;
       state.EditEvalId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //评估抽屉
-    const showDrawerAddInvist = (id, eleId, routerTaskId) => {
+    const showDrawerAddInvist = (id, eleId, routerTaskId, courseId) => {
       state.addinvistvisible = true;
       state.routerTaskId = routerTaskId;
       state.EditInvistId = id;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //投票抽屉
-    const showDrawerAddVote = (id, eleId, routerTaskId) => {
+    const showDrawerAddVote = (id, eleId, routerTaskId, courseId) => {
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //直播抽屉
-    const showDrawerAddLive = (id, eleId, routerTaskId) => {
+    const showDrawerAddLive = (id, eleId, routerTaskId, courseId) => {
       state.addlivevisible = true;
       state.EditLiveId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //外链抽屉
-    const showDrawerAddRef = (id, eleId, routerTaskId) => {
+    const showDrawerAddRef = (id, eleId, routerTaskId, courseId) => {
       state.addrefvisible = true;
       state.EditRefId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //讨论抽屉
-    const showDrawerAddDiscuss = (id, eleId, routerTaskId) => {
+    const showDrawerAddDiscuss = (id, eleId, routerTaskId, courseId) => {
       state.adddiscussvisible = true;
       state.EditDiscussId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //活动抽屉
-    const showDrawerAddActive = (id, eleId, routerTaskId) => {
+    const showDrawerAddActive = (id, eleId, routerTaskId, courseId) => {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //打开项目抽屉
-    const showDrawerAddProj = (id, eleId, routerTaskId) => {
+    const showDrawerAddProj = (id, eleId, routerTaskId, courseId) => {
       state.addprojvisible = true;
       state.EditProjectId = id;
       state.routerTaskId = routerTaskId;
       state.taskIdDraft = eleId;
+      state.taskCourseID = courseId;
     };
     //tableData数据赋值方法
     const dataAssignment = (id) => {
@@ -1689,35 +1704,35 @@ export default {
       }
     };
     //编辑的按钮
-    const decideType = (type, id, eleId, routerTaskId) => {
+    const decideType = (type, id, eleId, routerTaskId, courseId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showDrawerAddRef(id, eleId, routerTaskId);
+        showDrawerAddRef(id, eleId, routerTaskId, courseId);
       } else if (type == "直播") {
-        showDrawerAddLive(id, eleId, routerTaskId);
+        showDrawerAddLive(id, eleId, routerTaskId, courseId);
       } else if (type == "作业") {
-        showDrawerAddHomework(id, eleId, routerTaskId);
+        showDrawerAddHomework(id, eleId, routerTaskId, courseId);
       } else if (type == "考试") {
-        showDrawerAddTest(id, eleId, routerTaskId);
+        showDrawerAddTest(id, eleId, routerTaskId, courseId);
       } else if (type == "讨论") {
-        showDrawerAddDiscuss(id, eleId, routerTaskId);
+        showDrawerAddDiscuss(id, eleId, routerTaskId, courseId);
       } else if (type == "活动") {
-        showDrawerAddActive(id, eleId, routerTaskId);
+        showDrawerAddActive(id, eleId, routerTaskId, courseId);
       } else if (type == "测评") {
-        showDrawerAddEval(id, eleId, routerTaskId);
+        showDrawerAddEval(id, eleId, routerTaskId, courseId);
       } else if (type == "评估") {
-        showDrawerAddInvist(id, eleId, routerTaskId);
+        showDrawerAddInvist(id, eleId, routerTaskId, courseId);
       } else if (type == "投票") {
-        showDrawerAddVote(id, eleId, routerTaskId);
+        showDrawerAddVote(id, eleId, routerTaskId, courseId);
       } else if (type == "项目") {
-        showDrawerAddProj(id, eleId, routerTaskId);
+        showDrawerAddProj(id, eleId, routerTaskId, courseId);
       } else if (type == "在线") {
-        showDrawerAddOnline(id, eleId, routerTaskId);
+        showDrawerAddOnline(id, eleId, routerTaskId, courseId);
       } else if (type == "案例") {
-        showDrawerAddCase(id, eleId, routerTaskId);
+        showDrawerAddCase(id, eleId, routerTaskId, courseId);
       } else if (type == "面授") {
-        showAddface(id, eleId, routerTaskId);
+        showAddface(id, eleId, routerTaskId, courseId);
       }
     };