feat:合并

src/views/projectcenter/TaskAdd.vue

@@ -139,7 +139,16 @@
           </div>
           <!-- 添加作业侧弹窗 -->
           <div>
-            <add-homework v-model:addhomeworkVisible="addhomeworkvisible" />
+            <add-homework 
+              v-model:addhomeworkVisible="addhomeworkvisible" 
+              @changeData="updateTableData"
+              :isLevel=false
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditWorkId="EditWorkId"
+              v-model:projectTaskId="projectTaskId"
+            />
           </div>
           <!-- 添加作业侧弹窗 -->
           <div class="lin"></div>
@@ -153,7 +162,16 @@
           </div>
           <!-- 添加考试侧弹窗 -->
           <div>
-            <add-test v-model:addtestVisible="addtestvisible" />
+            <add-test 
+            v-model:addtestVisible="addtestvisible" 
+            @changeData="updateTableData"
+            :isLevel=false
+            v-model:edit="edit"
+            v-model:projectId="projectId"
+            v-model:chooseStageId="chooseStageId"
+            v-model:EditTestId="EditTestId"
+            v-model:projectTaskId="projectTaskId"
+            />
           </div>
           <!-- 添加考试侧弹窗 -->
           <div class="lin"></div>
@@ -174,6 +192,7 @@
               v-model:chooseStageId="chooseStageId"
               v-model:isLiveEdit="isLiveEdit"
               v-model:EditLiveId="EditLiveId"
+              v-model:projectTaskId="projectTaskId"
             />
           </div>
           <!-- 添加直播侧弹窗 -->
@@ -190,11 +209,13 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
+              :isLevel=false
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:isRefEdit="isRefEdit"
               v-model:EditRefId="EditRefId"
+              v-model:projectTaskId="projectTaskId"
             />
           </div>
           <!-- 添加外链侧弹窗 -->
@@ -293,6 +314,7 @@
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
                 @changeData="updateTableData"
+                @getData="changeVData"
                 v-model:edit="edit"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
@@ -500,7 +522,7 @@
                               margin-right: 25px;
                               cursor: pointer;
                             "
-                            @click="decideType(element.lei, element.courseId)"
+                            @click="decideType(element.lei, element.courseId,element.id)"
                           >
                             编辑
                           </span>
@@ -820,8 +842,8 @@ import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import { updateExamination, deleteExaminationById } from "@/api/indexExam";
-import { updateWorkTaskUsing, deleteWorkTask } from "@/api/indexWork";
+import { deleteExaminationById } from "@/api/indexExam";
+import { deleteWorkTask } from "@/api/indexWork";
 
 const drawercolumns = [
   {
@@ -886,12 +908,15 @@ export default {
         : null,
       chooseStageId: null,
       edit: false,
-      isRefEdit: 1, //外链编辑
-      isLiveEdit: 1, //直播编辑
+      isRefEdit: false, //外链编辑
+      isLiveEdit:false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
       editDiscussId:null,//要编辑的讨论的id
+      EditWorkId:null, // 要编辑的作业id
+      EditTestId: null,// 要编辑的考试id
       EditEvalId:null,
+      projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
           id: 1,
@@ -1043,6 +1068,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
+      voteId:"", //删除投票id
       deleteID: "",
       selectRow: [], //选择行
       curLevel: [], //阶段名称
@@ -1251,7 +1277,6 @@ export default {
                     onClick={() => {
                       state.editonlinevisible = true;
                       console.log(text, "编辑text");
-                      editInvistPath();
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
@@ -1323,48 +1348,20 @@ export default {
 
     // }
 
+    //获取删除id（投票)
+    const changeVData = (data) => {
+      console.log("8989", data);
+      state.voteId = data.voteId;
+    }
     //数据变化
     const updateTableData = (data) => {
       console.log("添加数据", data);
       getTask(data);
     };
-    // 编辑考试
-    const updateTest = (id) => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        examinationDuration: "",
-        examinationEndTime: "",
-        examinationExplain: "",
-        examinationFlag: "",
-        examinationId: id || 0,
-        examinationLimit: "",
-        examinationName: "",
-        examinationPaperId: 0,
-        examinationPaperName: "",
-        examinationStartTime: "",
-        examinationTag: "",
-        passLine: "",
-        questionArrangement: "",
-        scoringModel: "",
-        showAnalysis: "",
-        showAnswers: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      updateExamination(obj)
-        .then((res) => {
-          console.log(res);
-          message.error(`编辑成功`);
-        })
-        .catch(() => {
-          message.error(`编辑失败`);
-        });
-    };
     // 删除考试
     const deleteTest = () => {
       let obj = {
-        examinationId: 0,
+        examinationId: state.deleteID,
       };
       deleteExaminationById(obj)
         .then((res) => {
@@ -1381,7 +1378,7 @@ export default {
     // 删除作业
     const deleteWork = () => {
       let obj = {
-        workId: 0,
+        workId: state.deleteID,
       };
       deleteWorkTask(obj)
         .then((res) => {
@@ -1394,31 +1391,6 @@ export default {
           console.log(err);
         });
     };
-    // 编辑作业
-    const updateWork = () => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        submitEndTime: "",
-        submitStartTime: "",
-        updateTime: "",
-        updateUser: 0,
-        workEnclosureAddress: "",
-        workFlag: "",
-        workId: 0,
-        workName: "",
-        workRequirement: "",
-        workTag: "",
-      };
-
-      updateWorkTaskUsing(obj)
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error(`编辑失败${err}`);
-        });
-    };
 
     //删除直播
     const deleteLiveBroadcast = () => {
@@ -1626,7 +1598,8 @@ export default {
       api
         .deleteTask(obj)
         .then((res) => {
-          console.log(res);
+          console.log(res,'gggggggggggggggg');
+          // deleteVoteText();
         })
         .catch((err) => {
           console.log(err);
@@ -1636,7 +1609,7 @@ export default {
     //删除投票信息
     const deleteVoteText = () => {
       let obj = {
-        voteId: "",
+        voteId: state.voteId,
       };
       apivote
         .deleteVoteMessage(obj)
@@ -1783,28 +1756,37 @@ export default {
     const showDrawerAddCase = () => {
       state.addcasevisible = true;
     };
-    const showDrawerAddHomework = () => {
+    const showDrawerAddHomework = (id,eleId) => {
+      state.EditWorkId = id
+      state.projectTaskId = eleId;
       state.addhomeworkvisible = true;
     };
-    const showDrawerAddTest = () => {
+    const showDrawerAddTest = (id,eleId) => {
+      state.EditTestId = id
+      state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
     const showDrawerAddLive = () => {
       state.addlivevisible = true;
     };
-    const showDrawerAddRef = () => {
+    const showDrawerAddRef = (id,eleId) => {
+      state.EditRefId = id
+      state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
     const showDrawerAddDiscuss = () => {
       state.adddiscussvisible = true;
     };
     //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id)=>{
+    const showEditAddDiscuss = (id,eleId)=>{
       state.editDiscussId = id
+      state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     }
-    const showDrawerAddActive = () => {
+    const showDrawerAddActive = (id,eleId) => {
       state.addactivevisible = true;
+      state.editActivityId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerAddEval = () => {
       state.addevalvisible = true;
@@ -1902,7 +1884,7 @@ export default {
     //打开编辑外链的弹窗
     const showEditRefDrawer = (id) => {
       state.addrefvisible = true;
-      state.isRefEdit = 2;
+      state.isRefEdit = true;
       state.EditRefId = id;
     };
     //打开编辑直播的弹窗
@@ -1911,31 +1893,37 @@ export default {
       state.isLiveEdit = 2;
       state.EditLiveId = id;
     };
-    //打开测评外链的弹窗
-    const showEditEvalDrawer = (id) => {
+    //打开测评的弹窗
+    const showEditEvalDrawer = (id,eleId) => {
       console.log('222222222222222222222',id);
       state.addevalvisible = true;
+      state.projectTaskId = eleId;
       state.EditRefId = id;
+      console.log(state.EditRefId);
     };
     //编辑的按钮
-    const decideType = (type, id) => {
+    const decideType = (type, id,eleId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);
       } 
       else if (type == "直播") {
-        showEditLiveDrawer(id);
+        showEditLiveDrawer(id,eleId);
       } else if (type == "测评") {
-        showDrawerAddEval(id);
+        showEditEvalDrawer(id,eleId)
       } else if (type == "评估") {
-        showDrawerAddInvist(id);
+        showDrawerAddInvist(id,eleId);
       } else if (type == "投票") {
-        showDrawerAddVote(id);
+        showDrawerAddVote(id,eleId);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id);
+        showEditAddDiscuss(id,eleId);
       } else if (type == "活动") {
-        showDrawerAddActive(id);
+        showDrawerAddActive(id,eleId);
+      }else if (type == "作业") {
+        showDrawerAddHomework(id,eleId);
+      }else if (type == "考试") {
+        showDrawerAddTest(id,eleId);
       }
     }
     return {
@@ -1988,14 +1976,13 @@ export default {
       deleteTask,
       editStage,
       updateTableData,
+      changeVData,
       changeRow,
       selectRowAll,
       changeCourseType,
       getStageData,
       moveTask,
       deleteTaskAll,
-      updateTest,
-      updateWork,
       deleteTest,
       deleteWork,
       decideType,