mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-20 08:16:44 +08:00
教师端1期导出参数调整
This commit is contained in:
@@ -47,13 +47,8 @@
|
|||||||
|
|
||||||
<el-col :span="6" :offset="4">
|
<el-col :span="6" :offset="4">
|
||||||
<div class="grid-content bg-purple" style="text-align: right;">
|
<div class="grid-content bg-purple" style="text-align: right;">
|
||||||
<el-button
|
<el-button v-if="showSignupActions" type="primary" icon="el-icon-plus" style="margin-right: 10px;"
|
||||||
v-if="showSignupActions"
|
@click="handleAddSignupClick">
|
||||||
type="primary"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
style="margin-right: 10px;"
|
|
||||||
@click="handleAddSignupClick"
|
|
||||||
>
|
|
||||||
添加报名
|
添加报名
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="primary" icon="el-icon-upload2" @click="handleExportSignup">
|
<el-button type="primary" icon="el-icon-upload2" @click="handleExportSignup">
|
||||||
@@ -83,18 +78,10 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="signTime" label="报名时间"></el-table-column>
|
<el-table-column prop="signTime" label="报名时间"></el-table-column>
|
||||||
<el-table-column
|
<el-table-column v-if="showSignupActions" label="操作" width="140">
|
||||||
v-if="showSignupActions"
|
|
||||||
label="操作"
|
|
||||||
width="140"
|
|
||||||
>
|
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button type="text" size="mini" class="delete-action-link--danger"
|
||||||
type="text"
|
@click="handleDeleteSignup(scope.row)">
|
||||||
size="mini"
|
|
||||||
class="delete-action-link--danger"
|
|
||||||
@click="handleDeleteSignup(scope.row)"
|
|
||||||
>
|
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
@@ -253,19 +240,13 @@
|
|||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
<AudienceModal
|
<AudienceModal v-if="showSignupActions && hasCourseCrowds" :visible.sync="audienceDialogVisible"
|
||||||
v-if="showSignupActions && hasCourseCrowds"
|
@confirm="handleAudienceConfirm" :audience-ids="courseCrowds.map(item => item.groupId)" />
|
||||||
:visible.sync="audienceDialogVisible"
|
<SignupModal v-if="showSignupActions && !hasCourseCrowds" :visible.sync="addSignupVisible"
|
||||||
@confirm="handleAudienceConfirm"
|
@confirm="handleSignupCreate" />
|
||||||
:audience-ids="courseCrowds.map(item => item.groupId)"
|
|
||||||
/>
|
|
||||||
<SignupModal
|
|
||||||
v-if="showSignupActions && !hasCourseCrowds"
|
|
||||||
:visible.sync="addSignupVisible"
|
|
||||||
@confirm="handleSignupCreate"
|
|
||||||
/>
|
|
||||||
<!-- 学习详情 -->
|
<!-- 学习详情 -->
|
||||||
<el-dialog title="学习详情" :visible.sync="study.detailShow" class="common-course-dialog" width="900px" :append-to-body="true">
|
<el-dialog title="学习详情" :visible.sync="study.detailShow" class="common-course-dialog" width="900px"
|
||||||
|
:append-to-body="true">
|
||||||
<div>
|
<div>
|
||||||
<!-- <div v-if="study.detailType == 10"><auditCourse1 :isDetails="true" :isShow="false" :id="study.examineId"></auditCourse1></div>
|
<!-- <div v-if="study.detailType == 10"><auditCourse1 :isDetails="true" :isShow="false" :id="study.examineId"></auditCourse1></div>
|
||||||
<div v-if="study.detailType == 20"><auditCourse2 :isDetails="true" :isShow="false" :id="study.examineId"></auditCourse2></div> -->
|
<div v-if="study.detailType == 20"><auditCourse2 :isDetails="true" :isShow="false" :id="study.examineId"></auditCourse2></div> -->
|
||||||
@@ -308,8 +289,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog class="common-course-dialog" title="学习详情" v-if="commonResourceStudyPeopleShow" :visible.sync="commonResourceStudyPeopleShow"
|
<el-dialog class="common-course-dialog" title="学习详情" v-if="commonResourceStudyPeopleShow"
|
||||||
width="50%" :append-to-body="true">
|
:visible.sync="commonResourceStudyPeopleShow" width="50%" :append-to-body="true">
|
||||||
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
|
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
@@ -348,7 +329,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="queryResourceStudyPeopleList(true)">查 询</el-button>
|
<el-button type="primary" @click="queryCommonResource(true)">查 询</el-button>
|
||||||
<el-button @click="resetCommonResourceQuery">重 置</el-button>
|
<el-button @click="resetCommonResourceQuery">重 置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -393,8 +374,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog title="学习详情" class="common-course-dialog" v-if="examResourceStudyPeopleShow" :visible.sync="examResourceStudyPeopleShow" width="50%"
|
<el-dialog title="学习详情" class="common-course-dialog" v-if="examResourceStudyPeopleShow"
|
||||||
:append-to-body="true">
|
:visible.sync="examResourceStudyPeopleShow" width="50%" :append-to-body="true">
|
||||||
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
|
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
@@ -695,13 +676,21 @@ export default {
|
|||||||
loadSysTypes: "sysType/loadSysTypes",
|
loadSysTypes: "sysType/loadSysTypes",
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
queryCommonResource(flag) {
|
||||||
|
if (this.rousourceRow.contentType == "62") {
|
||||||
|
this.queryAssessStudyPeopleList(flag);
|
||||||
|
} else {
|
||||||
|
this.queryResourceStudyPeopleList(flag);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
// 查询课程详情,获取 crowds 信息
|
// 查询课程详情,获取 crowds 信息
|
||||||
getCourseDetailCrowds() {
|
getCourseDetailCrowds() {
|
||||||
if (!this.courseDetail || !this.courseDetail.id) return;
|
if (!this.courseDetail || !this.courseDetail.id) return;
|
||||||
apiCourse
|
apiCourse
|
||||||
.detail(this.courseDetail.id)
|
.detail(this.courseDetail.id)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log('res1', res);
|
console.log("res1", res);
|
||||||
const result = res.result || {};
|
const result = res.result || {};
|
||||||
this.courseCrowds = Array.isArray(result.crowds) ? result.crowds : [];
|
this.courseCrowds = Array.isArray(result.crowds) ? result.crowds : [];
|
||||||
})
|
})
|
||||||
@@ -722,28 +711,36 @@ export default {
|
|||||||
this.getSignupList();
|
this.getSignupList();
|
||||||
},
|
},
|
||||||
handleDeleteSignup(row) {
|
handleDeleteSignup(row) {
|
||||||
this.$confirm(`<i class="el-icon-warning-outline"></i>确定删除${row.name || ''}的报名记录吗?`, '删除确认', {
|
this.$confirm(
|
||||||
confirmButtonText: '确定',
|
`<i class="el-icon-warning-outline"></i>确定删除${
|
||||||
cancelButtonText: '取消',
|
row.name || ""
|
||||||
|
}的报名记录吗?`,
|
||||||
|
"删除确认",
|
||||||
|
{
|
||||||
|
confirmButtonText: "确定",
|
||||||
|
cancelButtonText: "取消",
|
||||||
dangerouslyUseHTMLString: true,
|
dangerouslyUseHTMLString: true,
|
||||||
type: 'warning',
|
type: "warning",
|
||||||
customClass: 'custom-confirm-dialog'
|
customClass: "custom-confirm-dialog",
|
||||||
}).then(() => {
|
}
|
||||||
apicourseStudy.deleteNewSignUp({
|
)
|
||||||
|
.then(() => {
|
||||||
|
apicourseStudy
|
||||||
|
.deleteNewSignUp({
|
||||||
id: row.id,
|
id: row.id,
|
||||||
courseId: this.courseDetail.id,
|
courseId: this.courseDetail.id,
|
||||||
studentId: row.aid
|
studentId: row.aid,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res && res.status === 200) {
|
if (res && res.status === 200) {
|
||||||
this.$showManageMessage("删除成功", 'success');
|
this.$showManageMessage("删除成功", "success");
|
||||||
this.getSignupList();
|
this.getSignupList();
|
||||||
} else if (res) {
|
} else if (res) {
|
||||||
this.$showManageMessage(res.message || "删除失败", 'error');
|
this.$showManageMessage(res.message || "删除失败", "error");
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
this.$showManageMessage("删除失败", 'error');
|
this.$showManageMessage("删除失败", "error");
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
@@ -761,7 +758,11 @@ export default {
|
|||||||
status: "",
|
status: "",
|
||||||
aid: [],
|
aid: [],
|
||||||
};
|
};
|
||||||
|
if (this.rousourceRow.contentType == "62") {
|
||||||
|
this.queryAssessStudyPeopleList();
|
||||||
|
} else {
|
||||||
this.queryResourceStudyPeopleList();
|
this.queryResourceStudyPeopleList();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
resetExamCommonResourceQuery() {
|
resetExamCommonResourceQuery() {
|
||||||
@@ -778,8 +779,6 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
handleShowResourdeDetailList(row) {
|
handleShowResourdeDetailList(row) {
|
||||||
console.log(row);
|
|
||||||
console.log(7777);
|
|
||||||
this.commonResourceStudyPeopleQuery = {
|
this.commonResourceStudyPeopleQuery = {
|
||||||
pageIndex: 1, //第几页
|
pageIndex: 1, //第几页
|
||||||
pageSize: 10, // 每页多少条
|
pageSize: 10, // 每页多少条
|
||||||
@@ -806,7 +805,7 @@ export default {
|
|||||||
|
|
||||||
queryExamStudyPeopleList(resetPage) {
|
queryExamStudyPeopleList(resetPage) {
|
||||||
if (resetPage) {
|
if (resetPage) {
|
||||||
this.examResourceStudyPeopleQuery.pageIndex = 1
|
this.examResourceStudyPeopleQuery.pageIndex = 1;
|
||||||
}
|
}
|
||||||
apicourseStudy
|
apicourseStudy
|
||||||
.contentsExam({
|
.contentsExam({
|
||||||
@@ -834,7 +833,11 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
queryAssessStudyPeopleList() {
|
queryAssessStudyPeopleList(resetPage) {
|
||||||
|
if (resetPage) {
|
||||||
|
this.commonResourceStudyPeopleQuery.pageIndex = 1;
|
||||||
|
|
||||||
|
}
|
||||||
apicourseStudy
|
apicourseStudy
|
||||||
.contentsAssess({
|
.contentsAssess({
|
||||||
courseId: this.courseDetail.id,
|
courseId: this.courseDetail.id,
|
||||||
@@ -863,7 +866,7 @@ export default {
|
|||||||
|
|
||||||
queryResourceStudyPeopleList(resetPage) {
|
queryResourceStudyPeopleList(resetPage) {
|
||||||
if (resetPage) {
|
if (resetPage) {
|
||||||
this.commonResourceStudyPeopleQuery.pageIndex = 1
|
this.commonResourceStudyPeopleQuery.pageIndex = 1;
|
||||||
}
|
}
|
||||||
apicourseStudy
|
apicourseStudy
|
||||||
.studyContentRecords({
|
.studyContentRecords({
|
||||||
@@ -942,7 +945,7 @@ export default {
|
|||||||
apicourseStudy
|
apicourseStudy
|
||||||
.studyExport({
|
.studyExport({
|
||||||
courseId: this.courseDetail.id,
|
courseId: this.courseDetail.id,
|
||||||
contentName: this.recourseListQuery.contentName
|
contentName: this.recourseListQuery.contentName,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.handleExport(
|
this.handleExport(
|
||||||
@@ -957,8 +960,10 @@ export default {
|
|||||||
courseId: this.courseDetail.id,
|
courseId: this.courseDetail.id,
|
||||||
aid: this.learningRecords.aid.join(","),
|
aid: this.learningRecords.aid.join(","),
|
||||||
status: this.learningRecords.status,
|
status: this.learningRecords.status,
|
||||||
queryStartTime: this.studyDateTime.length > 0 ? this.studyDateTime[0] : "",
|
queryStartTime:
|
||||||
queryFinishTime: this.studyDateTime.length > 1 ? this.studyDateTime[1] : "",
|
this.studyDateTime.length > 0 ? this.studyDateTime[0] : "",
|
||||||
|
queryFinishTime:
|
||||||
|
this.studyDateTime.length > 1 ? this.studyDateTime[1] : "",
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.handleExport(res, this.courseDetail.name + "的学习记录.xlsx");
|
this.handleExport(res, this.courseDetail.name + "的学习记录.xlsx");
|
||||||
@@ -977,7 +982,7 @@ export default {
|
|||||||
},
|
},
|
||||||
resetResourseList() {
|
resetResourseList() {
|
||||||
this.recourseListQuery.contentName = "";
|
this.recourseListQuery.contentName = "";
|
||||||
this.recourseListQuery.pageIndex = 1
|
this.recourseListQuery.pageIndex = 1;
|
||||||
this.recourseListQuery.pageSize = 10;
|
this.recourseListQuery.pageSize = 10;
|
||||||
this.getResourseList();
|
this.getResourseList();
|
||||||
},
|
},
|
||||||
@@ -1020,7 +1025,6 @@ export default {
|
|||||||
getResourseList(resetPage) {
|
getResourseList(resetPage) {
|
||||||
if (resetPage) {
|
if (resetPage) {
|
||||||
this.recourseListQuery.pageIndex = 1;
|
this.recourseListQuery.pageIndex = 1;
|
||||||
|
|
||||||
}
|
}
|
||||||
apiCoursePortal.pageListResource(this.recourseListQuery).then((rs) => {
|
apiCoursePortal.pageListResource(this.recourseListQuery).then((rs) => {
|
||||||
if (rs.status == 200) {
|
if (rs.status == 200) {
|
||||||
@@ -1116,12 +1120,21 @@ export default {
|
|||||||
handleSizeChangeStudyPeople(val) {
|
handleSizeChangeStudyPeople(val) {
|
||||||
this.commonResourceStudyPeopleQuery.pageSize = val;
|
this.commonResourceStudyPeopleQuery.pageSize = val;
|
||||||
this.commonResourceStudyPeopleQuery.pageIndex = 1;
|
this.commonResourceStudyPeopleQuery.pageIndex = 1;
|
||||||
|
if (this.rousourceRow.contentType == "62") {
|
||||||
|
this.queryAssessStudyPeopleList();
|
||||||
|
} else {
|
||||||
this.queryResourceStudyPeopleList();
|
this.queryResourceStudyPeopleList();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
handleCurrentChangeStudyPeople(val) {
|
handleCurrentChangeStudyPeople(val) {
|
||||||
this.commonResourceStudyPeopleQuery.pageIndex = val;
|
this.commonResourceStudyPeopleQuery.pageIndex = val;
|
||||||
//console.log('learningSituation.pageIndex',this.learningSituation.pageIndex);
|
//console.log('learningSituation.pageIndex',this.learningSituation.pageIndex);
|
||||||
|
if (this.rousourceRow.contentType == "62") {
|
||||||
|
this.queryAssessStudyPeopleList();
|
||||||
|
} else {
|
||||||
this.queryResourceStudyPeopleList();
|
this.queryResourceStudyPeopleList();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
handleSizeChangeSituation(val) {
|
handleSizeChangeSituation(val) {
|
||||||
this.learningSituation.pageSize = val;
|
this.learningSituation.pageSize = val;
|
||||||
@@ -1258,7 +1271,6 @@ export default {
|
|||||||
});
|
});
|
||||||
console.log(11111);
|
console.log(11111);
|
||||||
// this.study.list = list;
|
// this.study.list = list;
|
||||||
|
|
||||||
});
|
});
|
||||||
resolve();
|
resolve();
|
||||||
} else {
|
} else {
|
||||||
@@ -1313,15 +1325,15 @@ export default {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.delete-action-link--danger {
|
.delete-action-link--danger {
|
||||||
color: #E32E2E;
|
color: #e32e2e;
|
||||||
&:hover {
|
&:hover {
|
||||||
color: #E32E2E;
|
color: #e32e2e;
|
||||||
}
|
}
|
||||||
&:active {
|
&:active {
|
||||||
color: #E32E2E;
|
color: #e32e2e;
|
||||||
}
|
}
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #E32E2E;
|
color: #e32e2e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#courseManage {
|
#courseManage {
|
||||||
@@ -1338,24 +1350,24 @@ export default {
|
|||||||
.el-input {
|
.el-input {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
width: 89px;
|
width: 89px;
|
||||||
|
|
||||||
}
|
}
|
||||||
.el-input__inner {
|
.el-input__inner {
|
||||||
width: 89px;
|
width: 89px;
|
||||||
background: #F5F9FF;
|
background: #f5f9ff;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #DFDFDF;
|
border: 1px solid #dfdfdf;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.btn-prev, .btn-next {
|
.btn-prev,
|
||||||
|
.btn-next {
|
||||||
width: 28px;
|
width: 28px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
background: #F5F9FF;
|
background: #f5f9ff;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #DFDFDF;
|
border: 1px solid #dfdfdf;
|
||||||
// &:hover {
|
// &:hover {
|
||||||
// background: #4284F7;
|
// background: #4284F7;
|
||||||
// color: #FFFFFF;
|
// color: #FFFFFF;
|
||||||
@@ -1366,23 +1378,22 @@ export default {
|
|||||||
border: none;
|
border: none;
|
||||||
line-height: 44px;
|
line-height: 44px;
|
||||||
&:before {
|
&:before {
|
||||||
content: '......';
|
content: "......";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
.el-pager {
|
.el-pager {
|
||||||
.number {
|
.number {
|
||||||
min-width: 28px;
|
min-width: 28px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
background: #F5F9FF;
|
background: #f5f9ff;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #DFDFDF;
|
border: 1px solid #dfdfdf;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
margin: 0 4px;
|
margin: 0 4px;
|
||||||
&.active {
|
&.active {
|
||||||
background: #4284F7;
|
background: #4284f7;
|
||||||
color: #FFFFFF;
|
color: #ffffff;
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1394,14 +1405,13 @@ export default {
|
|||||||
.el-input__inner {
|
.el-input__inner {
|
||||||
width: 28px;
|
width: 28px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
background: #F5F9FF;
|
background: #f5f9ff;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #DFDFDF;
|
border: 1px solid #dfdfdf;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #000000;
|
color: #000000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1491,7 +1501,6 @@ export default {
|
|||||||
|
|
||||||
::v-deep.el-table .el-table__header-wrapper .el-table__header th {
|
::v-deep.el-table .el-table__header-wrapper .el-table__header th {
|
||||||
background: rgba(66, 132, 247, 0.1);
|
background: rgba(66, 132, 247, 0.1);
|
||||||
color: #60769D;
|
color: #60769d;
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user