From 9ddf4386b1251d16bc15ddcbfd6167c75f653533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Sat, 4 Mar 2023 18:38:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddTest.vue | 5 +++-- src/components/drawers/CommonTest.vue | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 4db19344..4d015200 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -211,8 +211,9 @@ 数据来源：
- +
diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue index 11c41043..f6e03c38 100644 --- a/src/components/drawers/CommonTest.vue +++ b/src/components/drawers/CommonTest.vue @@ -287,7 +287,7 @@ v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" placeholder="请输入数据来源" - :maxlength="120" + show-count :maxlength="420" />
From 965010ace1f948014b445bfe9baad0ac1b806a8c Mon Sep 17 00:00:00 2001 From: lpq Date: Sat, 4 Mar 2023 19:16:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterCommonManage.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 4f6ef758..d78015cb 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -500,6 +500,7 @@ export default { // 导出数据 function exportTaskStu() { + debugger 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}`) @@ -507,7 +508,7 @@ export default { {/* 评估导出 */} window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) }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}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) } } From f73a86b77733cadac86889f4332dfe75ce515f37 Mon Sep 17 00:00:00 2001 From: lixg Date: Sat, 4 Mar 2023 20:28:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 93159872..c559cfe2 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3465,7 +3465,7 @@ export default defineComponent({ const options4CurId = ref(""); const options4CurName = ref("张"); const of_hShow = () => { - state.offcourseId = ''; + state.offcourseId = ""; getTea(); if (state.of_hs == false) { state.of_hs = true; @@ -3839,7 +3839,11 @@ export default defineComponent({ key: "8", align: "center", customRender: ({ record }) => - record.assessmentStatus ? "已评估" : "未评估", + itm.courseScore === -1 + ? "-" + : record.assessmentStatus + ? "已评估" + : "未评估", }, { title: "评分", @@ -5245,8 +5249,8 @@ export default defineComponent({ } } .btn3:active { - background: #0982ff; - } + background: #0982ff; + } .btn3 { .search { width: 17px; @@ -6877,7 +6881,7 @@ export default defineComponent({ background: #4ea6ff; border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); - color:#fff; + color: #fff; display: flex; align-items: center; justify-content: center; From 2636f5cbcd3ef3f19e96520e36b5ce1a9b6a0ed0 Mon Sep 17 00:00:00 2001 From: caozc Date: Sat, 4 Mar 2023 22:42:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20type=3D2=20=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/router/RouterExaminationExternalManage.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index 943992bf..2d2e5611 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -117,7 +117,7 @@ @@ -397,6 +397,7 @@ // 获取数据 function getData() { state.loadingData = true; + console.log(JSON.stringify(props.datasource)) api.QueryExternalExamManageDetail({ chapterId: props.outchapter, pageNo: state.currentPage,