合并

src/views/projectcenter/TaskAdd.vue

@@ -851,6 +851,8 @@ export default {
       isRefEdit: 1, //外链编辑
       isLiveEdit: 1, //直播编辑
       EditRefId: null, //要编辑的外链的id
+      EditLiveId: null, //要编辑的直播的id
+      editDiscussId:null,//要编辑的讨论的id
       EditEvalId:null,
       projectNameList: [
         {
@@ -1743,6 +1745,11 @@ export default {
     const showDrawerAddDiscuss = () => {
       state.adddiscussvisible = true;
     };
+    //打开编辑讨论的弹窗
+    const showEditAddDiscuss = (id)=>{
+      state.editDiscussId = id
+      state.adddiscussvisible = true;
+    }
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
     };
@@ -1867,18 +1874,16 @@ export default {
       } 
       else if (type == "直播") {
         showEditLiveDrawer(id);
-      }
-      else if (type == "测评") {
-        showEditEvalDrawer(id)
-      }
-      else if (type == "评估") {
-        showDrawerAddInvist(id)
-      }
-      else if (type == "投票") {
-        showDrawerAddVote(id)
-      }
-      else if (type == "讨论") {
-        showDrawerAddDiscuss(id)
+      } else if (type == "测评") {
+        showDrawerAddEval(id);
+      } else if (type == "评估") {
+        showDrawerAddInvist(id);
+      } else if (type == "投票") {
+        showDrawerAddVote(id);
+      } else if (type == "讨论") {
+        showEditAddDiscuss(id);
+      } else if (type == "活动") {
+        showDrawerAddActive(id);
       }
     }
     return {