feat:合并

src/api/indexLevel.js

@@ -1,14 +1,12 @@
 import http from "./config";
 
 //新建关卡
-export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, {
+export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
-    headers: {
-        'token': '123'
-    }
-});
 //编辑关卡
-export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj, {
+export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj);
-    headers: {
+
-        'token': '123'
+//删除任务
-    }
+export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj});
-});
+
+//移动任务到关卡
+export const moveTask = (obj) => http.post('/admin/router/moveTask',obj);

src/api/indexMovetask.js

@@ -1,8 +1,4 @@
 import http from "./config";
 
 //移动任务到阶段
-export const moveTask = (obj) => http.post('/admin/project/moveTask',obj,{
+export const moveTask = (obj) => http.post('/admin/project/moveTask',obj)
-    headers: {
-        'token': '123'
-    }
-})

src/api/indexStage.js

@@ -1,8 +1,4 @@
 import http from "./config";
 
 //添加阶段
-export const editStage = (obj) => http.post('/admin/project/editStage', obj, {
+export const editStage = (obj) => http.post('/admin/project/editStage', obj);
-    headers: {
-        'token': '123'
-    }
-});

src/api/indexTaskadd.js

@@ -7,11 +7,7 @@ export const getTask = (obj) => http.get('/admin/project/detail', { params: obj
 })
 
 //项目里的新建或编辑阶段任务
-export const addTask = (obj) => http.post('/admin/project/editTask', obj, {
+export const addTask = (obj) => http.post('/admin/project/editTask', obj)
-  headers: {
-    'token': '123'
-  }
-})
 
 
 //项目里的删除任务

src/components/drawers/AddActive.vue

@@ -257,6 +257,22 @@ export default {
       type: Boolean,
       default: false,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     //console.log("学习路径",props.isStudiscuss);
@@ -356,12 +372,12 @@ export default {
             console.log("学习路径",props.isStudiscuss);
             if(props.isStudiscuss){
               let editObj1 = {
-              chapterId:36,
+              chapterId:props.isactive,
               courseId: 0,
               duration: obj.activityDuration,
               flag: true,
               name: obj.activityName,
-              routerId: 92,
+              routerId: props.routerId,
               routerTaskId: 0,
               type: 9,
             }
@@ -378,9 +394,9 @@ export default {
                 duration: obj.activityDuration,
                 flag: true,
                 name: obj.activityName,
-                projectId: 28,
+                projectId: props.projectId,
                 projectTaskId: 0,
-                stageId: 3,
+                stageId: props.chooseStageId,
                 type: 9,
               })
               .then((res) => {

src/components/drawers/AddDiscuss.vue

@@ -8,7 +8,8 @@
   >
     <div class="drawerMain">
       <div class="header">        
-        <div class="headerTitle">添加讨论</div>
+        <div v-if="edit" class="headerTitle">编辑讨论</div>
+        <div v-else class="headerTitle">添加讨论</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -99,9 +100,29 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
     isStudiscuss: {
       type: Boolean,
       default: false,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
     }
   },
   setup(props, ctx) {
@@ -114,6 +135,7 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
+      ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.textV1 = "";
     };
@@ -152,12 +174,12 @@ export default {
           console.log("学习路径",props.isStudiscuss);
           if(props.isStudiscuss){
             let editObj1 = {
-              chapterId:36,
+              chapterId:props.isactive,
               courseId: 0,
               duration: 0,
               flag: true,
               name: obj.discussName,
-              routerId: 92,
+              routerId: props.routerId,
               routerTaskId: 0,
               type: 8,
             }
@@ -175,9 +197,9 @@ export default {
               duration: 0,
               flag: true,
               name: obj.discussName,
-              projectId: 28,
+              projectId: props.projectId,
               projectTaskId: 0,
-              stageId: 3,
+              stageId: props.chooseStageId,
               type: 8,
             })
             .then((res) => {

src/components/drawers/AddEval.vue

@@ -131,6 +131,22 @@ export default {
       type: Number,
       default: 0,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -200,7 +216,9 @@ export default {
       return isJpgOrPng && isLt2M;
     };
 
-    //创建测评信息
+
+
+    //创建或编辑测评信息
     const createEvalText = () => {
       if (!state.inputV1) {
         message.destroy();
@@ -236,12 +254,29 @@ export default {
         updateTime: "",
         updateUser: 0,
       };
+      let objedit = {
+        createTime: "",
+        createUser: 0,
+        evaluationEndTime: "",
+        evaluationFlag: "",
+        evaluationId: 125,
+        evaluationName: state.inputV1,
+        evaluationPictureAddress: "",
+        evaluationStartTime: "",
+        evaluationTag: "",
+        evaluationTypeId: 0,
+        evaluationTypeName: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      if (props.edit == false) {
         api
           .createEvaluation(obj)
           .then((res) => {
             console.log("创建成功", res);
             message.success("创建成功");
             closeDrawer();
+            //渲染到学历路径
             if (props.learn == 0)
               apitaskadd
                 .addTask({
@@ -249,9 +284,9 @@ export default {
                   duration: 0,
                   flag: true,
                   name: obj.evaluationName,
-                projectId: 28,
+                  projectId: props.projectId,
                   projectTaskId: 0,
-                stageId: 3,
+                  stageId: props.chooseStageId,
                   type: 10,
                 })
                 .then((res) => {
@@ -265,14 +300,15 @@ export default {
                 .catch((err) => {
                   console.log(err);
                 });
+            //渲染到项目列表
             else {
               let editObj1 = {
-              chapterId: 36,
+                chapterId: props.isactive,
                 courseId: 0,
                 duration: 0,
                 flag: true,
                 name: obj.evaluationName,
-              routerId: 92,
+                routerId: props.routerId,
                 routerTaskId: 0,
                 type: 10,
               };
@@ -283,18 +319,42 @@ export default {
             console.log("创建失败", err);
             // state.createLoading = false;
           });
+      }
+      else {
+        api
+          .queryEvaluationDetailById(obj.evaluationId)
+          .then((res) => {
+              setTimeout(() => {
+                console.log("获取成功", res,obj.evaluationId);
+                message.success("获取成功");
+              }, 1000);
+            })
+            .catch((err) => {
+              console.log("获取失败", err);
+            });
+          api
+            .updateEvaluation(objedit)
+            .then((res) => {
+              setTimeout(() => {
+                console.log("修改成功", res);
+                message.success("修改成功");
+              }, 1000);
+            })
+            .catch((err) => {
+              console.log("修改失败", err);
+              // state.createLoading = false;
+              //重新获取列表
+              // getTask();
+            });
+        }
     };
 
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      //增删改查
+      //增改
       createEvalText,
-      // getEvalPath,
-      // changePagination,
-      // deleteEvalPath,
-      // editEvalPath,
       //上传组件
       fileList,
       loading,

src/components/drawers/AddInvist.vue

@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加评估</div>
+        <div v-if="edit" class="headerTitle">编辑评估</div>
+        <div v-else class="headerTitle">添加评估</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -46,6 +47,7 @@
               @expand="expandTable"
               :pagination="false"
               :row-selection="rowSelection"
+              filterMultiple:false
             />
 
             <div class="pa">
@@ -70,10 +72,11 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, onMounted } from "vue";
 import * as api from "../../api/indexInvist";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
 import { RouterEditTask } from "@/api/indexTask";
 export default {
   name: "AddInvist",
@@ -92,11 +95,22 @@ export default {
       type: Number,
       default: 0,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       time: undefined,
+      currentPage: 1,
+      pageSize: 10,
+      tableDataTotal: -1,
       tableData: [
         // {
         //   key: 1,
@@ -105,17 +119,11 @@ export default {
         //   creator: "管理员",
         //   time: "2022-07-21 14:30:25",
         // },
-        // {
-        //   key: 2,
-        //   name: "评估",
-        //   num: "8",
-        //   creator: "管理员",
-        //   time: "2022-07-21 14:30:25",
-        // },
       ],
     });
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
+      ctx.emit("update:edit", false);
       state.inputV1 = "";
     };
     const afterVisibleChange = (bool) => {
@@ -174,14 +182,82 @@ export default {
       return columns;
     };
     const rowSelection = {
-      onChange: (selectedRowKeys, selectedRows) => {
+      type: 'radio',
-        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+      // onChange: (selectedRowKeys, selectedRows) => {
-      },
+      //   this.selectedRowKeys = selectedRowKeys
-      getCheckboxProps: record => ({
+      //   if (selectedRows.length > 1) {
-        // disabled: record.name === 'Disabled User',
+      //     //获取选中的数据的key
-        // // Column configuration not to be checked
+      //     var selectNumber = this.selectedRowKeys[1]
-        name: record.name,
+      //     //清空选中的key
-      }),
+      //     this.selectedRowKeys = []
+      //     //选中的数据的key重新赋值给selectedRowKeys
+      //     this.selectedRowKeys.push(selectNumber)
+      //   }
+      // },
+      // getCheckboxProps: (record) => ({
+      //   // disabled: record.name === 'Disabled User',
+      //   // // Column configuration not to be checked
+      //   name: record.name,
+      // }),
+      onSelect: ( selectedRows, selected,selectedRowKeys) => {
+        console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
+      }
+    };
+
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        // console.log("123", value);
+        let obj = {
+          // id: value.routerId,
+          key: index,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: value.createTime
+            ? toDate(new Date(value.createTime).getTime() / 1000, "Y-M-D h:m:s")
+            : "-",
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
+    //获取全部评估信息接口
+    const getAllInvistText = () => {
+      let obj = {
+        assessmentName: "",
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        releaseStatus: "",
+        searchEndTime: "",
+        searchStartTime: "",
+      };
+      api
+        .queryAssessmentDetailList(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;
+              getAllInvistText();
+            }
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+          console.log("获取全部评估信息接口成功", res);
+          message.success("获取全部评估信息接口成功");
+          console.log(obj);
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+          // state.createLoading = false;
+        });
     };
     //创建评估信息
     const createInvist = () => {
@@ -214,9 +290,9 @@ export default {
                 duration: 0,
                 flag: true,
                 name: obj.appraiseName,
-              projectId: 28,
+                projectId: props.projectId,
                 projectTaskId: 0,
-              stageId: 3,
+                stageId: props.chooseStageId,
                 type: 11,
               })
               .then((res) => {
@@ -241,7 +317,7 @@ export default {
               routerTaskId: 0,
               type: 11,
             };
-            RouterEditTask(editObj1)
+            RouterEditTask(editObj1);
           }
         })
         .catch((err) => {
@@ -250,28 +326,10 @@ export default {
         });
     };
 
-    //获取全部评估信息接口
+    onMounted(() => {
-    const getAllInvistText = () => {
+      // createInvist();
-      let obj = {
+      getAllInvistText();
-        assessmentName: "",
-        pageNo: 0,
-        pageSize: 0,
-        releaseStatus: "",
-        searchEndTime: "",
-        searchStartTime: "",
-      };
-      api
-        .queryAssessmentDetailList(obj)
-        .then((res) => {
-          console.log("获取全部评估信息接口成功", res);
-          message.success("获取全部评估信息接口成功");
-          console.log(obj);
-        })
-        .catch((err) => {
-          console.log("获取全部评估信息接口失败", err);
-          // state.createLoading = false;
     });
-    };
     return {
       ...toRefs(state),
       afterVisibleChange,

src/components/drawers/AddLive.vue

@@ -338,6 +338,10 @@ export default {
       type: Number,
       default: null,
     },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -554,6 +558,7 @@ export default {
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
+        assessmentId: 0,
         createTime: "",
         createUser: 0,
         // liveCover: state.fileList,//直播封面
@@ -612,7 +617,7 @@ export default {
                 name: state.obj.liveName,
                 projectId: props.projectId,
                 projectTaskId: 0,
-                stageId: 0,
+                stageId: props.chooseStageId,
                 type: 6,
               })
               .then((res) => {

src/components/drawers/AddRef.vue

@@ -3,13 +3,12 @@
     :visible="addrefVisible"
     class="drawerStyle addrefDrawer"
     width="80%"
-    title="添加外链"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加外链</div>
+        <div class="headerTitle">{{ title }}外链</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -77,7 +76,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref, onMounted } from "vue";
 import * as api from "../../api/indexExternalChain";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -111,16 +110,34 @@ export default {
       type: Number,
       default: null,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    isRefEdit: {
+      type: Number,
+      default: null,
+    },
+    EditRefId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       inputV2: "",
       textV1: "",
+      title: null,
     });
     const closeDrawer = () => {
       console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
+      ctx.emit("update:isRefEdit", 1);
       console.log("props", props.routerId);
       state.inputV2 = "";
       state.inputV1 = "";
@@ -129,6 +146,8 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+
+    //创建外链
     const createExternalChain = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
       if (!state.inputV2) return message.warning("请输入链接");
@@ -138,19 +157,30 @@ export default {
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
         linkFlag: "",
-        linkId: 0,
+        linkId: props.EditRefId == null ? 0 : props.EditRefId,
         linkName: state.inputV1,
         linkTag: "",
         updateTime: "",
         updateUser: 0,
       };
+      //编辑外链
+      if (props.isRefEdit == 2) {
+        api
+          .updateLinks(obj)
+          .then((res) => {
+            console.log("编辑成功", res);
+            message.success("编辑成功");
+            closeDrawer();
+          })
+          .catch((err) => console.log(err));
+      } else {
         api
           .createExternalChain(obj)
           .then((res) => {
-          console.log(res.data.data);
+            console.log(res.data.data, "外链添加成功了");
             message.success("提交成功");
             closeDrawer();
-
+            //学习路径的创建
             if (props.isStudy == 1) {
               let objj = {
                 chapterId: 36,
@@ -170,15 +200,16 @@ export default {
                   console.log(err, 1111);
                 });
             } else {
+              //项目的创建
               apiTask
                 .addTask({
-                courseId: 0,
+                  courseId: res.data.data.linkId,
                   duration: 0,
                   flag: true,
                   name: obj.linkName,
-                projectId: 28,
+                  projectId: props.projectId,
                   projectTaskId: 0,
-                stageId: 3,
+                  stageId: props.chooseStageId,
                   type: 7,
                 })
                 .then((res) => {
@@ -196,7 +227,12 @@ export default {
           .catch((err) => {
             console.log(err);
           });
+      }
     };
+    //不生效
+    onMounted(() => {
+      state.title = props.isRefEdit == 2 ? "编辑" : "添加";
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,

src/components/drawers/AddVote.vue

@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加投票</div>
+        <div v-if="edit" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">添加投票</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -156,6 +157,14 @@ export default {
       type: Number,
       default: 0,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -170,6 +179,7 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
+      ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -240,9 +250,9 @@ export default {
               duration: 0,
               flag: true,
               name: obj.voteName,
-              projectId: 28,
+              projectId: props.projectId,
               projectTaskId: 0,
-              stageId: 3,
+              stageId: props.chooseStageId,
               type: 12,
             })
             .then((res) => {

src/components/drawers/CreVote.vue

@@ -20,10 +20,7 @@
         <div class="main_item">
           <div class="signbox">
             <div class="sign">
-                  <img
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                  />
             </div>
             <span style="margin-right: 3px">投票名称</span>
           </div>
@@ -112,7 +109,7 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
-      creVote:true,
+      creVote: true,
       questions: [
         {
           inputV: "",
@@ -180,20 +177,17 @@ export default {
             optionPictureAddress: "",
           },
         ],
-      optionId: 0,
+        stemName: "",
-      optionName: "",
-      optionPictureAddress: "",
-      stem: state.questions[0].inputV,
-      stemId: 0,
         updateTime: "",
         updateUser: 0,
+        voteStemId: 0,
       };
       api
         .createOptionMessage(obj)
         .then((res) => {
           console.log("创建成功", res);
           message.success("创建成功");
-        ctx.emit("getData",state.creVote);
+          ctx.emit("getData", state.creVote);
           closeDrawer();
         })
         .catch((err) => {

src/views/learningpath/LevelAddDetail.vue

@@ -280,6 +280,8 @@
                 v-model:addevalVisible="addevalvisible"
                 v-model:edit="edit"
                 v-model:learn="learn"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
               />
             </div>
             <!-- 添加测评侧弹窗 -->
@@ -341,7 +343,7 @@
               <span>任务列表</span>
             </div>
             <div class="tit_right">
-              <div class="btn btn1">
+              <div class="btn btn1" @click="moveTask">
                 <div class="btnText">移动到任务阶段</div>
               </div>
               <div class="btn btn2">
@@ -729,6 +731,8 @@
       <add-discuss
         v-model:adddiscussVisible="adddiscussvisible"
         v-model:isStudiscuss="isStudiscuss"
+        v-model:isactive="isactive"
+        v-model:routerId="routerId"
       />
     </div>
     <!-- 添加讨论侧弹窗 -->
@@ -737,6 +741,8 @@
       <add-active
         v-model:addactiveVisible="addactivevisible"
         v-model:isStudiscuss="isStudiscuss"
+        v-model:isactive="isactive"
+        v-model:routerId="routerId"
       />
     </div>
     <!-- 添加活动侧弹窗 -->
@@ -1073,7 +1079,6 @@ export default {
       addevalvisible: false,
       addinvistvisible: false,
       addvotevisible: false,
-      updateChapterID: null, //修改关卡id
       // 表示当前触发列表的id,用来发送编辑和删除
       ListChoosedId: 0,
       selectRow: [], //选择行
@@ -1567,6 +1572,7 @@ export default {
     };
     const delete_exit = () => {
       state.deleteAll = false;
+      deletecTaskAll();
     };
     const showDeleteModal = (id) => {
       state.deleteID = id;
@@ -1656,6 +1662,44 @@ export default {
       state.tableData = arr;
       state.selectRow = array;
     };
+    //批量删除任务
+    const deletecTaskAll = () => {
+      let arr = state.selectRow;
+      console.log("选择的行信息",arr);
+      arr.map( value => {
+        let obj = {
+          routerTaskIds: value,
+        }
+        console.log("value",value);
+        api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+          message.destroy();
+          message.success("批量删除成功");
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      })
+    }
+    //移动任务到关卡
+    const moveTask = () => {
+      let obj = {
+        chapterId: state.isactive,
+        routerTaskIdList: state.selectRow,
+      }
+      api
+          .moveTask(obj)
+          .then((res) => {
+            console.log("移动成功",res);
+            message.destroy();
+            message.success("移动成功");
+          })
+          .catch((err) => {
+            console.log("移动失败",err);
+          })
+    }
     return {
       ...toRefs(state),
       tableDataFunc,
@@ -1691,6 +1735,8 @@ export default {
       showDrawerAddActive,
       selectRowAll,
       changeRow,
+      deletecTaskAll,
+      moveTask,
     };
   },
 };

src/views/projectcenter/ProjectManage.vue

@@ -800,21 +800,41 @@ export default {
 			edname = key.target.value;
 		}
 
-		let edcategory = '';
+		let edcategory = 0;
 		const edclassificationChange = (key) => {
 			console.log(key)
 			edcategory = key;
 		}
 
-		let edmanage = '';
+		let edmanage = "";
-		let edmanageid = '';
+		let edmanageid = "";
-		const edclassificationChange1 = (key) => {
+		const edclassificationChange1 = (key, options) => {
-			console.log(key)
+			console.log(`selected ${key}`, options);
-			edmanage = key;
+			let mstr = "";
-			edmanageid = key;
+			let midstr = "";
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ",";
+					mstr += classifyList1.value[i].label + ",";
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr);
+			edvalue3.value = options;
+			let newoptions = [];
+			for (let i = 0; i < edvalue3.value.length; i++) {
+				if (edvalue3.value[i].value) {
+					newoptions.push(edvalue3.value[i])
+				}
+			}
+			edvalue3.value = newoptions;
+			edmanage = mstr;
+			edmanageid = midstr;
 		}
 
-		let edsource = '';
+		let edsource = "";
 		const edclassificationChange5 = (key) => {
 			console.log(key)
 			edsource = key;
@@ -826,7 +846,7 @@ export default {
 			{ value: 3, label: '项目三' },
 		]);
 
-		let sourceBelongId = '';
+		let sourceBelongId = 0;
 		const classificationChange5 = (key) => {
 			console.log(`selected ${key}`);
 			sourceBelongId = key;
@@ -941,18 +961,34 @@ export default {
 			value5.value = [];
 			state.doublepro = false;
 		};
-
+		console.log(edmanage, edmanageid)
 		// 编辑多层项目
 		const editStoreyProject = () => {
+			// 查询下项目信息
+			api.getProjectDetail({ projectId: Number(state.dcProjectID) }).then(res => {
+				console.log(res)
 				let obj = {
-				projectId: Number(state.dcProjectID),
+					"attach": res.data.data.projectInfo.attach,
-				name: edname,
+					"beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
-				category: edcategory,
+					"boeFlag": res.data.data.projectInfo.boeFlag,
-				manager: edmanage.toString(","),
+					"category": edcategory ? edcategory : res.data.data.projectInfo.category,
-				managerId: edmanageid.toString(","),
+					"courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
-				sourceBelongId: edsource,
+					"endTime": Number(res.data.data.projectInfo.endTime) / 1000,
-				type: 1,
+					"level": res.data.data.projectInfo.level,
-				picUrl: 0
+					"manager": edmanage ? edmanage.toString(",") : res.data.data.projectInfo.manager,
+					"managerId": edmanageid ? edmanageid.toString(",") : res.data.data.projectInfo.managerId,
+					"name": edname ? edname : res.data.data.projectInfo.name,
+					"notice": res.data.data.projectInfo.notice,
+					"noticeFlag": res.data.data.projectInfo.noticeFlag,
+					"parentId": res.data.data.projectInfo.parentId,
+					"picUrl": res.data.data.projectInfo.picUrl,
+					"projectId": state.dcProjectID ? Number(state.dcProjectID) : res.data.data.projectInfo.projectId,
+					"remark": res.data.data.projectInfo.remark,
+					"sourceBelongId": edsource ? edsource : res.data.data.projectInfo.sourceBelongId,
+					"status": res.data.data.projectInfo.status,
+					"systemId": res.data.data.projectInfo.systemId,
+					"templateId": "",
+					"type": res.data.data.projectInfo.type
 				}
 				if (obj.name !== "" || obj.category !== "" || obj.manager !== "" || obj.sourceBelongId !== "") {
 					console.log("我需要编辑")
@@ -963,6 +999,7 @@ export default {
 							state.eddoublepro = false;
 							message.destroy();
 							message.success("编辑成功");
+							getTableDate();
 						}
 					}).catch(err => {
 						console.log(err)
@@ -974,6 +1011,12 @@ export default {
 				} else {
 					state.eddoublepro = false;
 				}
+			}).catch(err => {
+				console.log(err)
+				state.eddoublepro = false;
+				message.destroy();
+				message.error("编辑失败，请检查当前网络状态。");
+			})
 		}
 
 		const closeeditModal2 = () => {
@@ -1134,7 +1177,7 @@ export default {
 		let editChildrensName = '';
 		const edclassificationChange6 = (key) => {
 			console.log(key)
-			editChildrensName = key;
+			editChildrensName = key.target.value;
 		}
 
 		let editChildrensCategory = '';
@@ -1146,10 +1189,30 @@ export default {
 		let editChildrensManege = '';
 		let editChildrensManegeId = '';
 
-		const edclassificationChange3 = (key) => {
+		const edclassificationChange3 = (key, options) => {
-			console.log(key)
+			console.log(`selected ${key}`, options);
-			editChildrensManege = key;
+			let mstr = "";
-			editChildrensManegeId = key;
+			let midstr = "";
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ",";
+					mstr += classifyList1.value[i].label + ",";
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr);
+			edvalue8.value = options;
+			let newoptions = [];
+			for (let i = 0; i < edvalue8.value.length; i++) {
+				if (edvalue8.value[i].value) {
+					newoptions.push(edvalue8.value[i])
+				}
+			}
+			edvalue8.value = newoptions;
+			editChildrensManege = mstr;
+			editChildrensManegeId = midstr;
 		}
 
 		let editChildrensSource = '';
@@ -1158,38 +1221,57 @@ export default {
 			editChildrensSource = key;
 		}
 
+		// 编辑多层子项目
 		const editChildsProject = () => {
+			api.getProjectDetail({ projectId: Number(state.currentEditChildrensProjectId) }).then(res => {
 				let obj = {
-				"attach": "",
+					"attach": res.data.data.projectInfo.attach,
-				"beginTime": 0,
+					"beginTime": Number(res.data.data.projectInfo.beginTime) / 1000,
-				"boeFlag": 0,
+					"boeFlag": res.data.data.projectInfo.boeFlag,
-				"category": editChildrensCategory,
+					"category": editChildrensCategory ? Number(editChildrensCategory) : res.data.data.projectInfo.category,
-				"courseSyncFlag": 0,
+					"courseSyncFlag": res.data.data.projectInfo.courseSyncFlag,
-				"endTime": 0,
+					"endTime": Number(res.data.data.projectInfo.endTime) / 1000,
-				"level": 0,
+					"level": res.data.data.projectInfo.level,
-				"manager": editChildrensManege,
+					"manager": editChildrensManege ? editChildrensManege.toString(",") : res.data.data.projectInfo.manager,
-				"managerId": editChildrensManegeId,
+					"managerId": editChildrensManegeId ? editChildrensManegeId.toString(",") : res.data.data.projectInfo.managerId,
-				"name": editChildrensName,
+					"name": editChildrensName ? editChildrensName : res.data.data.projectInfo.name,
-				"notice": "",
+					"notice": res.data.data.projectInfo.notice,
-				"noticeFlag": 0,
+					"noticeFlag": res.data.data.projectInfo.noticeFlag,
-				"parentId": 0,
+					"parentId": res.data.data.projectInfo.parentId,
-				"picUrl": "",
+					"picUrl": res.data.data.projectInfo.picUrl,
-				"projectId": state.currentEditChildrensProjectId,
+					"projectId": state.currentEditChildrensProjectId ? Number(state.currentEditChildrensProjectId) : res.data.data.projectInfo.projectId,
-				"remark": "",
+					"remark": res.data.data.projectInfo.remark,
-				"sourceBelongId": editChildrensSource,
+					"sourceBelongId": editChildrensSource ? Number(editChildrensSource) : res.data.data.projectInfo.sourceBelongId,
-				"status": 0,
+					"status": res.data.data.projectInfo.status,
-				"systemId": 0,
+					"systemId": res.data.data.projectInfo.systemId,
-				"templateId": 0,
+					"templateId": "",
-				"type": 2
+					"type": res.data.data.projectInfo.type
 				}
-
 				if (obj.name !== '' || obj.manager !== '' || obj.category !== '' || obj.sourceBelongId !== '') {
-				alert("我需要修改")
 					console.log("编辑多层子项目传递的参数", obj)
+					api.createProject(obj).then(ress => {
+						console.log(ress)
+						if (ress.status == 200 && ress.data.code == 200) {
 							state.eddoublesonpro = false;
+							message.destroy();
+							message.success("编辑成功");
+							getTableDate();
+						}
+					}).catch(err => {
+						console.log(err)
+						state.eddoublesonpro = false;
+						message.destroy();
+						message.error("编辑失败，请检查当前网络状态。");
+					})
 				} else {
 					state.eddoublesonpro = false;
 				}
+			}).catch(err => {
+				console.log(err)
+				state.eddoublesonpro = false;
+				message.destroy();
+				message.error("编辑失败，请检查当前网络状态。");
+			})
 		}
 
 		const closeeditModal3 = () => {
@@ -2001,7 +2083,7 @@ export default {
 											</div>
 										</a-select-option>
 										<a-select-option value="基础信息" label="基础信息">
-										<div onClick={()=>{
+											<div onClick={() => {
 												router.push({
 													path: "/taskpage",
 												});
@@ -2054,7 +2136,7 @@ export default {
 											</div>
 										</a-select-option>
 										<a-select-option value="基础信息" label="基础信息">
-										<div onClick={()=>{
+											<div onClick={() => {
 												router.push({
 													path: "/taskpage",
 												});
@@ -2097,7 +2179,7 @@ export default {
 											</div>
 										</a-select-option>
 										<a-select-option value="基础信息" label="基础信息">
-										<div onClick={()=>{
+											<div onClick={() => {
 												router.push({
 													path: "/taskpage",
 												});

src/views/projectcenter/TaskAdd.vue

@@ -2349,9 +2349,7 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center; // background-color: #bfa;
-        // .chosen {
+      
-        //   // background-color: pink;
-        // }
         .ghost {
           // background-color: red;
           opacity: 0 !important;