feat:合并

src/components/drawers/ProjCheckPower.vue

@@ -800,7 +800,7 @@ export default {
       state.searchOrgName = null;
       state.isSearchOrg = false;
       state.treeData2 = [];
-      getAudienceInfo();
+      // getAudienceInfo();
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -1164,23 +1164,23 @@ export default {
         });
       }
     };
-    getAudienceInfo();
+    // getAudienceInfo();
     //分页获取受众
     const changePagination1 = (page) => {
       //  console.log(page);
       state.currentPage2 = page;
-      getAudienceInfo();
+      // getAudienceInfo();
     };
     //搜索受众
     const searchAudienceInfo = () => {
       state.currentPage2 = 1;
-      getAudienceInfo();
+      // getAudienceInfo();
     };
     //重置受众
     const resetAudienceInfo = () => {
       state.currentPage2 = 1;
       state.audienceName = "";
-      getAudienceInfo();
+      // getAudienceInfo();
     };
     //受众关联 选中的数组
     const onSelectChange2 = (selectedRowKeys, item) => {

src/views/courselibrary/CoursewareManage.vue

@@ -927,7 +927,6 @@
                 style="width: 440px; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
                 :disabled-date="disabledDate"
-                :disabled-time="disabledRangeTime"
                 format="YYYY-MM-DD HH:mm"
                 v-model:value="xjkkinputV3"
                 separator="至"
@@ -1580,9 +1579,6 @@ import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import CommonStudent from "@/components/student/CommonStudent";
 import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
-// import StuAdd from "../../components/drawers/StuAdd";
-// import OwnPower from "../../components/drawers/OwnPower.vue";
-// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
 import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
 
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
@@ -1603,10 +1599,7 @@ import {
   addStudent,
   studentExport,
   handleStudent,
-  getMemberInfoApi,
+  getMemberInfoApi, copyCoursePlan,
-  copyCoursePlan,
-  // listReview,
-  // studyRecordList,
 } from "@/api/indexCourse";
 import {
   traverseArr,
@@ -1614,13 +1607,10 @@ import {
   newFile,
   getdateToDate,
 } from "../../utils/utils";
-// import { toDate } from "../../api/method.js";
 import { fileUp } from "../../api/indexEval";
-import dayjs from "dayjs";
 import * as api1 from "../../api/index1";
 
 import "@wangeditor/editor/dist/css/style.css";
-//import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import SeeModal from "./components/seeModal.vue";
@@ -1637,7 +1627,8 @@ import FJUpload from "@/components/common/FJUpload";
 import { updateStudent } from "@/api/indexProjStu";
 import { useStore } from "vuex";
 import DropDown from "@/components/common/DropDown";
-import { checkPer } from "@/utils/utils";
+import {checkPer} from "@/utils/utils";
+import dayjs from "dayjs";
 
 //列表表格
 const columns1 = [
@@ -3713,25 +3704,18 @@ export default defineComponent({
     //保存开课
 
     const handleSureStu = () => {
-      let startTime,
-        endTime = 0;
-      if (state.xjkkinputV3) {
-        startTime = parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
-        endTime = parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
-      }
       let t = state.signCom ? "1," : "0,";
       let p = state.comLeave ? "1" : "0";
       let type = t.concat(p);
       const postData = {
         offcourseId: state.offcourseId,
         offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
-
         address: state.xjkkinputV2,
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.attach,
-        beginTime: startTime,
+        beginTime: dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm:ss"),
+        endTime: dayjs(state.xjkkinputV3[1]).format( "YYYY-MM-DD HH:mm:ss"),
         completeType: type,
-        endTime: endTime,
         evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
         evaluateId: Number(state.assessmentId),
         testId: state.EditTestId,
@@ -3757,12 +3741,10 @@ export default defineComponent({
         console.log("state.addLoading ", state.addLoading);
       }
       state.addLoading = true;
-      editPlan(postData).then((res) => {
+      editPlan(postData).then(() => {
-        if (res.data.code === 200) {
+        getTableDate3();
-          getTableDate3();
+        handleCancelStu();
-          handleCancelStu();
+        rest();
-          rest();
-        }
         state.addLoading = false;
       });
     };

src/views/courselibrary/courseModal.vue

@@ -539,7 +539,6 @@ export default defineComponent({
     };
 
     const visibleOpen = (offcourseId, name) => {
-      console.log("offcourseId", offcourseId);
       state.offcourseId = offcourseId;
 
       if (state.offcourseId) {
@@ -702,7 +701,7 @@ export default defineComponent({
         message.destroy();
         return message.warning("课程名称重复，请重新填写");
       }
-      console.log("state.offcourseId", state.offcourseId);
+
       const postData = {
         id: state.offcourseId, //不传代表新增
         name: state.qdms_inputV1,

src/views/learningpath/LearningPath.vue

@@ -408,9 +408,7 @@
           height: 68px;
           display: flex;
           align-items: center;
-          justify-content: space-between;
+          justify-content: space-between;">
-        "
-      >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
             ><img src="../../assets/images/taskpage/pub.png"
@@ -1230,7 +1228,7 @@ export default {
           message.destroy();
           message.success("创建成功");
           state.lpLoading = false;
-          router.push( {path: "/leveladd",query:{routerId: id }})
+          router.push( {path: "/leveladd",query:{routerId: id.data.data }})
         })
     };
 

src/views/learningpath/LevelAdd.vue

@@ -327,7 +327,7 @@
               <div class="taskmain">任务大纲</div>
 
               <router-link
-                to="/leveladddetail"
+                :to="{ path: '/leveladddetail', query:{ routerId: routerId } }"
                 class="editright"
                 v-if="checkPer(permissions)"
               >
@@ -340,7 +340,7 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-              <router-link :to="{ path: '/leveladddetail' }">
+              <router-link :to="{ path: '/leveladddetail', query:{ routerId: routerId } }">
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -1969,7 +1969,7 @@ export default {
         routerId: state.routerId,
       };
       api
-        .getStudent(obj)
+        .getStuPage(obj)
         .then((res) => {
           console.log("获取学员列表", res);
           let data = res.data.data.rows || null;
@@ -2552,6 +2552,7 @@ export default {
       // console.log("state.taskSyllabus", state.taskSyllabus);
       router.push({
         path: "/leveladddetail",
+        query:{ routerId: state.routerId } 
       });
       //       if (state.taskSyllabus.length===1) {
       //         if(state.taskSyllabus[0].taskList.length===0){

src/views/learningpath/LevelAddDetail.vue

@@ -181,7 +181,7 @@
                   :objData="routerInfo" @saveUnlock="saveUnlock" />
               </div>
               <div class="line"></div>
-              <router-link to="/leveladd">
+              <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
                 <div style="display: flex">
                   <img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png" />
                   <div class="return">返回</div>
@@ -622,7 +622,7 @@
                   :objData="routerInfo" @saveUnlock="saveUnlock" />
               </div>
               <div class="line"></div>
-              <router-link to="/leveladd">
+              <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
                 <div style="display: flex">
                   <img class="img2" src="../../assets/images/leveladd/back.png" />
                   <div class="return">返回</div>
@@ -857,13 +857,13 @@ import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
 import * as api from "../../api/indexLevel";
 import { GetRouterDetail, changeChapterSort, changeTasklistSort, releaseRouter, cancelRouterTask } from "../../api/indexTask";
 import { message, Modal } from "ant-design-vue";
-import { storage } from "../../api/storage";
+// import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
 import { editRoutered } from '@/api/indexLearningPath'
 // import { RouterEditTask } from "@/api/indexTask";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
   name: "LevelAddDetail",
@@ -888,11 +888,10 @@ export default {
   },
   setup() {
     const router = useRouter();
+    const route = useRoute();
     const unlockModeModal = ref()
     const state = reactive({
-      routerId: storage.get("routerId")
+      routerId: route.query.routerId,
-        ? JSON.parse(storage.get("routerId"))
-        : null,
       routerDetail: null,
       level: [
         // {
@@ -1774,6 +1773,7 @@ export default {
           setTimeout(() => {
             router.push({
               path: "/leveladd",
+              query:{ routerId: state.routerId } 
             });
           }, 3000);
         }
@@ -1795,6 +1795,7 @@ export default {
                 setTimeout(() => {
                   router.push({
                     path: "/leveladd",
+                    query:{ routerId: state.routerId } 
                   });
                 }, 5000)
               }
@@ -1816,6 +1817,7 @@ export default {
       } else {
         router.push({
           path: "/leveladd",
+          query:{ routerId: state.routerId } 
         });
       }