From 6c7cff21134a6907bb54b88a95d278d4705983dc Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 4 Jan 2023 16:33:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E8=80=83=E8=AF=95=E7=AE=A1=E7=90=86=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/router/RouterExaminationManage.vue | 11 +++++++++++ src/views/learningpath/LevelAdd.vue | 11 ++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index eb655985..fef2f9a6 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -142,6 +142,10 @@ type: String, default: "", }, + levelName: { + type: String, + default: "", + }, projectTaskId: { type: Number, default: null, @@ -223,6 +227,13 @@ width: 60, align: "center", className: "h", + customRender: () => { + return ( +
+ {props.levelName} +
+ ); + }, }, { title: "考试次数", diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 1cd6b32d..f154b5ac 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -498,7 +498,7 @@ : item.type === 4 ? evaluationModel(item) : item.type === 5 - ? examinationModel(item) + ? examinationModel(item, value.name) : item.type === 10 ? homeworkModel(item) : null @@ -1106,7 +1106,7 @@ - + @@ -1361,8 +1361,8 @@ export default { evaluationData: '', homeworkData: '', commonData: '', - commonLevelName: '' - + commonLevelName: '', + examLevelName: '' }); const levelList = reactive({ @@ -1637,8 +1637,9 @@ export default { // 面授课弹框名称 RouterFaceTeachManage } // 考试点击管理弹框 - const examinationModel = (data) => { + const examinationModel = (data, levelname) => { console.log(data) + state.examLevelName = levelname; state.examinationModelVisible = true; state.examinationModelVisibleTitle = data.name; state.examinationData = data; From cd4fca6a0dffc2c2ad4f4959af8b6bd2d17a5f0c Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 4 Jan 2023 17:19:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E8=AF=84=E4=BC=B0=E7=9A=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ManagePage.vue | 53 +++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 65cba52e..4436ec14 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -27,23 +27,23 @@
评估名称: - 课程评估 + {{basicInfo.assessmentName}}
创建人: - 管理员 + {{basicInfo.createName}}
状态: - 已发布 + {{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}}
创建时间: - 2022-07-22 9:30 + {{basicInfo.createTime}}
发布时间: - 2022-07-22 9:30 + {{basicInfo.releaseTime}}
@@ -81,22 +81,49 @@ import ViewAssess from "../../components/drawers/ViewAssess"; import { reactive, toRefs } from "vue"; import { queryAssessmentDetailList } from "@/api/indexResearch"; import { useRouter } from "vue-router"; + export default { name: "ManagePage", components: { ViewAssess }, setup() { const router = useRouter(); - const getInfoDate = async () => { - let res = await queryAssessmentDetailList({ - assessmentId: router.currentRoute.value.params.id, - }); - console.log(res); - }; - getInfoDate(); - const state = reactive({ Assessvisible: false, + basicInfo: "" , + currentPage: 1, + pageSize: 10, + tableDataTotalLoading: true, + tabledata: [], + tableDataTotal: 0, + }); + + const getInfoDate = async () => { + state.tableDataTotalLoading = true; + await queryAssessmentDetailList({ + assessmentId: router.currentRoute.value.params.id, + }).then(res=>{ + console.log('获取评估信息', res); + if(res.data.code==200){ + state.basicInfo = res.data.data; + } + }).catch(err=>{ + console.log(err) + }); + + // 获取学员信息 + console.log('传递的请求学员信息的参数',{ + pageNo: state.currentPage, + pageSize: state.pageSize, + type: 3, + taskId: router.currentRoute.value.params.id, + pid: router.currentRoute.value.params.id + }) + // createName + }; + + getInfoDate(); + const showassess = () => { state.Assessvisible = true; }; From e52982d0d7a1e05fface30969c36073155dd05b2 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 4 Jan 2023 17:54:41 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?/=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E4=BB=BB=E5=8A=A1=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectOnlineManage.vue | 18 ++++-------------- .../drawers/router/RouterCommonManage.vue | 19 +++++-------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 8d58f717..61a9ce8a 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -306,6 +306,7 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, + taskId: props.datasource.projectTaskId, status: state.projectName, studentName: state.name, }); @@ -316,6 +317,7 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, + taskId: props.datasource.projectTaskId, status: state.projectName, studentName: state.name, }) @@ -362,20 +364,8 @@ export default { // 导出数据 function exportTaskStu() { - api - .ExportTaskStudent({ - pageNo: state.currentPage, - pageSize: state.pageSize, - currentStageId: props.datasource.stageId, - type: 1, - pid: props.datasource.projectId, - }) - .then((res) => { - console.log(res); - }) - .catch((err) => { - console.log(err); - }); + window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}`) + // window.open(`${process.env.VUE_APP_PROXY_URL}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}`) } return { diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index e25e1200..0f1bd82f 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -306,6 +306,7 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, status: state.projectName, studentName: state.name, }); @@ -316,6 +317,7 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, status: state.projectName, studentName: state.name, }) @@ -362,20 +364,9 @@ export default { // 导出数据 function exportTaskStu() { - api - .ExportTaskStudent({ - pageNo: state.currentPage, - pageSize: state.pageSize, - currentStageId: props.datasource.chapterId, - type: 2, - pid: props.datasource.routerId, - }) - .then((res) => { - console.log(res); - }) - .catch((err) => { - console.log(err); - }); + console.log(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`) + window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`) + // window.open(`${process.env.VUE_APP_PROXY_URL}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}`) } return { From 176aabf211194a4881bf70bd81e63a4fce6637cd Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 4 Jan 2023 18:15:58 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E8=80=83=E8=AF=95?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=89=8D=E6=96=B9=E9=80=89=E6=8B=A9=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=80=83=E8=AF=95=E5=AF=BC=E5=87=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTaskManage.js | 4 +-- .../drawers/project/ProjectExamManage.vue | 25 +++++++++++++----- .../router/RouterExaminationManage.vue | 26 +++++++++++++------ 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/api/indexTaskManage.js b/src/api/indexTaskManage.js index a06f82f1..6eba43cb 100644 --- a/src/api/indexTaskManage.js +++ b/src/api/indexTaskManage.js @@ -8,5 +8,5 @@ export const ExamManagementMessage = (obj) => http.post('/admin/exam/manage/quer // 获取评估管理的信息 export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, {params: obj}) -// 导出学员信息 -export const ExportTaskStudent = (obj) => http.get('/admin/student/exportTaskStudent', {params: obj}) \ No newline at end of file +// 考试导出学员信息 +export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', obj) \ No newline at end of file diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 625ce787..fe3daa11 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -61,7 +61,7 @@
催促考试
-
+
导出数据
@@ -90,10 +90,6 @@ :loading="loadingData" :scroll="{ x: 900 }" :pagination="false" - :row-selection="{ - selectedRowKeys: selectedRowKeys, - onChange: onSelectChange, - }" />
@@ -189,7 +185,7 @@ export default { dataIndex: "studentCode", key: "studentCode", width: 50, - align: "left", + align: "center", className: "h head" }, { @@ -358,6 +354,20 @@ export default { getData(); }; + {/* 导出数据 */} + function exportData() { + api.ExportExam({ + "chapterId": props.datasource.chapterId, + "targetId": props.datasource.routerId, + "taskId": props.datasource.courseId, + "type": 1 + }).then(res=>{ + console.log(res) + }).catch(err=>{ + console.log(err) + }) + } + return { ...toRefs(state), selectProjectName, @@ -369,7 +379,8 @@ export default { showEScoreModal, searchTableData, reseatTableData, - changePaginationStu + changePaginationStu, + exportData }; }, }; diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index fef2f9a6..ab81a563 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -61,8 +61,8 @@
催促考试
-
-
+
+
导出数据
-
+
- -
- +
+
+ +
- - + +
+ diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index a5219c52..096b5661 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -2,14 +2,16 @@
-
【测评】{{ title }}
+
+ 【测评】{{ title }} +
-
起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00
+
+ 起止时间：— +
+
+ 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} +
-
-
姓名：
- -
-
-
任务状态：
-
- +
+
+
姓名：
+ +
+
+
任务状态：
+
+ +
@@ -59,69 +71,54 @@
-
催促测评
+
催促学习
-
+
导出数据
- -
+
- -
- +
+
+ +
- - + +
- \ No newline at end of file + \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index f595fe92..a243885d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -500,7 +500,7 @@ : item.type === 5 ? examinationModel(item, value.name) : item.type === 10 - ? evaluationModel(item) + ? evaluationModel(item, value.name) : null " > @@ -1110,7 +1110,7 @@ - + @@ -1362,7 +1362,8 @@ export default { homeworkData: '', commonData: '', commonLevelName: '', - examLevelName: '' + examLevelName: '', + evaluationLevelName: '' }); const levelList = reactive({ @@ -1646,8 +1647,9 @@ export default { // 考试弹框名称 RouterExaminationManage } // 测评点击管理弹框 - const evaluationModel = (data) => { + const evaluationModel = (data, levelname) => { console.log(data) + state.evaluationLevelName = levelname; state.evaluationModelVisible = true; state.evaluationModelVisibleTitle = data.name; state.evaluationData = data; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 72ee857a..b6935e1d 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -625,7 +625,7 @@ : item.type == '5' ? showTest(item.name, item.projectTaskId, item) : item.type == '10' - ? showEval(item.name, item.projectTaskId) + ? showEval(item.name, item.projectTaskId, item.type, item) : item.type == '12' ? showWork(item.name, item.projectTaskId) : item.type == '13' @@ -1122,6 +1122,8 @@ v-model:Evalvisible="Evalvisible" :title="showTestText" :projectTaskId="projectTaskId" + :itemsType="evaltype" + :datasource="evalData" /> @@ -2451,6 +2453,8 @@ export default { examData: "", commonData: "", commonLevelName: "", + evaltype: "", + evalData: "" }); const levelList = reactive({ @@ -2749,8 +2753,10 @@ export default { state.projectTaskId = id; }; //测评抽屉 - const showEval = (name, id) => { + const showEval = (name, id, type, datasource) => { console.log("点击测评"); + state.evaltype = type; + state.evalData = datasource; state.Evalvisible = true; state.showTestText = name; state.projectTaskId = id; From bfe493a47bcd1e41ea4fb95502f7f218f971fda8 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 5 Jan 2023 10:09:48 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 5 +++-- src/components/drawers/router/RouterExaminationManage.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index fe3daa11..173685a1 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -356,7 +356,8 @@ export default { {/* 导出数据 */} function exportData() { - api.ExportExam({ + window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) + {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, "taskId": props.datasource.courseId, @@ -365,7 +366,7 @@ export default { console.log(res) }).catch(err=>{ console.log(err) - }) + }) */} } return { diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index ab81a563..13a3a7fd 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -376,7 +376,8 @@ {/* 导出数据 */} function exportData() { - api.ExportExam({ + window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) + {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, "taskId": props.datasource.courseId, @@ -385,7 +386,7 @@ console.log(res) }).catch(err=>{ console.log(err) - }) + }) */} } return { ...toRefs(state),