feat:合并

src/api/indexTaskadd.js

@@ -1,8 +1,18 @@
 import http from "./config";
-
 //获取任务列表
 export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, {
   headers: {
     'token': '123'
   }
 })
+
+//项目里的新建或编辑阶段任务
+export const addTask = (obj) => http.post('/admin/project/editTask', obj, {
+  headers: {
+    'token': '123'
+  }
+})
+
+
+//项目里的删除任务
+export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { params: obj })

src/components/drawers/AddActive.vue

@@ -289,11 +289,26 @@ export default {
 
     //创建活动
     const createActivity = () => {
-      if(!state.inputV1) return message.warning("请输入活动名称");
+      if(!state.inputV1){
-      if(!state.textV1) return message.warning("请输入活动公告");
+        message.destroy();
-      if(!state.time) return message.warning("请输入活动时间");
+        return message.warning("请输入活动名称");
-      if(!state.inputV2) return message.warning("请输入活动时长");
+      } 
-      if(!state.inputV3) return message.warning("请输入活动地址");
+      if(!state.textV1){
+        message.destroy();
+        return message.warning("请输入活动公告");
+      } 
+      if(!state.time){
+        message.destroy();
+        return message.warning("请输入活动时间");
+      } 
+      if(!state.inputV2){
+        message.destroy();
+        return message.warning("请输入活动时长");
+      } 
+      if(!state.inputV3){
+        message.destroy();
+        return message.warning("请输入活动地址");
+      } 
       let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
       let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
       let obj = {
@@ -338,6 +353,7 @@ export default {
           console.log("创建失败",err);
         })
     };
+
     return {
       ...toRefs(state),
       afterVisibleChange,

src/components/drawers/AddDiscuss.vue

@@ -117,7 +117,10 @@ export default {
 
     //创建讨论
     const createDiscuss = () => {
-      if (!state.inputV1) return message.warning("请输入讨论名称");
+      if (!state.inputV1) {
+        message.destroy();
+        return message.warning("请输入讨论名称");
+      }
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明

src/components/drawers/AddEval.vue

@@ -90,6 +90,9 @@
                   <div class="ant-upload-text">Upload</div>
                 </div>
               </a-upload>
+              <span style="padding-bottom: 20px; color: #878b92"
+                >图片格式为</span
+              >
             </div>
           </div>
         </div>
@@ -103,11 +106,12 @@
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
-import { useRouter } from "vue-router";
+// import { useRouter } from "vue-router";
 import * as api from "../../api/indexEval";
+import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method";
-const router = useRouter();
+// const router = useRouter();
 export default {
   name: "AddEval",
   // components: {
@@ -120,10 +124,10 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      inputV1: '',
+      inputV1: "",
-      inputV2: '',
+      inputV2: "",
       time: undefined,
-      endTimes : "",
+      endTimes: "",
       startTimes: "",
       picUrl: "",
       tableData: [],
@@ -145,7 +149,7 @@ export default {
     //上传组件
     function getBase64(img, callback) {
       const reader = new FileReader();
-			reader.addEventListener('load', () => callback(reader.result));
+      reader.addEventListener("load", () => callback(reader.result));
       reader.readAsDataURL(img);
     }
 
@@ -154,12 +158,12 @@ export default {
     const imageUrl = ref("");
 
     const handleChange = (info) => {
-			if (info.file.status === 'uploading') {
+      if (info.file.status === "uploading") {
         loading.value = true;
         return;
       }
-			if (info.file.status === 'done') {
+      if (info.file.status === "done") {
-				console.log('上传图片返回的信息 %o', info)
+        console.log("上传图片返回的信息 %o", info);
         state.picUrl = info.file.response.data;
         // Get this url from response in real world.
         getBase64(info.file.originFileObj, (base64Url) => {
@@ -167,60 +171,44 @@ export default {
           loading.value = false;
         });
       }
-			if (info.file.status === 'error') {
+      if (info.file.status === "error") {
         loading.value = false;
-				message.error('upload error');
+        message.error("upload error");
       }
     };
 
     const beforeUpload = (file) => {
-			const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+      const isJpgOrPng =
+        file.type === "image/jpeg" || file.type === "image/png";
       if (!isJpgOrPng) {
-				message.error('You can only upload JPG file!');
+        message.error("You can only upload JPG file!");
       }
       const isLt2M = file.size / 1024 / 1024 < 1;
       if (!isLt2M) {
-				message.error('Image must smaller than 1MB!');
+        message.error("Image must smaller than 1MB!");
       }
       return isJpgOrPng && isLt2M;
     };
 
-    // const getTableDate = (tableData) => {
-    //   let data = tableData;
-    //   let array = [];
-    //   data.map((value, index) => {
-    //     let obj = {
-    //       id: value.routerId,
-    //       number: (state.currentPage - 1) * state.pageSize + index + 1,
-    //       manager: value.name ? value.name : "-",
-    //       state:
-    //         value.status === 0
-    //           ? "草稿"
-    //           : value.status === 1
-    //           ? "已发布"
-    //           : value.status === -1
-    //           ? "已停用"
-    //           : "-",
-    //       creater: value.createName ? value.createName : "-",
-    //       pubtime: value.publishTime
-    //         ? toDate(value.publishTime, "Y-M-D h:m:s")
-    //         : "-",
-    //       cretime: value.createTime
-    //         ? toDate(value.createTime, "Y-M-D h:m:s")
-    //         : "-",
-    //       remark: value.remark ? value.remark : "-",
-    //     };
-    //     array.push(obj);
-    //   });
-    //   state.tableData = array;
-    // };
-
     //创建测评信息
     const createEvalText = () => {
-      if (!state.inputV1) return message.info("请输入测评名称");
+      if (!state.inputV1) {
-      if ( state.time != undefined) {
+        message.destroy();
-        state.endTimes = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D")
+        return message.info("请输入测评名称");
-        state.startTimes = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D")
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.info("请选择测评");
+      }
+      if (state.time != undefined) {
+        state.endTimes = toDate(
+          new Date(state.time[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        state.startTimes = toDate(
+          new Date(state.time[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
       }
 
       let obj = {
@@ -244,9 +232,17 @@ export default {
           setTimeout(() => {
             console.log("创建成功", res);
             message.success("创建成功");
-            // state.createLoading = false;
+            closeDrawer();
-            router.push("/leveladd");
+            apitaskadd.addTask({
-            // getLearnPath();
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: "",
+              projectId: 28,
+              projectTaskId: 0,
+              stageId: 3,
+              type: 10,
+            });
           }, 1000);
         })
         .catch((err) => {
@@ -255,93 +251,6 @@ export default {
         });
     };
 
-    // //获取学习路径列表
-    // const getEvalPath = () => {
-    //   let obj = {
-    //     pageNo: state.currentPage,
-    //     pageSize: state.pageSize,
-    //   };
-    //   api
-    //     .queryEvaluationDetailById(obj)
-    //     .then((res) => {
-    //       if (res.status === 200) {
-    //         console.log("获取任务列表数据", res.data.data);
-    //         let arr = res.data.data.rows;
-    //         if (
-    //           arr.length === 0 &&
-    //           res.data.data.total > 0 &&
-    //           state.currentPage > 1
-    //         ) {
-    //           state.currentPage = state.currentPage - 1;
-    //           getEvalPath();
-    //         }
-    //         getTableDate(arr);
-    //         state.tableDataTotal = Number(res.data.data.total);
-    //       }
-    //     })
-    //     .catch((err) => {
-    //       console.log("获取学习路径失败", err);
-    //     });
-    // };
-    // //翻页 需要去pa里绑定 @change="changePagination"
-    // const changePagination = (page) => {
-    //   state.currentPage = page;
-    //   getEvalPath();
-    //   // console.log("翻页", page, pageSize);
-    // };
-    // //删除评估
-    // const deleteEvalPath = () => {
-    //   let obj = {
-    //     routerId: state.deletePathId,
-    //     type: -2,
-    //   };
-    //   api
-    //     .deleteEvaluationById(obj)
-    //     .then((res) => {
-    //       console.log("删除成功", res);
-    //       message.success("删除成功");
-    //       // state.deleteModal = false;
-    //       getEvalPath();
-    //     })
-    //     .catch((err) => {
-    //       console.log("删除失败", err);
-    //     });
-    // };
-    // //编辑评估
-    // const editEvalPath = () => {
-    //   if (!state.pathName) return message.info("请输入路径图名称");
-    //   // if (!state.organizationSelectName) return message.info("请选择归属组织");
-    //   // state.createLoading = true;
-    //   let obj = {
-    //     routerId: state.editPathId,
-    //     name: state.pathName,
-    //     picUrl: "",
-    //     remark: state.pathIntro,
-    //     status: 0,
-    //   };
-    //   api
-    //     .updateEvaluation(obj)
-    //     .then((res) => {
-    //       setTimeout(() => {
-    //         console.log("修改成功", res);
-    //         message.success("修改成功");
-    //         // state.createLoading = false;
-    //         // state.currentPage = 1;
-    //         // state.out1 = false;
-    //         // router.push("/leveladd");
-    //         getEvalPath();
-    //       }, 1000);
-    //     })
-    //     .catch((err) => {
-    //       console.log("修改失败", err);
-    //       // state.createLoading = false;
-    //     });
-    // };
-    // onMounted(() => {
-    //   // console.log("执行");
-    //   getEvalPath();
-    // });
-
     return {
       ...toRefs(state),
       afterVisibleChange,

src/components/drawers/AddInvist.vue

@@ -75,10 +75,9 @@
 </template>
 <script>
 import { reactive, toRefs} from "vue";
-import { useRouter } from "vue-router";
 import * as api from "../../api/indexInvist";
+import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-const router = useRouter();
 export default {
   name: "AddInvist",
   // components: {
@@ -206,9 +205,17 @@ export default {
           setTimeout(() => {
             console.log("创建成功", res);
             message.success("创建成功");
-            // state.createLoading = false;
+            closeDrawer();
-            router.push("/leveladd");
+            apitaskadd.addTask({
-            // getLearnPath();
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: "",
+              projectId: 28,
+              projectTaskId: 0,
+              stageId: 3,
+              type: 11,
+            });
           }, 1000);
         })
         .catch((err) => {

src/components/drawers/AddLive.vue

@@ -127,9 +127,10 @@
                   <div class="ant-upload-text">Upload</div>
                 </div>
               </a-upload>
+              <div class="tip">支持图片格式为jpg/jpeg/png 图片最大为2MB</div>
             </div>
           </div>
-          <div class="main_item">
+          <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
               <span style="margin-right: 3px">直播链接：</span>
             </div>
@@ -279,7 +280,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createLiveBroadcast">确定</button>
+        <button class="btn2" @click="done">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -288,8 +289,9 @@
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexLiveBroadcast";
+import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
-
+// import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
   reader.addEventListener("load", () => callback(reader.result));
@@ -372,6 +374,7 @@ export default {
     },
   },
   setup(props, ctx) {
+    // const router = useRouter();
     const state = reactive({
       tableData1: [
         {
@@ -477,6 +480,7 @@ export default {
       checkedC1: "",
       checkedC2: true,
       playback: false,
+      obj: {}, //要传的obj数据
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
@@ -528,7 +532,9 @@ export default {
     };
     const beforeUpload = (file) => {
       const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
+        file.type === "image/jpeg" ||
+        file.type === "image/png" ||
+        file.type === "image/jpg";
 
       if (!isJpgOrPng) {
         message.error("You can only upload JPG file!");
@@ -545,15 +551,25 @@ export default {
 
     //创建直播
     const createLiveBroadcast = () => {
-      if (!state.inputV1) return message.warning("请输入直播名称");
+      if (!state.inputV1) {
-      if (!state.time) return message.warning("请输入直播时间");
+        message.destroy();
-      if (!state.inputV2) return message.warning("请输入直播时长");
+        return message.warning("请输入直播名称");
+      }
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.warning("请输入直播时长");
+      }
       const regular = /^[+]{0,1}(\d+)$/;
       if (!regular.test(state.inputV2)) {
+        message.destroy();
         return message.warning("直播时长需大于0");
       }
 
-      // if (!state.inputV3) return message.info("请输入授课老师");
+      if (!state.inputV3) return message.warning("请输入授课老师");
       let check = state.checkedC2 * 1;
       // let startTime = state.time[0].$d;
       // let endTime = state.time[1].$d;
@@ -567,7 +583,7 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-      let obj = {
+      state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
         createTime: "",
@@ -592,13 +608,34 @@ export default {
         updateUser: 0,
       };
       api
-        .createLiveBroadcast(obj)
+        .createLiveBroadcast(state.obj)
         .then((res) => {
-          console.log(res.data.data, 1111);
+          console.log("调用添加直播接口后", res.data.data);
-          console.log(state, 2222);
+          // console.log(state, 2222);
           message.success("提交成功");
           closeDrawer();
 
+          apiTask
+            .addTask({
+              courseId: 0,
+              duration: state.obj.liveDuration,
+              flag: true,
+              name: state.obj.liveName,
+              projectId: 28,
+              projectTaskId: 0,
+              stageId: 3,
+              type: 6,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后", res.data);
+              //重新获取任务列表
+              // apiTask.getTask({ projectId: 28 });
+              // router.push("/taskadd");
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+
           // state = {}
         })
         .catch((err) => {
@@ -606,6 +643,15 @@ export default {
         });
     };
 
+    //添加任务到数据库
+    const addTask = () => {};
+
+    const done = () => {
+      createLiveBroadcast();
+      addTask();
+      // api.getLiveBroadcastInfor({});
+    };
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -618,6 +664,7 @@ export default {
       createLiveBroadcast,
       handleChange,
       beforeUpload,
+      done,
     };
   },
 };

src/components/drawers/AddRef.vue

@@ -79,6 +79,7 @@
   <script>
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexExternalChain";
+import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 const rowSelection = ref({
   checkStrictly: false,
@@ -142,6 +143,27 @@ export default {
           console.log(res.data.data);
           message.success("提交成功");
           closeDrawer();
+
+          apiTask
+            .addTask({
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: obj.inputV1,
+              projectId: 28,
+              projectTaskId: 0,
+              stageId: 3,
+              type: 7,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后", res.data);
+              //重新获取任务列表
+              // apiTask.getTask({ projectId: 28 });
+              // router.push("/taskadd");
+            })
+            .catch((err) => {
+              console.log(err);
+            });
         })
         .catch((err) => {
           console.log(err);

src/components/drawers/AddVote.vue

@@ -98,7 +98,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="createVoteText()">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -106,6 +106,10 @@
     <script>
 import { reactive, toRefs, ref } from "vue";
 import CreVote from "../../components/drawers/CreVote.vue";
+import * as api from "../../api/indexVote";
+import * as apitaskadd from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
 const options1 = ref([
   {
     value: "value1",
@@ -144,6 +148,10 @@ export default {
       inputV1: "",
       textV1: "",
       crevotevisible: false,
+      time: undefined,
+      basevote:'',
+      endTimes: "",
+      startTimes: "",
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
@@ -153,6 +161,68 @@ export default {
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
+    };
+        //创建投票信息
+        const createVoteText = () => {
+          if (!state.inputV1) {
+            message.destroy();
+            return message.info("请输入投票名称");
+          }
+
+          if (state.basevote == '') {
+            state.basevote = 1;
+          }
+
+          if (state.time != undefined) {
+            state.endTimes = toDate(
+              new Date(state.time[0].$d).getTime() / 1000,
+              "Y-M-D"
+            );
+            state.startTimes = toDate(
+              new Date(state.time[1].$d).getTime() / 1000,
+              "Y-M-D"
+            );
+          }
+
+      let obj = {
+        baseVote: state.basevote,
+        createTime: "",
+        createUser: 0,
+        stem: "",
+        stemId: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteId: 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: "",
+      };
+      api
+        .createVote(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("创建成功", res);
+            message.success("创建成功");
+            closeDrawer();
+            apitaskadd.addTask({
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: "",
+              projectId: 28,
+              projectTaskId: 0,
+              stageId: 3,
+              type: 12,
+            });
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("创建失败", err);
+          // state.createLoading = false;
+        });
     };
     return {
       ...toRefs(state),
@@ -161,6 +231,7 @@ export default {
       closeDrawer,
       rowSelection,
       options1,
+      createVoteText,
     };
   },
 };

src/views/projectcenter/TaskAdd.vue

@@ -522,7 +522,7 @@
 </template>
 
 <script>
-import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import EditOnline from "../../components/drawers/EditOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
@@ -665,95 +665,95 @@ export default {
 
       //任务数据
       tableData: [
-        {
+        // {
-          key: 1,
+        //   key: 1,
-          lei: "在线",
+        //   lei: "在线",
-          // state: "已发布",
+        //   // state: "已发布",
-          creater: "管理者课程",
+        //   creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
+        //   cretime: "60分钟",
-          haspub: false,
+        //   haspub: false,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-          id: "ssss",
+        //   id: "ssss",
-        },
+        // },
-        {
+        // {
-          key: 2,
+        //   key: 2,
-          lei: "面授",
+        //   lei: "面授",
-          // state: "草稿",
+        //   // state: "草稿",
-          creater: "管理者面授",
+        //   creater: "管理者面授",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
+        //   cretime: "20分钟",
-          haspub: true,
+        //   haspub: true,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 1,
+        //   key: 1,
-          lei: "在线",
+        //   lei: "在线",
-          // state: "已发布",
+        //   // state: "已发布",
-          creater: "管理者课程",
+        //   creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
+        //   cretime: "60分钟",
-          haspub: false,
+        //   haspub: false,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 3,
+        //   key: 3,
-          lei: "作业",
+        //   lei: "作业",
-          // state: "已停用",
+        //   // state: "已停用",
-          creater: "管理者作业",
+        //   creater: "管理者作业",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
+        //   cretime: "60分钟",
-          haspub: false,
+        //   haspub: false,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 4,
+        //   key: 4,
-          lei: "考试",
+        //   lei: "考试",
-          // state: "草稿",
+        //   // state: "草稿",
-          creater: "管理者考试",
+        //   creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
+        //   cretime: "20分钟",
-          haspub: true,
+        //   haspub: true,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 5,
+        //   key: 5,
-          lei: "案例",
+        //   lei: "案例",
-          // state: "草稿",
+        //   // state: "草稿",
-          creater: "腾飞班1案例",
+        //   creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
+        //   cretime: "20分钟",
-          haspub: true,
+        //   haspub: true,
-          checked1: true,
+        //   checked1: true,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 4,
+        //   key: 4,
-          lei: "考试",
+        //   lei: "考试",
-          // state: "草稿",
+        //   // state: "草稿",
-          creater: "管理者考试",
+        //   creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
+        //   cretime: "20分钟",
-          haspub: true,
+        //   haspub: true,
-          checked1: false,
+        //   checked1: false,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
-        {
+        // {
-          key: 5,
+        //   key: 5,
-          lei: "案例",
+        //   lei: "案例",
-          // state: "草稿",
+        //   // state: "草稿",
-          creater: "腾飞班1案例",
+        //   creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
+        //   // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
+        //   cretime: "20分钟",
-          haspub: true,
+        //   haspub: true,
-          checked1: true,
+        //   checked1: true,
-          checkedd: false,
+        //   checkedd: false,
-        },
+        // },
       ],
       drawertableData: [
         {
@@ -865,6 +865,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
+      deleteID: "", //删除任务的taskID
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -875,6 +876,47 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
+    // 把数据放到state里
+    const getTableData = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          id: value.projectTaskId,
+          key: value.projectTaskId,
+          lei:
+            value.type == 1
+              ? "在线"
+              : value.type == 2
+              ? "面授"
+              : value.type == 3
+              ? "案例"
+              : value.type == 4
+              ? "作业"
+              : value.type == 5
+              ? "考试"
+              : value.type == 6
+              ? "直播"
+              : value.type == 7
+              ? "外链"
+              : value.type == 8
+              ? "讨论"
+              : value.type == 10
+              ? "测评"
+              : value.type == 11
+              ? "评估"
+              : value.type == 12
+              ? "投票"
+              : "-",
+          creater: value.name,
+          cretime: value.duration ? value.duration : "-",
+          checked1: value.flag ? true : false,
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
+
     const tableDataFunc = () => {
       const columns = [
         {
@@ -991,6 +1033,7 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
+                      state.deleteID = text.record.id;
                     }}
                   >
                     删除
@@ -1007,17 +1050,19 @@ export default {
     //获取任务列表
     const getTask = () => {
       let obj = {
-        projectId: 1,
+        projectId: 28,
       };
       api
         .getTask(obj)
         .then((res) => {
           if (res.status == 200) {
-            console.log("22222", res.data.data.stageList);
+            console.log("22222", res.data.data.stageList[0].taskList);
+            let arr = res.data.data.stageList[0].taskList;
+            getTableData(arr);
           }
         })
         .catch((err) => {
-          console.log(err);
+          console.log("获取任务列表失败", err);
         });
     };
     //删除直播
@@ -1055,7 +1100,7 @@ export default {
           console.log(err);
         });
     };
-
+    //删除讨论
     const deleteDiscuss = () => {
       let obj = {
         discussId: state.deleteDiscussID,
@@ -1152,6 +1197,7 @@ export default {
     const deleteEvalText = () => {
       let obj = {
         evaluationId: state.deleteEvalID,
+        token: "",
       };
       apieval
         .deleteEvaluationById(obj)
@@ -1265,7 +1311,8 @@ export default {
     //删除评估测试
     const deleteInvistText = () => {
       let obj = {
-        evaluationId: state.deleteInvistID,
+        评估信息Id: "",
+        token: "",
       };
       apiinvist
         .deleteAppraise(obj)
@@ -1313,6 +1360,18 @@ export default {
         });
     };
 
+    //删除任务
+    const deleteTask = () => {
+      let obj = { projectTaskIds: state.deleteID };
+      api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1334,6 +1393,7 @@ export default {
     const showModal1 = () => {
       //关闭确认框
       state.deleteModal = false;
+      deleteTask();
     };
     const closeModal = () => {
       state.stage = false;
@@ -1344,6 +1404,12 @@ export default {
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
       getTask();
     });
+    onUpdated(() => {
+      // getTask();
+      // setTimeout(() => {
+      //   getTask();
+      // }, 500);
+    });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
       document.getElementsByTagName("main")[0].style.boxShadow =
@@ -1451,6 +1517,8 @@ export default {
       editLiveBroadcast,
       editExternal,
       editInvistPath,
+      getTableData,
+      deleteTask,
     };
   },
 };