Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/projectcenter/TaskAdd.vue

@@ -551,6 +551,7 @@ import * as apidiscuss from "../../api/indexDiscuss";
 import * as apiactivity from "../../api/indexActivity";
 import * as apieval from "../../api/indexEval";
 import * as apiinvist from "../../api/indexInvist";
+import * as apivote from "../../api/indexVote";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -872,7 +873,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
-      deleteID: "", //删除任务的taskID
+      deleteID: "",
     });
 
     const selectProjectName = (value, index) => {
@@ -916,7 +917,7 @@ export default {
               : value.type == 12
               ? "投票"
               : "-",
-          creater: value.name,
+              creater: value.name,
           cretime: value.duration ? value.duration : "-",
           checked1: value.flag ? true : false,
         };
@@ -1214,8 +1215,8 @@ export default {
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
-        evaluationId: state.deleteEvalID,
-        token: "",
+        evaluationId: "",
+        token: 123,
       };
       apieval
         .deleteEvaluationById(obj)
@@ -1378,8 +1379,8 @@ export default {
         });
     };
 
-    //删除任务
-    const deleteTask = () => {
+        //删除任务
+        const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
       api
         .deleteTask(obj)
@@ -1390,6 +1391,59 @@ export default {
           console.log(err);
         });
     };
+
+    //删除投票信息
+    const deleteVoteText = () => {
+      let obj = {
+        voteId: "",
+      };
+      apivote
+        .deleteVoteMessage(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
+    //编辑投票信息
+    const editVotePath = () => {
+      let obj = {
+        baseVote: "",
+        createTime: "",
+        createUser: 0,
+        stem: "",
+        stemId: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: "",
+        voteExplain: "",
+        voteFlag: "",
+        voteId: 0,
+        voteName: "",
+        voteStartTime: "",
+        voteTag: "",
+      };
+      apivote
+        .editVote(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("修改失败", err);
+          // state.createLoading = false;
+          //重新获取列表
+          getTask();
+        });
+    };
+
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1530,12 +1584,14 @@ export default {
       deleteEvalText,
       deleteExternalChain,
       deleteActivity,
+      deleteVoteText,
       editActivity,
       editEvalPath,
       deleteInvistText,
       editLiveBroadcast,
       editExternal,
       editInvistPath,
+      editVotePath,
       getTableData,
       deleteTask,
     };
@@ -1795,7 +1851,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {