Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/AddCase.vue

@@ -316,13 +316,11 @@ export default {
         for (let i = 0; i < state.apiTaskList.length; i++) {
           apiTask
             .addTask({
-              courseId: state.apiTaskList[i].caseid,
+              courseId: Number(state.apiTaskList[i].casesId),
-              duration: 0,
+              name: state.apiTaskList[i].title,
-              flag: true,
-              name: state.apiTaskList[i].caseName,
               projectTaskId: props.projectTaskId,
-              projectTemplateId: props.projectTemplateId,
+              projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
-              stageId: props.chooseStageId || 0,
+              stageId: Number(props.chooseStageId) || 0,
               type: 3,
             })
             .then(() => {

src/components/drawers/AddOnline.vue

@@ -499,7 +499,7 @@ export default {
           .catch((err) => {
             console.log(err);
           });
-      } else if (props.isLevel === 2) {
+      } else if (props.isLevel == 2) {
         console.log("我是要便利的数据2", state.addOnlineList);
         let p_data = state.addOnlineList;
         let p_data_id = [];
@@ -556,24 +556,28 @@ export default {
             console.log(err);
           });
       } else if (props.isLevel == 3) {
-        addTempTask({
+        state.addOnlineList.map((value) => {
-          courseId: state.onlineClassesId,
+          console.log( props, props.projectTemplateId,props.projectTaskId)
-          name: state.onlineName,
+          addTempTask({
-          projectTemplateId: props.projectTemplateId,
+            courseId: value.num,
-          projectTaskId: props.projectTaskId || 0,
+            name: value.name,
-          stageId: props.chooseStageId || 0,
+            projectTemplateId: localStorage.getItem("projectTemplateId"),
-          type: 1,
+            projectTaskId: props.projectTaskId || 0,
-        })
+            stageId: props.chooseStageId || 0,
-          .then(() => {
+            type: 1,
-            message.destroy();
-            message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
-            ctx.emit("changeData", false);
-            closeDrawer();
           })
-          .catch(() => {
+            .then((res) => {
-            message.destroy();
+              console.log('新增或者编辑在线课',res)
-            message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+              message.destroy();
-          });
+              message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+              ctx.emit("changeData", false);
+              closeDrawer();
+            })
+            .catch(() => {
+              message.destroy();
+              message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+            });
+        })
       }
       //if(state.addOnlineList.Target==undefined){
       // closeDrawer();

src/views/projectcenter/LibraryAdd.vue

@@ -56,7 +56,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
-              <router-link to="/temTask" class="edit">
+              <router-link class="edit" :to="{ path: `/temTask`, query: { projectId: projectId } }">
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -956,6 +956,7 @@ export default defineComponent({
           state.picUrl = res.data.data.projectTemplateInfo.picUrl;
           state.projectInfo.attach = res.data.data.projectTemplateInfo.attach;
           state.projectInfo.category = res.data.data.projectTemplateInfo.category;
+          state.projectId = res.data.data.projectTemplateInfo.projectTemplateId;
           try{
             state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
           }catch{

src/views/projectcenter/temTask.vue

@@ -175,6 +175,7 @@
                 @changeData="updateTableData"
                 :isLevel="isLevel"
                 v-model:edit="edit"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -198,6 +199,7 @@
                 @changeData="updateTableData"
                 :isLevel="isLevel"
                 v-model:edit="edit"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -221,6 +223,7 @@
                 @changeData="updateTableData"
                 :isLevel="isLevel"
                 v-model:edit="edit"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -244,6 +247,7 @@
                 @changeData="updateTableData"
                 v-model:isLevel="isLevel"
                 v-model:edit="edit"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:EditWorkId="EditWorkId"
@@ -267,6 +271,7 @@
                 @changeData="updateTableData"
                 :isLevel="isLevel"
                 v-model:edit="edit"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:EditTestId="EditTestId"
@@ -289,6 +294,7 @@
                 v-model:addliveVisible="addlivevisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:edit="edit"
@@ -312,6 +318,7 @@
                 v-model:addrefVisible="addrefvisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:edit="edit"
@@ -335,6 +342,7 @@
                 v-model:adddiscussVisible="adddiscussvisible"
                 v-model:edit="edit"
                 :isLevel="isLevel"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:EditDiscussId="EditDiscussId"
@@ -357,6 +365,7 @@
               <add-active
                 v-model:addactiveVisible="addactivevisible"
                 v-model:projectTemplateId="projectTemplateId"
+                v-model:projectId="projectId"
                 v-model:EditActiveId="EditActiveId"
                 v-model:projectTaskId="projectTaskId"
                 v-model:edit="edit"
@@ -382,6 +391,7 @@
                 @changeData="updateTableData"
                 v-model:edit="edit"
                 :isLevel="isLevel"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -405,6 +415,7 @@
                 @changeData="updateTableData"
                 v-model:edit="edit"
                 :isLevel="isLevel"
+                v-model:projectId="projectId"
                 v-model:projectTemplateId="projectTemplateId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -428,6 +439,7 @@
                   @getData="changeVData"
                   v-model:edit="edit"
                   :isLevel="isLevel"
+                  v-model:projectId="projectId"
                   v-model:projectTemplateId="projectTemplateId"
                   v-model:chooseStageId="chooseStageId"
                   v-model:projectTaskId="projectTaskId"
@@ -1059,7 +1071,7 @@ import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 // import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -1118,8 +1130,10 @@ export default {
     // UnlockMode,
   },
   setup() {
+    const route = useRoute();
     const router = useRouter();
     const state = reactive({
+      projectId: route.query.projectId,
       projectTemplateId: storage.get("projectTemplateId")
         ? JSON.parse(storage.get("projectTemplateId"))
         : null,
@@ -1391,6 +1405,9 @@ export default {
       console.log(array)
       if(array[0].id=='0'){
         state.level = [];
+        // state.tableData = array[0]
+        // 当无阶段任务出现时 显示当前数据
+        getTableData(array[0].taskList)
       }else{
         state.level = array;
       }
@@ -1790,6 +1807,7 @@ export default {
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
     const showDrawerOnline = (id, eleId) => {
+      console.log(id, eleId)
       state.addonlinevisible = true;
       state.EditOnlineId = id;
       state.projectTaskId = eleId;