From 2e50bfe8a559eeb7978d2b4f9af33780f75ed82f Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 20 Feb 2023 20:46:43 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 6833149f..e0fa3030 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -102,7 +102,7 @@ dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm"); } - return current && current < dayjs().endOf('day'); + // return current && current < dayjs().endOf('day'); + return current && current < dayjs().subtract(1, 'days').endOf('day') }; function calendarChange(date, dateStr, partial) { From b1325b2786d491fc2dc37c952569f6794d93b6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Mon, 20 Feb 2023 21:23:26 +0800 Subject: [PATCH 02/12] =?UTF-8?q?BUG=20=20=E6=B7=BB=E5=8A=A0=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E4=BB=BB=E5=8A=A1=20=20=E5=B0=81=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=81=E5=9B=9E=E6=94=BE=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E6=B2=A1=E4=BA=86=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLive.vue | 9 ++++++--- src/views/courselibrary/CoursewareManage.vue | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index ab5ed21b..015d2272 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -284,7 +284,7 @@ 评估：
- 需要评估
@@ -338,6 +338,9 @@ const removePG = () => { const getchange = (mess) => { console.log(mess); //输出true或者false }; +const getchanges = (mess) => { + console.log(mess); //输出true或者false +}; const props = defineProps({ type: Number, taskList: [], @@ -355,7 +358,7 @@ const formData = ref({ liveCover: "", beforeSignIn: "", afterSignIn: "", - isEvaluate: "", + isEvaluate: false, assessmentId: "", assessmentName: "", livePlayback: "", @@ -375,7 +378,7 @@ const rulesRef = ref({ { type: "url", required: true, - message: "请输入直播链接", + message: "请输入合法的直播链接", }, ], liveStartTime: [ diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 00d716a1..69dcb6af 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3353,12 +3353,12 @@ export default defineComponent({ if (state.selectTime) { // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000); // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000); - beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm') + beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss') // toDate( // new Date(state.selectTime[0].$d).getTime() / 1000, // "Y-M-D h:m:s" // ); - endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm') + endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss') // toDate( // new Date(state.selectTime[1].$d).getTime() / 1000, // "Y-M-D h:m:s" From b987f7137c6bc5e2bfd8b8cc6a695b15c547e48a Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 20 Feb 2023 21:35:52 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectHomeWorkManage.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 2485d93f..e9897153 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -133,7 +133,7 @@ @@ -511,7 +511,7 @@ export default { pid: props.projectTaskInfo.projectId, status: state.projectName, studentName: state.name, - taskId: props.projectTaskInfo.projectTaskId, + taskId: props.projectTaskInfo.id, taskType: props.projectTaskInfo.type, }); api @@ -523,7 +523,7 @@ export default { pid: props.projectTaskInfo.projectId, status: state.projectName, studentName: state.name, - taskId: props.projectTaskInfo.projectTaskId, + taskId: props.projectTaskInfo.id, taskType: props.projectTaskInfo.type, }) .then((res) => { @@ -585,7 +585,7 @@ export default { // pageNo: state.currentPage, // pageSize: state.pageSize, // currentStageId: props.projectTaskInfo.stageId, - // currentTaskId: props.projectTaskInfo.projectTaskId, + // currentTaskId: props.projectTaskInfo.id, // type: 1, // pid: props.projectTaskInfo.projectId, // }) @@ -603,7 +603,7 @@ export default { let obj = { currentStageId: props.projectTaskInfo.stageId, pid: props.projectTaskInfo.projectId, - taskId: props.projectTaskInfo.projectTaskId, + taskId: props.projectTaskInfo.id, taskType: props.projectTaskInfo.type, type: 1, }; @@ -634,7 +634,7 @@ export default { }/admin/student/exportHomeWork?currentStageId=${ props.projectTaskInfo.stageId }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ - props.projectTaskInfo.projectTaskId + props.projectTaskInfo.id }&taskType=${props.projectTaskInfo.type}` ); } From 7e6c6a95dc2b122214c6030aa58d6c74f69d7ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Mon, 20 Feb 2023 22:44:00 +0800 Subject: [PATCH 04/12] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTaskadd.js | 2 ++ src/components/drawers/NoticePub.vue | 4 ++-- src/views/projectcenter/TaskPage.vue | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 1cda04a2..1c5ed0b8 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -14,6 +14,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa //新建或编辑项目 export const editProj = (obj) => http.post('/admin/project/edit', obj) + +export const editProjs = (obj) => http.post('/admin/project/editStatus', obj) //编辑项目共享文档 export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj) diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index abced042..51040d0a 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -62,7 +62,7 @@ - + - \ No newline at end of file diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index e81fa5e6..911202b5 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -594,7 +594,7 @@ export default { let obj = { currentStageId: props.datasource.chapterId, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, type: 2, }; From 329ce8797a2698911f4a78df202b146f0a0fa86d Mon Sep 17 00:00:00 2001 From: lpq Date: Mon, 20 Feb 2023 23:38:30 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ExportScore.vue | 4 ++-- src/components/drawers/router/RouterHomeworkManage.vue | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index c06a1061..f0b8ef14 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -362,6 +362,7 @@ export default { } }; function downTemplate() { + debugger window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=${props.id || ''}&type=${props.type || ''}&pid=${props.pid || ''}&thirdType=3`); } @@ -380,7 +381,7 @@ export default { }, }; - + - \ No newline at end of file diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 911202b5..b22f5acb 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -10,7 +10,7 @@ >
-
【作业111】{{ title }}
+
【作业】{{ title }}
@@ -482,6 +482,7 @@ export default { state.ASOvervisible = true; }; const showEntryScore = () => { + debugger state.Evisible = true; }; //催促学员学习 @@ -603,6 +604,7 @@ export default { .then((res) => { console.log("导出作业", res.data.data); if (res.data.code === 200) { + debugger // message.destroy(); // message.success("导出作业成功"); state.exportHomeWorkV = true; From 7c21e69667d35e12641d6e233bdb6836f700ce16 Mon Sep 17 00:00:00 2001 From: lpq Date: Tue, 21 Feb 2023 00:39:58 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=B5=8B=E8=AF=84=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ExportScore.vue | 1 - src/components/drawers/router/RouterEvaluationManage.vue | 9 ++++----- src/components/drawers/router/RouterFaceTeachManage.vue | 1 - src/components/drawers/router/RouterHomeworkManage.vue | 1 - src/views/learningpath/LearningPath.vue | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index f0b8ef14..dca1f0f7 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -362,7 +362,6 @@ export default { } }; function downTemplate() { - debugger window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=${props.id || ''}&type=${props.type || ''}&pid=${props.pid || ''}&thirdType=3`); } diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 4c1747db..d1bb41d2 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -22,7 +22,7 @@
+ > 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
@@ -348,8 +348,8 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, - taskType: props.datasource.type, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -360,7 +360,7 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -660,4 +660,3 @@ export default { } } - \ No newline at end of file diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 314c28c2..06944e6c 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -621,7 +621,6 @@ export default { //导出作业 function exportHomeWork() { console.log("props.datasource", props.datasource); - debugger window.open( `${ process.env.VUE_APP_BASE_API diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index b22f5acb..03379783 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -482,7 +482,6 @@ export default { state.ASOvervisible = true; }; const showEntryScore = () => { - debugger state.Evisible = true; }; //催促学员学习 diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 8120163e..3c85088b 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1286,7 +1286,6 @@ export default { //编辑学习路径图 const editLearnPath = async () => { - debugger if (!state.pathName) { message.destroy(); return message.warning("请输入路径图名称"); @@ -1455,7 +1454,6 @@ export default { // state.imgData = ; // } }); - debugger const imgData = computed(() => store.state.router_pic); //添加权限 watch( From 7e6cc4160505dcaf8972fe9217ba3408286a410e Mon Sep 17 00:00:00 2001 From: lpq Date: Tue, 21 Feb 2023 00:42:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/router/RouterProjectManage.vue | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue index 5f8f797e..253846fa 100644 --- a/src/components/drawers/router/RouterProjectManage.vue +++ b/src/components/drawers/router/RouterProjectManage.vue @@ -23,7 +23,7 @@ v-if="datasource.type !== 6 && datasource.type !== 9" class="endtime" > - +
@@ -48,7 +48,7 @@ placeholder="请选择" :options="projectNameList" @change="selectProjectName" - + >
@@ -160,7 +160,7 @@ }, }, }, - + setup(props, ctx) { const state = reactive({ visible: props.PjModelVisible, @@ -171,7 +171,7 @@ tableDataTotal: 0, projectName: undefined, projectNameList: [ - + { id: 1, value: "1", @@ -195,9 +195,9 @@ courseID: "", - routerId: '', - studentId: '', - CheckStuvisible: false, + routerId: '', + studentId: '', + CheckStuvisible: false, }); const tableDataFunc = () => { const columns = [ @@ -239,7 +239,7 @@ key: "studentDepartName", width: "20%", align: "center", - + className: "h", ellipsis: true, customRender: (text) => { @@ -378,7 +378,7 @@ () => { {/* 当前学员 用来查看学员详情 */} state.routerId = value.record.routerId; - state.studentId = value.record.studentId; + state.studentId = value.record.studentId; state.CheckStuvisible = true; console.log(value); }}> @@ -390,7 +390,7 @@ ]; return columns; }; - + const closeDrawer = () => { ctx.emit("update:PjModelVisible", false); state.currentPage = 1; @@ -417,7 +417,7 @@ const onChange = (pageNumber) => { console.log("Page: ", pageNumber); }; - + // 获取数据 function getData() { if(props.datasource.type === 13){ @@ -428,7 +428,7 @@ currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -449,7 +449,7 @@ state.tabledata = []; } } - + // 搜索按钮 function searchTaskList() { state.currentPage = 1; @@ -464,20 +464,20 @@ state.projectName = undefined; getData(); } - + //分页 const changePaginationStu = (page) => { state.tableDataTotalLoading = true; state.currentPage = page; getData(); }; - + // 导出数据 function exportTaskStu() { console.log(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`) window.open(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`) } - + return { ...toRefs(state), selectProjectName, @@ -496,7 +496,7 @@ }, }; - + - \ No newline at end of file From 20220b650081c099c8f2e42058ec4f933150203e Mon Sep 17 00:00:00 2001 From: lpq Date: Tue, 21 Feb 2023 01:00:06 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=80=83=E5=8D=B7=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterHomeworkManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 03379783..a5fef447 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -521,6 +521,7 @@ export default { studentName: state.name, }) .then((res) => { + debugger console.log("获取作业管理学员", res); if (res.data.code == 200) { let newData = []; From ff791d205950f9562015f304ecc10fac1323ac0e Mon Sep 17 00:00:00 2001 From: lpq Date: Tue, 21 Feb 2023 01:02:37 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=A7=8B=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterHomeworkManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index a5fef447..ca4dd63c 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -443,6 +443,7 @@ export default { }} >