一期问题修改

This commit is contained in:
赵依梦
2025-12-16 18:13:21 +08:00
committed by joshen
parent 3995bedf77
commit fd515269ea
5 changed files with 102 additions and 43 deletions

View File

@@ -13,12 +13,13 @@
<!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
<div>
<el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
<el-tab-pane lazy label="报名记录" name="second">
<el-tab-pane label="报名记录" name="second">
<el-row style="margin: 20px 0;" :gutter="20">
<el-col :span="4">
<div class="grid-content bg-purple">
<!-- <el-input v-model="signup.name" clearable placeholder="姓名" maxlength="50" /> -->
<NameFilterSelect @handleNameChange="aids => signup.aid = aids" ref="signupNameFilter" @handleClose="signup.aid = []" />
<NameFilterSelect @handleNameChange="aids => signup.aid = aids" ref="signupNameFilter"
@handleClose="signup.aid = []" />
<!-- <el-select :key="2" style="width:100%" clearable multiple v-model="signup.aid" filterable
placeholder="姓名" v-limit-input="50" remote reserve-keyword :remote-method="initNameList"
:multiple-limit="5" :loading="nameListLoading">
@@ -111,14 +112,12 @@
</div>
</el-col>
<el-col :span="6">
<el-col style="width: 270px;">
<div
:class="['grid-content', 'bg-purple', 'resetDatePicker', !studyDateTime||studyDateTime.length==0?'noSplitDatePicker':'']">
<el-date-picker style="width: 100%;" value-format="yyyy-MM-dd" v-model="studyDateTime" type="daterange"
align="right" unlink-panels range-separator="" start-placeholder="学习时长"
:picker-options="pickerOptions">
<el-date-picker value-format="yyyy-MM-dd" v-model="studyDateTime" type="daterange" align="right"
unlink-panels range-separator="" start-placeholder="学习时长" :picker-options="pickerOptions">
</el-date-picker>
</div>
</el-col>
<el-col :span="5">
@@ -127,7 +126,7 @@
<el-button @click="resetStudyRecords()"> </el-button>
</div>
</el-col>
<el-col :span="4" :offset="1">
<el-col style="float: right; width:185px">
<div class="grid-content bg-purple" style="text-align: right;">
<el-button type="primary" icon="el-icon-upload2" @click="handleExportStudyDetail">导出学习课程记录</el-button>
</div>
@@ -276,7 +275,8 @@
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
<el-col :span="6">
<div class="grid-content bg-purple">
<NameFilterSelect ref="commonResourceStudyPeopleNameFilter" @handleNameChange="aids => commonResourceStudyPeopleQuery.aid = aids"
<NameFilterSelect ref="commonResourceStudyPeopleNameFilter"
@handleNameChange="aids => commonResourceStudyPeopleQuery.aid = aids"
@handleClose="commonResourceStudyPeopleQuery.aid = []" />
<!-- <el-select :key="3" style="width:100%" clearable multiple v-model="commonResourceStudyPeopleQuery.aid"
@@ -294,7 +294,13 @@
<el-col :span="6">
<div class="grid-content bg-purple">
<el-select style="width: 100%;" v-model="commonResourceStudyPeopleQuery.status"
:placeholder="rousourceRow.contentType == '60' || rousourceRow.contentType == '62' ? '完成状态' : '学习状态'"
v-if="rousourceRow.contentType == '60' || rousourceRow.contentType == '62'" :placeholder="'完成状态'"
clearable>
<el-option label="已完成" :value="2"></el-option>
<el-option label="未完成" :value="4"></el-option>
</el-select>
<el-select style="width: 100%;" v-else v-model="commonResourceStudyPeopleQuery.status" placeholder="学习状态"
clearable>
<el-option label="未开始" :value="1"></el-option>
<el-option label="已完成" :value="2"></el-option>
@@ -324,7 +330,7 @@
<el-table-column
:label="rousourceRow.contentType == '60' || rousourceRow.contentType == '62' ? '完成状态' : '学习状态'">
<template slot-scope="scope">
{{ recourseStudyStatusEnum[scope.row.status] }}
{{ rousourceRow.contentType == '60' || rousourceRow.contentType == '62' ? (scope.row.status == '9'?'已完成': '未完成') : recourseStudyStatusEnum[scope.row.status] }}
</template>
</el-table-column>
<el-table-column v-if="rousourceRow.contentType != '60' && rousourceRow.contentType != '62'" prop="progress"
@@ -354,7 +360,8 @@
<el-row style="margin: 20px 0 20px -10px;" :gutter="20">
<el-col :span="6">
<div class="grid-content bg-purple">
<NameFilterSelect ref="examResourceStudyPeopleNameFilter" @handleNameChange="aids => examResourceStudyPeopleQuery.aid = aids"
<NameFilterSelect ref="examResourceStudyPeopleNameFilter"
@handleNameChange="aids => examResourceStudyPeopleQuery.aid = aids"
@handleClose="examResourceStudyPeopleQuery.aid = []" />
<!--
<el-select :key="4" style="width:100%" clearable multiple v-model="examResourceStudyPeopleQuery.aid"
@@ -696,7 +703,7 @@ export default {
status: this.examResourceStudyPeopleQuery.status,
aid: this.examResourceStudyPeopleQuery.aid.join(","),
})
.then(async(res) => {
.then(async (res) => {
if (res.status === 200) {
let ids = [];
res.result.list.forEach((item) => {
@@ -723,7 +730,7 @@ export default {
status: this.commonResourceStudyPeopleQuery.status,
aid: this.commonResourceStudyPeopleQuery.aid.join(","),
})
.then(async(res) => {
.then(async (res) => {
if (res.status === 200) {
let ids = [];
res.result.list.forEach((item) => {
@@ -752,7 +759,7 @@ export default {
status: this.commonResourceStudyPeopleQuery.status,
aid: this.commonResourceStudyPeopleQuery.aid.join(","),
})
.then(async(res) => {
.then(async (res) => {
if (res.status === 200) {
let ids = [];
res.result.list.forEach((item) => {
@@ -794,7 +801,11 @@ export default {
contentId: data.contentId,
})
.then((res) => {
this.handleExport(res, `${this.courseDetail.name}${data.contentName}.zip`, "application/zip");
this.handleExport(
res,
`${this.courseDetail.name}${data.contentName}.zip`,
"application/zip"
);
});
} else if (data.contentType == "61") {
// 考试导出
@@ -804,7 +815,10 @@ export default {
contentId: data.contentId,
})
.then((res) => {
this.handleExport(res, `${this.courseDetail.name}${data.contentName}.xlsx`);
this.handleExport(
res,
`${this.courseDetail.name}${data.contentName}.xlsx`
);
});
}
},
@@ -814,7 +828,10 @@ export default {
courseId: this.courseDetail.id,
})
.then((res) => {
this.handleExport(res, this.courseDetail.name + "的资源学习情况.xlsx");
this.handleExport(
res,
this.courseDetail.name + "的资源学习情况.xlsx"
);
});
},
handleExportStudyDetail() {
@@ -846,7 +863,7 @@ export default {
this.getResourseList();
},
resetStudyRecords() {
this.$refs.learningRecordsNameFilter.handleReset()
this.$refs.learningRecordsNameFilter.handleReset();
this.learningRecords.aid = [];
this.learningRecords.name = "";
this.learningRecords.status = "";
@@ -857,7 +874,7 @@ export default {
},
resetSignupList() {
this.$refs.signupNameFilter.handleReset()
this.$refs.signupNameFilter.handleReset();
this.signup = {
name: "",
signType: "",
@@ -1015,7 +1032,7 @@ export default {
this.studyDateTime.length > 1 ? this.studyDateTime[1] : "",
aid: this.learningRecords.aid.join(","),
};
apicourseStudy.studyRecords(params).then(async(res) => {
apicourseStudy.studyRecords(params).then(async (res) => {
if (res.status === 200) {
let ids = [];
res.result.list.forEach((item) => {
@@ -1073,6 +1090,7 @@ export default {
aid: this.signup.aid.join(","),
};
console.log(11111);
apicourseStudy.findSignup(params).then(async (res) => {
if (res.status === 200) {
let ids = [];
@@ -1103,9 +1121,11 @@ export default {
});
console.log(11111);
// this.study.list = list;
resolve();
});
resolve();
} else {
resolve();
this.$showMessage(res.message, "error");
}
});
@@ -1121,7 +1141,6 @@ export default {
this.getSignupList();
},
handleTabClick(tab) {
if (tab.name === "second") {
this.getSignupList();
} else if (tab.name === "third") {
@@ -1132,7 +1151,7 @@ export default {
this.getResourseList();
}
this.tabName = tab.name;
this.tabName = tab.name;
},
showStudyDetails(row) {
this.studyDetailQuery.courseId = row.courseId;
@@ -1169,6 +1188,9 @@ export default {
}
}
.resetDatePicker {
.el-range-input {
text-align: left;
}
.el-date-editor {
width: 255px;
}