Merge branch 'zcwy-zsx0223'

src/components/drawers/AddOpenCourse.vue

@@ -429,8 +429,9 @@ import AddHomework from "@/components/drawers/CommonHomework.vue";
 import AddTest from "@/components/drawers/CommonTest.vue";
 import NameInput from "@/components/project/NameInputNew";
 import AssessmentList from "@/components/drawers/AssessmentList.vue";
-import {COURSE_PLAN_EDIT, COURSE_PLAN_PAGE, DEL_PLAN, EXAM_DETAIL, WORK_DETAIL,PROJECT_DETAIL_MODIFY,PROJECT_RELEASE} from "@/api/apis";
+import {COURSE_PLAN_EDIT, COURSE_PLAN_PAGE, DEL_PLAN, EXAM_DETAIL, WORK_DETAIL,PROJECT_DETAIL_MODIFY,PROJECT_RELEASE,ROUTER_DETAIL_MODIFY} from "@/api/apis";
 import dayjs from "dayjs";
+import { GetRouterDraftDetail,releaseRouter } from "@/api/indexTask";
 import BaseTable from "@/components/common/BaseTable";
 import {request,useRowsPageNoInit} from "@/api/request";
 import dialog from "@/utils/dialog";
@@ -754,6 +755,16 @@ const confirm = async()=>{
   }
   emit('call-parent-method');
   }
+  if(route.query.routerId){
+    await GetRouterDraftDetail(route.query.routerId).then((res)=>{
+      projectInfo.value = res.data.data
+    })
+    request(ROUTER_DETAIL_MODIFY, { ...projectInfo.value });
+  if(projectInfo.value.routerInfo.status==1){ 
+    await releaseRouter(route.query.routerId);
+  }
+    emit('call-parent-method');
+  }
   
 }
 
@@ -883,7 +894,17 @@ async function coursePlanConfirm() {
       request(PROJECT_RELEASE, {projectId: route.query.projectId})
     }
     emit('call-parent-method');
-
+  }
+  if(route.query.routerId){
+    await GetRouterDraftDetail(route.query.routerId).then((res)=>{
+      projectInfo.value = res.data.data
+    })
+    console.log(projectInfo.value,'ite2545m')
+  request(ROUTER_DETAIL_MODIFY, { ...projectInfo.value });
+  if(projectInfo.value.routerInfo.status==1){ 
+    await releaseRouter(route.query.routerId);
+  }
+  emit('call-parent-method');
   }
   handleCancelStu();
   tableRef.value.fetch();

src/views/learningpath/LevelAdd.vue

@@ -510,6 +510,14 @@
                               <DownOutlined />
                             </a>
                         </div>
+                        <div
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="openCourse(item,key)"
+                          v-if="item.type == 2"
+                        >
+                          开课
+                        </div>
                       <div
                         class="operation"
                         style="cursor: pointer"
@@ -1436,9 +1444,12 @@
       :type="2"
       :routerId="routerId"
     />
+    <AddOpenCourse @call-parent-method="getTaskListAll" ref="coursePlanRef" :type="2"/>
   </div>
 </template>
 <script lang="jsx">
+import * as apitl from "../../api/index";
+import AddOpenCourse from "@/components/drawers/AddOpenCourse.vue";
 import { ref, reactive, toRefs, onMounted, createVNode, watch } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { message, Modal } from "ant-design-vue";
@@ -1455,7 +1466,7 @@ import SeeStu from "../../components/drawers/SeeStu";
 import { useRouter, useRoute } from "vue-router";
 import { getRouterOverview } from "@/api/indexLearningPath";
 import { handleLearnPath } from "../../api/index1";
-import { GetRouterDetail } from "@/api/indexTask";
+import { GetRouterDetail,GetRouterDraftDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
 import { editRouteredDoc } from "../../api/indexLearningPath";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
@@ -1500,15 +1511,22 @@ export default {
     RouterCommonManage,
     RouterVoteManage,
     RouterProjectManage,
+    AddOpenCourse
   },
   setup() {
+    const getTaskListAll = () =>{
+      state.addLoading = true;
+      getOverview();
+      myGetRouterDetail();
+      reget();
+    }
     const exportScore = (item) => {
       window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/export?assessmentIds=${item.assessmentIds}&pid=${item.id}`)
     };
     const coursePlanRef = ref();
     const openCourse = async (item,index) => {
-      await apitl.getDraftTask({projectId: item.projectId}).then((item)=>{
-        coursePlanRef.value.openDrawer(item.data.data.stageList[0].taskDraftDtoList[index]);
+      await GetRouterDraftDetail(state.routerId).then((item)=>{
+        coursePlanRef.value.openDrawer(item.data.data.chapterList[0].draftTaskList[index]);
       })
     }
     const qrCodeItems = ref([]);
@@ -3151,6 +3169,7 @@ export default {
       coursePlanRef,
       openCourse,
       exportScore,
+      getTaskListAll
     };
   },
 };
@@ -4740,7 +4759,7 @@ export default {
           position: relative;
           margin-left: auto;
           margin-right: 10px;
-          // min-width: 90px;
+          min-width: 90px;
         }
         //flex-grow: 1;
         .operation {