From 22302962095746b6dead04d5daf9dbc286b62a2a Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 15 Feb 2023 18:07:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E9=98=B6=E6=AE=B5id?= =?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/router/RouterCommonManage.vue | 8 ++++++-- .../RouterExaminationExternalManage.vue | 6 +++++- .../drawers/router/RouterVoteManage.vue | 8 ++++++-- src/views/learningpath/LevelAdd.vue | 20 +++++++++++++------ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 8148c4b0..bc5360cb 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -159,6 +159,10 @@ export default { type: Number, default: null, }, + outchapter: { + type: Number, + default: null, + }, datasource: { type: Object, default: function () { @@ -386,7 +390,7 @@ export default { console.log("我是传递的查询参数", { "pageNo": state.currentPage, "pageSize": state.pageSize, - "chapterId": props.datasource.chapterId, + "chapterId": props.outchapter, "status": state.projectName, "studentName": state.name, "taskId": props.datasource.courseId, @@ -397,7 +401,7 @@ export default { api.QueryOnlineManagementDetail({ "pageNo": state.currentPage, "pageSize": state.pageSize, - "chapterId": props.datasource.chapterId, + "chapterId": props.outchapter, "status": state.projectName, "studentName": state.name, "targetId":props.datasource.routerId, diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index f55ccf44..41006a32 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -159,6 +159,10 @@ return {}; }, }, + outchapter: { + type: Number, + default: null, + }, }, setup(props, ctx) { @@ -378,7 +382,7 @@ function getData() { state.loadingData = true; api.QueryExternalExamManageDetail({ - chapterId: props.datasource.chapterId, + chapterId: props.outchapter, pageNo: state.currentPage, pageSize: state.pageSize, status: state.projectName, diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index 86e4ce7c..fd5d03c8 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -158,6 +158,10 @@ return {}; }, }, + outchapter: { + type: Number, + default: null, + }, }, setup(props, ctx) { @@ -381,7 +385,7 @@ console.log("我是传递的查询参数", { "pageNo": state.currentPage, "pageSize": state.pageSize, - "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, + "chapterId": props.datasource.stageId=="0"?"":props.outchapter, "status": state.projectName, "studentName": state.name, "targetId":props.datasource.projectId, @@ -391,7 +395,7 @@ api.QueryVoteManagementDetail({ "pageNo": state.currentPage, "pageSize": state.pageSize, - "chapterId": props.datasource.chapterId, + "chapterId": props.outchapter, "status": state.projectName, "studentName": state.name, "targetId":props.datasource.routerId, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 9ce80e98..384c3015 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -531,17 +531,17 @@ item.type === 6 || item.type === 11 || item.type === 9 - ? commonModel(item, value.name) + ? commonModel(item, value.name, value.chapterId) : item.type === 2 ? faceTeachModel(item) : item.type === 4 ? homeworkModel(item) : item.type === 5 - ? examinationModel(item, value.name) + ? examinationModel(item, value.name, value.chapterId) : item.type === 10 ? evaluationModel(item, value.name) : item.type === 12 - ? voteModel(item, value.name) + ? voteModel(item, value.name, value.chapterId) : item.type === 13 ? projectModel(item, value.name) : null @@ -1303,6 +1303,7 @@ v-model:ExaminationExaminaModelVisible="examinationExaminaModelVisible" :title="examinationModelVisibleTitle" :datasource="examinationData" + :outchapter="outchapter" :levelName="examLevelName" /> @@ -1329,6 +1330,7 @@ v-model:CommonModelVisible="commonModelVisible" :title="commonModelVisibleTitle" :datasource="commonData" + :outchapter="outchapter" :levelName="commonLevelName" /> @@ -1338,6 +1340,7 @@ v-model:VoteModelVisible="voteModelVisible" :title="voteModelVisibleTitle" :datasource="voteData" + :outchapter="outchapter" :levelName="voteLevelName" /> @@ -1592,6 +1595,7 @@ export default { projectModelVisible: false, faceTeachModelVisibleTitle: "", examinationModelVisibleTitle: "", + outchapter:"", evaluationModelVisibleTitle: "", homeworkModelVisibleTitle: "", commonModelVisibleTitle: "", @@ -1902,11 +1906,12 @@ export default { // 面授课弹框名称 RouterFaceTeachManage }; // 考试点击管理弹框 - const examinationModel = (data, levelname) => { + const examinationModel = (data, levelname, outchapterid) => { console.log(data); if (data.startTime == null && data.endTime == null) { // 外部考试 state.examinationExaminaModelVisible = true; + state.outchapter = outchapterid; } else { // 系统考试 state.examinationModelVisible = true; @@ -1926,12 +1931,13 @@ export default { // 测评弹框名称 RouterEvaluationManage }; // 投票点击管理弹框 - const voteModel = (data, levelname) => { + const voteModel = (data, levelname, outchapterid) => { console.log(data); state.voteLevelName = levelname; state.voteModelVisible = true; state.voteModelVisibleTitle = data.name; state.voteData = data; + state.outchapter = outchapterid; // 投票弹框名称 RouterVoteManage }; // 项目点击管理弹框 @@ -1952,12 +1958,13 @@ export default { // 作业弹框名称 RouterHomeworkManage }; // 在线、案例、外链、评估、直播、活动点击管理弹框 - const commonModel = (data, levelname) => { + const commonModel = (data, levelname, outchapterid) => { state.commonLevelName = levelname; console.log(data); state.commonModelVisible = true; state.commonModelVisibleTitle = data.name; state.commonData = data; + state.outchapter = outchapterid; // 公共模块弹框名称 RouterCommonManage }; @@ -2283,6 +2290,7 @@ export default { state.nodata = false; } let data = res.data.data.chapterList; + console.log('----------------111111111111111-----------------2222222222', res.data.data.chapterList) state.stage = res.data.data.chapterList.map((e) => ({ id: e.chapterId, name: e.name,