Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/views/courselibrary/CoursewareManage.vue

@@ -871,7 +871,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="至"
@@ -1491,9 +1490,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";
@@ -1515,8 +1511,6 @@ import {
   studentExport,
   handleStudent,
   getMemberInfoApi, copyCoursePlan,
-  // listReview,
-  // studyRecordList,
 } from "@/api/indexCourse";
 import {
   traverseArr,
@@ -1524,13 +1518,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";
@@ -1548,6 +1539,7 @@ import { updateStudent } from "@/api/indexProjStu";
 import { useStore } from "vuex";
 import DropDown from "@/components/common/DropDown";
 import {checkPer} from "@/utils/utils";
+import dayjs from "dayjs";
 
 //列表表格
 const columns1 = [
@@ -3622,25 +3614,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,
@@ -3666,12 +3651,10 @@ export default defineComponent({
         console.log("state.addLoading ", state.addLoading);
       }
       state.addLoading = true;
-      editPlan(postData).then((res) => {
-        if (res.data.code === 200) {
-          getTableDate3();
-          handleCancelStu();
-          rest();
-        }
+      editPlan(postData).then(() => {
+        getTableDate3();
+        handleCancelStu();
+        rest();
         state.addLoading = false;
       });
     };
@@ -3680,7 +3663,7 @@ export default defineComponent({
     const handelEditStu = async (itm) => {
       console.log(itm);
 
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
       state.offcoursePlanId = itm.offcoursePlanId;
 
       const item = await detailPlan({
@@ -3759,7 +3742,7 @@ export default defineComponent({
     };
     const handelGuan = (itm) => {
       console.log("开课信息", itm);
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
       state.offcoursePlanId = itm.offcoursePlanId;
       state.studentId = itm.studentId;
       state.studentItem = itm;
@@ -3839,7 +3822,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
 
       handle({
         offcourseId: state.offcourseId,
@@ -4219,7 +4202,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
 
       const item = await detail({
         offcourseId: Number(state.offcourseId),
@@ -4255,14 +4238,14 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
 
       state.delete_hs = true;
       state.copy_hs = true;
     };
     const handleCopyP = async (itm) => {
       console.log(itm);
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
       state.offcoursePlanId = itm.offcoursePlanId;
 
       state.delete_hs = true;
@@ -4273,7 +4256,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
 
       state.delete_hs = true;
       state.nouse_hs = true;
@@ -4283,7 +4266,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = itm.offcourseId;
+      state.offcourseId = itm.id;
 
       handle({
         offcourseId: state.offcourseId,
@@ -4301,7 +4284,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      state.offcourseId = item.offcourseId;
+      state.offcourseId = item.id;
       state.newCourseName = item.name;
       getTableDate3();
 
@@ -4409,7 +4392,7 @@ export default defineComponent({
       console.log(787666, item);
       state.faceClassification = item.contentTxt;
       state.faceStatus = item.kkty;
-      state.currentFaceId = item.offcourseId;
+      state.currentFaceId = item.id;
       getCourseStudentList();
       state.newCourseName = item.name;
     };