From 3ce6154c69f8ab61ed750b708fc9a45e963bab3c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 13 Feb 2023 14:01:12 +0800 Subject: [PATCH 1/7] --fix bug --- src/views/courselibrary/courseModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 9ff30efe..a7132779 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -603,7 +603,7 @@ export default defineComponent({ state.statusTingQi = 1; if (param === "review") { //新建时点击审核按钮 - submitReview(res.data.data.offcourseId); + submitReview(res.data.data.id); } else { message.destroy(); message.success("保存成功"); From 808b0ca6fcba229a13a3ad092276f9dfb2f24c3e Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 14:49:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 5 +++-- src/views/learningpath/LevelAddDetail.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 6f9febbf..158437a1 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -327,7 +327,7 @@
任务大纲
@@ -340,7 +340,7 @@
- +
Date: Mon, 13 Feb 2023 14:54:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 51 +++++++------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 2332f1b7..7ed37d5f 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/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; }; From f2cdb1f0120aa8ce8baa918f05170b22a8e04e07 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 15:00:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E8=BF=94=E5=9B=9E=E6=97=B6=E4=BC=A0?= =?UTF-8?q?=E9=80=92routerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index a3bf687e..2442e94b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -181,7 +181,7 @@ :objData="routerInfo" @saveUnlock="saveUnlock" />
- +
返回
@@ -622,7 +622,7 @@ :objData="routerInfo" @saveUnlock="saveUnlock" />
- +
返回
@@ -857,7 +857,7 @@ 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"; @@ -891,9 +891,7 @@ export default { const route = useRoute(); const unlockModeModal = ref() const state = reactive({ - routerId: storage.get("routerId") - ? JSON.parse(storage.get("routerId")) - : route.query.routerId, + routerId: route.query.routerId, routerDetail: null, level: [ // { @@ -1775,6 +1773,7 @@ export default { setTimeout(() => { router.push({ path: "/leveladd", + query:{ routerId: state.routerId } }); }, 3000); } @@ -1796,6 +1795,7 @@ export default { setTimeout(() => { router.push({ path: "/leveladd", + query:{ routerId: state.routerId } }); }, 5000) } @@ -1817,6 +1817,7 @@ export default { } else { router.push({ path: "/leveladd", + query:{ routerId: state.routerId } }); } From 3f2331881767bfb0b6c56be5705ac46f95f9cb88 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 15:29:16 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 1a1c00e0..1650a1d6 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -408,9 +408,7 @@ height: 68px; display: flex; align-items: center; - justify-content: space-between; - " - > + justify-content: space-between;">
Date: Mon, 13 Feb 2023 16:04:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=AD=A6=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 158437a1..4fbb04e0 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -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; From cc87d06068fe59cf5a2b134a668af5ec9dd8e94b Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 16:08:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E6=B3=A8=E9=87=8A=E6=9C=AA=E7=94=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjCheckPower.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index 2e4271e9..e93999f4 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/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) => {