feat:合并

src/api/indexTaskadd.js

@@ -1,5 +1,4 @@
 import http from "./config";
-
 //获取任务列表
 export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, {
   headers: {
@@ -13,3 +12,7 @@ export const addTask = (obj) => http.post('/admin/project/editTask', obj, {
     'token': '123'
   }
 })
+
+
+//项目里的删除任务
+export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { params: obj })

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>
@@ -531,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!");
@@ -615,9 +618,9 @@ export default {
           apiTask
             .addTask({
               courseId: 0,
-              duration: 0,
+              duration: state.obj.liveDuration,
               flag: true,
-              name: "",
+              name: state.obj.liveName,
               projectId: 28,
               projectTaskId: 0,
               stageId: 3,

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/views/projectcenter/TaskAdd.vue

@@ -866,6 +866,7 @@ export default {
       deleteInvistID: 4, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
+      deleteID: "",
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -883,6 +884,7 @@ export default {
       data.map((value) => {
         let obj = {
           id: value.projectTaskId,
+          key: value.projectTaskId,
           lei:
             value.type == 1
               ? "在线"
@@ -907,8 +909,8 @@ export default {
               : value.type == 12
               ? "投票"
               : "-",
-          creater: value.name == "" ? "管理者课程" : "-",
-          cretime: value.duration,
+              creater: value.name,
+          cretime: value.duration ? value.duration : "-",
           checked1: value.flag ? true : false,
         };
         array.push(obj);
@@ -1032,7 +1034,7 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      deleteEvalText();
+                      state.deleteID = text.record.id;
                     }}
                   >
                     删除
@@ -1359,6 +1361,19 @@ export default {
         });
     };
 
+        //删除任务
+        const deleteTask = () => {
+      let obj = { projectTaskIds: state.deleteID };
+      api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
     //删除投票信息
     const deleteVoteText = () => {
       let obj = {
@@ -1380,19 +1395,20 @@ export default {
     //编辑投票信息
     const editVotePath = () => {
       let obj = {
-        appraiseEndTime: "",
-        appraiseExplain: "",
-        appraiseFlag: "",
-        appraiseId: 0,
-        appraiseName: "",
-        appraiseStartTime: "",
-        appraiseTag: "",
+        baseVote: "",
         createTime: "",
         createUser: 0,
-        researchId: 0,
-        researchName: "",
+        stem: "",
+        stemId: 0,
         updateTime: "",
         updateUser: 0,
+        voteEndTime: "",
+        voteExplain: "",
+        voteFlag: "",
+        voteId: 0,
+        voteName: "",
+        voteStartTime: "",
+        voteTag: "",
       };
       apivote
         .editVote(obj)
@@ -1431,6 +1447,7 @@ export default {
     const showModal1 = () => {
       //关闭确认框
       state.deleteModal = false;
+      deleteTask();
     };
     const closeModal = () => {
       state.stage = false;
@@ -1557,6 +1574,7 @@ export default {
       editInvistPath,
       editVotePath,
       getTableData,
+      deleteTask,
     };
   },
 };