feat:合并

src/views/projectcenter/TaskAdd.vue

@@ -526,7 +526,14 @@
 </template>
 
 <script>
-import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
+import {
+  reactive,
+  toRefs,
+  onMounted,
+  onUnmounted,
+  onUpdated,
+  watch,
+} from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import EditOnline from "../../components/drawers/EditOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
@@ -548,7 +555,13 @@ 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";
 import * as apistage from "../../api/indexStage";
+<<<<<<< HEAD
+import * as apistage from "../../api/indexStage";
+=======
+import * as apivote from "../../api/indexVote";
+>>>>>>> 096d42b09e588582d20dd3350d5115d6678da009
 const drawercolumns = [
   {
     title: "项目名称",
@@ -872,8 +885,9 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
-      deleteID: "", //删除任务的taskID
+      deleteID: "",
     });
+
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
     };
@@ -937,7 +951,7 @@ export default {
               : value.type == 12
               ? "投票"
               : "-",
-          creater: value.name,
+              creater: value.name,
           cretime: value.duration ? value.duration : "-",
           checked1: value.flag ? true : false,
         };
@@ -1094,6 +1108,16 @@ export default {
           console.log("获取任务列表失败", err);
         });
     };
+
+    watch(
+      state.tableData,
+      () => {
+        getTask();
+      },
+      {
+        deep: true,
+      }
+    );
     //删除直播
     const deleteLiveBroadcast = () => {
       let obj = {
@@ -1225,8 +1249,8 @@ export default {
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
-        evaluationId: state.deleteEvalID,
-        token: "",
+        evaluationId: "",
+        token: 123,
       };
       apieval
         .deleteEvaluationById(obj)
@@ -1389,8 +1413,8 @@ export default {
         });
     };
 
-    //删除任务
-    const deleteTask = () => {
+        //删除任务
+        const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
       api
         .deleteTask(obj)
@@ -1401,6 +1425,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;
@@ -1423,6 +1500,7 @@ export default {
       //关闭确认框
       state.deleteModal = false;
       deleteTask();
+      message.success("删除成功");
     };
     const closeModal = () => {
       state.stage = false;
@@ -1540,12 +1618,14 @@ export default {
       deleteEvalText,
       deleteExternalChain,
       deleteActivity,
+      deleteVoteText,
       editActivity,
       editEvalPath,
       deleteInvistText,
       editLiveBroadcast,
       editExternal,
       editInvistPath,
+      editVotePath,
       getTableData,
       deleteTask,
       editStage,
@@ -1806,7 +1886,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {