From 04d7a41b4801967fa7824a6b9808b4268a48dcdb Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 10:31:45 +0800 Subject: [PATCH 01/19] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E7=9C=8B=E5=AD=A6=E5=91=98=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E4=BF=A1=E6=81=AF=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ViewAssess.vue | 2 +- .../drawers/project/ProjectOnlineManage.vue | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index 20edd2b4..4d29d6dc 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -195,7 +195,7 @@ export default { console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ "assessmentSubmitId": props.datasource.assessmentSubmitId, - "courseId": props.basicdata.assessmentId, + "courseId": props.basicdata.id, "studentId": props.datasource.studentId }).then(res=>{ console.log(res) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index cdfe8fcc..a91832a5 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -128,6 +128,8 @@ --> + From a36f0b28b17238ae823513f0a5a2bd94fb78ad92 Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 24 Feb 2023 16:01:14 +0800 Subject: [PATCH 14/19] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AFmianbaoxie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BreadCrumb.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 2e610bf3..931f533c 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -430,6 +430,20 @@ export default { }, ]; } + if ( + n.indexOf("/sonproject") !== -1 || + n.indexOf("/SonProject") !== -1 + ) { + state.list = [ + { + name: "项目", + href: "", + }, + { + name: "基础信息", + }, + ]; + } } ); From a94403b751656393c7e357e7379e4df4e4fddcc8 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 16:18:24 +0800 Subject: [PATCH 15/19] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E8=AF=BE=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9C=A8=E7=BA=BF=E8=AF=BE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectOnlineManage.vue | 18 +++++++-------- .../drawers/router/RouterCommonManage.vue | 22 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 598c7b82..0750e77c 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -55,7 +55,7 @@ placeholder="请输入姓名" /> -
+
任务状态：
{ console.log(err) diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 171d61bc..e46e8099 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -55,7 +55,7 @@ placeholder="请输入姓名" />
-
+
任务状态：
{ console.log(err) From 8ae44aebebc677a631355e9a9d82e868c0d8e977 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 17:00:50 +0800 Subject: [PATCH 16/19] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE/=E9=A1=B9=E7=9B=AE-=E5=9C=A8=E7=BA=BF=E8=AF=BE?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectOnlineManage.vue | 8 ++++++-- src/components/drawers/router/RouterCommonManage.vue | 9 ++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 0750e77c..8217e1f7 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -493,8 +493,12 @@ export default { // 导出数据 function exportTaskStu() { - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) - // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) + if(props.datasource.type==1){ + {/* 在线课导出 */} + window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) + }else{ + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) + } } return { diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index e46e8099..3d01f886 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -462,9 +462,12 @@ export default { // 导出数据 function exportTaskStu() { - console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) - // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) + if(props.datasource.type==1){ + {/* 在线课导出 */} + window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`) + }else{ + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) + } } return { From f00c0c4e1c36dadd9b47ae365021a257edeeceb1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 24 Feb 2023 17:04:23 +0800 Subject: [PATCH 17/19] -- fix bug --- src/views/courselibrary/CoursewareManage.vue | 679 +++++++++---------- src/views/courselibrary/courseModal.vue | 5 +- 2 files changed, 332 insertions(+), 352 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index a35bcc18..2b4896e0 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -315,19 +315,23 @@ :pagination="false" :scroll="{x:'max-content'}" > -