feat:合并

src/views/projectcenter/TaskAdd.vue

@@ -139,10 +139,10 @@
           </div>
           <!-- 添加作业侧弹窗 -->
           <div>
-            <add-homework 
-              v-model:addhomeworkVisible="addhomeworkvisible" 
+            <add-homework
+              v-model:addhomeworkVisible="addhomeworkvisible"
               @changeData="updateTableData"
-              :isLevel=false
+              :isLevel="false"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -162,15 +162,15 @@
           </div>
           <!-- 添加考试侧弹窗 -->
           <div>
-            <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"
+            <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>
           <!-- 添加考试侧弹窗 -->
@@ -209,7 +209,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel=false
+              :isLevel="false"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -525,7 +525,13 @@
                               margin-right: 25px;
                               cursor: pointer;
                             "
-                            @click="decideType(element.lei, element.courseId,element.id)"
+                            @click="
+                              decideType(
+                                element.lei,
+                                element.courseId,
+                                element.id
+                              )
+                            "
                           >
                             编辑
                           </span>
@@ -778,42 +784,42 @@
     </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
-        style="padding: 0"
-        :closable="sh"
-        v-model:visible="visiblene"
-        :footer="null"
-        centered="true"
-        wrapClassName="changeModal"
-      >
-        <div class="con">
-          <div class="header">
-            <div class="inhe">
-              <div class="mod"></div>
-              <div class="tz">选择任务移动到阶段</div>
+      style="padding: 0"
+      :closable="sh"
+      v-model:visible="visiblene"
+      :footer="null"
+      centered="true"
+      wrapClassName="changeModal"
+    >
+      <div class="con">
+        <div class="header">
+          <div class="inhe">
+            <div class="mod"></div>
+            <div class="tz">选择任务移动到阶段</div>
+          </div>
+        </div>
+        <div class="mid">
+          <div class="inher">
+            <div class="cur">已选中{{ selectRow.length }}个任务</div>
+            <div class="select">
+              <a-select
+                v-model:value="curLevel"
+                style="width: 100%"
+                placeholder="请选择关卡"
+                :options="projectNameList4"
+                @change="selectProjectName4"
+                allowClear
+                showSearch
+              ></a-select>
+            </div>
+            <div class="btn">
+              <button class="sameb btn1" @click="closeChangeModal">取消</button>
+              <button class="sameb btn2" @click="moveTask">确定</button>
             </div>
           </div>
-          <div class="mid">
-            <div class="inher">
-              <div class="cur">已选中{{selectRow.length}}个任务</div>
-              <div class="select">
-                <a-select
-                  v-model:value="curLevel"
-                  style="width: 100%"
-                  placeholder="请选择关卡"
-                  :options="projectNameList4"
-                  @change="selectProjectName4"
-                  allowClear
-                  showSearch
-                ></a-select>
-              </div>
-              <div class="btn">
-                <button class="sameb btn1" @click="closeChangeModal">取消</button>
-                <button class="sameb btn2" @click="moveTask">确定</button>
-              </div>
-            </div>
-          </div>
-        </div></a-modal
-      >
+        </div>
+      </div></a-modal
+    >
   </div>
 </template>
 
@@ -911,8 +917,10 @@ export default {
         : null,
       chooseStageId: null,
       edit: false,
+      // isRefEdit: 1, //外链编辑
+      // isLiveEdit: 1, //直播编辑
       isRefEdit: false, //外链编辑
-      isLiveEdit:false, //直播编辑
+      isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
       editDiscussId:null,//要编辑的讨论的id
@@ -1060,7 +1068,7 @@ export default {
       selectedRowKeys: [],
       valuesname: "",
       valuesnotice: "",
-      visiblene: false,//移动任务弹窗
+      visiblene: false, //移动任务弹窗
       confirmModal: false, //确认添加阶段弹窗
       cC: false,
       cancelModal: false, //确认取消阶段弹窗
@@ -1072,7 +1080,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
-      voteId:"", //删除投票id
+      voteId: "", //删除投票id
       deleteID: "",
       selectRow: [], //选择行
       curLevel: [], //阶段名称
@@ -1320,7 +1328,7 @@ export default {
             if (leng > 0) {
               //获取任务列表
               let arr = res.data.data.stageList[0].taskList;
-              console.log('任务列表',arr)
+              console.log("任务列表", arr);
               getTableData(arr);
             }
 
@@ -1329,10 +1337,10 @@ export default {
             //console.log(stagearr, 111111);
             if (stagearr.length > 0) {
               getStageData(stagearr);
-              stagearr.map(value => {
+              stagearr.map((value) => {
                 console.log(value);
                 arrlist.push();
-              })
+              });
             }
             //给阶段id赋初始值
             state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
@@ -1356,7 +1364,7 @@ export default {
     const changeVData = (data) => {
       console.log("8989", data);
       state.voteId = data.voteId;
-    }
+    };
     //数据变化
     const updateTableData = (data) => {
       console.log("添加数据", data);
@@ -1543,7 +1551,6 @@ export default {
         });
     };
 
-
     //删除评估测试
     const deleteInvistText = () => {
       let obj = {
@@ -1602,7 +1609,7 @@ export default {
       api
         .deleteTask(obj)
         .then((res) => {
-          console.log(res,'gggggggggggggggg');
+          console.log(res, "gggggggggggggggg");
           // deleteVoteText();
         })
         .catch((err) => {
@@ -1663,7 +1670,7 @@ export default {
     };
     const showChangeModal = () => {
       state.visiblene = true;
-    }
+    };
     const closeChangeModal = () => {
       state.visiblene = false;
     };
@@ -1760,21 +1767,21 @@ export default {
     const showDrawerAddCase = () => {
       state.addcasevisible = true;
     };
-    const showDrawerAddHomework = (id,eleId) => {
-      state.EditWorkId = id
+    const showDrawerAddHomework = (id, eleId) => {
+      state.EditWorkId = id;
       state.projectTaskId = eleId;
       state.addhomeworkvisible = true;
     };
-    const showDrawerAddTest = (id,eleId) => {
-      state.EditTestId = id
+    const showDrawerAddTest = (id, eleId) => {
+      state.EditTestId = id;
       state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
     const showDrawerAddLive = () => {
       state.addlivevisible = true;
     };
-    const showDrawerAddRef = (id,eleId) => {
-      state.EditRefId = id
+    const showDrawerAddRef = (id, eleId) => {
+      state.EditRefId = id;
       state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
@@ -1782,12 +1789,12 @@ export default {
       state.adddiscussvisible = true;
     };
     //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id,eleId)=>{
-      state.editDiscussId = id
+    const showEditAddDiscuss = (id, eleId) => {
+      state.editDiscussId = id;
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
-    }
-    const showDrawerAddActive = (id,eleId) => {
+    };
+    const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.editActivityId = id;
       state.projectTaskId = eleId;
@@ -1886,10 +1893,11 @@ export default {
       console.log("任务id", id);
     };
     //打开编辑外链的弹窗
-    const showEditRefDrawer = (id) => {
+    const showEditRefDrawer = (id, eleId) => {
       state.addrefvisible = true;
       state.isRefEdit = true;
       state.EditRefId = id;
+      state.projectTaskId = eleId;
     };
     //打开编辑直播的弹窗
     const showEditLiveDrawer = (id) => {
@@ -1898,38 +1906,37 @@ export default {
       state.EditLiveId = id;
     };
     //打开测评的弹窗
-    const showEditEvalDrawer = (id,eleId) => {
-      console.log('222222222222222222222',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,eleId) => {
+    const decideType = (type, id, eleId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id);
-      } 
-      else if (type == "直播") {
-        showEditLiveDrawer(id,eleId);
+        showEditRefDrawer(id, eleId);
+      } else if (type == "直播") {
+        showEditLiveDrawer(id, eleId);
       } else if (type == "测评") {
-        showEditEvalDrawer(id,eleId)
+        showEditEvalDrawer(id, eleId);
       } else if (type == "评估") {
-        showDrawerAddInvist(id,eleId);
+        showDrawerAddInvist(id, eleId);
       } else if (type == "投票") {
-        showDrawerAddVote(id,eleId);
+        showDrawerAddVote(id, eleId);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id,eleId);
+        showEditAddDiscuss(id, eleId);
       } else if (type == "活动") {
-        showDrawerAddActive(id,eleId);
-      }else if (type == "作业") {
-        showDrawerAddHomework(id,eleId);
-      }else if (type == "考试") {
-        showDrawerAddTest(id,eleId);
+        showDrawerAddActive(id, eleId);
+      } else if (type == "作业") {
+        showDrawerAddHomework(id, eleId);
+      } else if (type == "考试") {
+        showDrawerAddTest(id, eleId);
       }
-    }
+    };
     return {
       ...toRefs(state),
       selectProjectName,