diff --git a/src/api/index1.js b/src/api/index1.js index 8e17b559..8043bd73 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-04 12:36:46 + * @LastEditTime: 2023-01-05 11:06:02 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -155,6 +155,14 @@ export const noticeList = (projectId) => // export const choiceEvaluation = (obj) => http.post('/evaluation/choiceEvaluation', obj); + +// 获取任务学员的信息 +export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, { params: obj }) + +// 考试导出任务学员信息 +export const exportTaskStudent = (obj) => http.post('/admin/student/exportTaskStudent', obj) + + // //面授课批量导入成绩 export const batchImportScore = (offcoursePlanId, obj) => http.post(`/admin/offcourse/batchImportScore?offcoursePlanId=${offcoursePlanId}`, obj); \ No newline at end of file diff --git a/src/api/indexTaskManage.js b/src/api/indexTaskManage.js index e5c8478a..f812131a 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) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 5c946c7d..3696b674 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -1,5 +1,6 @@ + diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 625ce787..173685a1 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,21 @@ export default { getData(); }; + {/* 导出数据 */} + function exportData() { + 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, + "type": 1 + }).then(res=>{ + console.log(res) + }).catch(err=>{ + console.log(err) + }) */} + } + return { ...toRefs(state), selectProjectName, @@ -369,7 +380,8 @@ export default { showEScoreModal, searchTableData, reseatTableData, - changePaginationStu + changePaginationStu, + exportData }; }, }; diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 77b3cb94..b5631d7c 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -152,7 +152,7 @@ import CKWork from "../CheckWork.vue"; import CQue from "../CheckQue.vue"; import EntryScores from "../EntryScores.vue"; // import * as api from "../../../api/index"; -import * as api from "../../../api/indexTaskManage"; +import * as api from "../../../api/index1"; export default { name: "ProjectFaceTaskManage", components: { @@ -548,7 +548,7 @@ export default { // 导出数据 function exportTaskStu() { api - .ExportTaskStudent({ + .exportTaskStudent({ pageNo: state.currentPage, pageSize: state.pageSize, currentStageId: props.projectTaskInfo.stageId, diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index eae31dc4..29dc41f2 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -113,9 +113,9 @@ hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" - :total="tableDataTotal2" + :total="tableDataTotal" class="pagination" - v-if="tableDataTotal2 > 10" + v-if="tableDataTotal > 10" @change="changePaginationStu" />
@@ -146,7 +146,7 @@ import CQue from "../CheckQue.vue"; // import EntryScores from "../EntryScores.vue"; import EScore from "../ExportScore.vue"; // import * as api from "../../../api/index"; -import * as api from "../../../api/indexTaskManage"; +import * as api from "../../../api/index1"; export default { name: "ProjectHomeWorkManage", components: { @@ -451,7 +451,7 @@ export default { // 导出数据 function exportTaskStu() { api - .ExportTaskStudent({ + .exportTaskStudent({ pageNo: state.currentPage, pageSize: state.pageSize, currentStageId: props.projectTaskInfo.stageId, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 8d58f717..2084ba37 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -36,7 +36,7 @@
起止时间：— @@ -298,7 +298,7 @@ export default { // 获取数据 function getData() { - if (props.datasource.type == 11) { + if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -306,6 +306,8 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, + taskId: props.datasource.projectTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -316,6 +318,8 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, + taskId: props.datasource.projectTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }) @@ -362,20 +366,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}&taskType=${props.datasource.type}`) + // 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..b4f764ca 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -36,7 +36,7 @@
起止时间：— @@ -298,7 +298,7 @@ export default { // 获取数据 function getData() { - if (props.datasource.type == 11) { + if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -306,6 +306,8 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -316,6 +318,8 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }) @@ -362,20 +366,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}&taskType=${props.datasource.type}`) + 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}&taskType=${props.datasource.type}`) + // 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 { 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/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index eb655985..13a3a7fd 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -61,8 +61,8 @@
催促考试
-
-
+
+
导出数据
- + - + @@ -1361,8 +1361,9 @@ export default { evaluationData: '', homeworkData: '', commonData: '', - commonLevelName: '' - + commonLevelName: '', + examLevelName: '', + evaluationLevelName: '' }); const levelList = reactive({ @@ -1637,16 +1638,18 @@ 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; // 考试弹框名称 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 d1bb6c63..cceb9b59 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' @@ -1123,6 +1123,8 @@ v-model:Evalvisible="Evalvisible" :title="showTestText" :projectTaskId="projectTaskId" + :itemsType="evaltype" + :datasource="evalData" /> @@ -2452,6 +2454,8 @@ export default { examData: "", commonData: "", commonLevelName: "", + evaltype: "", + evalData: "" }); const levelList = reactive({ @@ -2751,8 +2755,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; 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; };