mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-19 07:46:43 +08:00
教师端1期问题修复
This commit is contained in:
@@ -20,23 +20,20 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-select v-model="signup.signType" placeholder="报名方式" clearable>
|
<el-select style="width: 100%;" v-model="signup.signType" placeholder="报名方式" clearable>
|
||||||
<el-option label="自主报名" :value="1"></el-option>
|
<el-option label="自主报名" :value="1"></el-option>
|
||||||
<el-option label="手动加入" :value="2"></el-option>
|
<el-option label="手动加入" :value="2"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="6">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="getSignupList()">查 询</el-button>
|
<el-button type="primary" @click="getSignupList()">查 询</el-button>
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="2">
|
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button @click="resetSignupList()">重 置</el-button>
|
<el-button @click="resetSignupList()">重 置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6" :offset="6">
|
|
||||||
|
<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 type="primary" icon="el-icon-upload2" @click="handleExportSignup">导出报名记录</el-button>
|
<el-button type="primary" icon="el-icon-upload2" @click="handleExportSignup">导出报名记录</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -73,18 +70,18 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="学习记录" name="third">
|
<el-tab-pane label="学习记录" name="third">
|
||||||
<el-row style="margin-bottom: 20px;" :gutter="5">
|
<el-row style="margin-bottom: 20px;" :gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<div class="grid-content bg-purple"><el-input clearable v-model="learningRecords.name" maxlength="50"
|
<div class="grid-content bg-purple"><el-input clearable v-model="learningRecords.name" maxlength="50"
|
||||||
placeholder="姓名"></el-input></div>
|
placeholder="姓名"></el-input></div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-select v-model="learningRecords.status" clearable placeholder="全部学习状态">
|
<el-select style="width: 100%;" v-model="learningRecords.status" clearable placeholder="全部学习状态">
|
||||||
<el-option label="未开始学习" :value="1"></el-option>
|
<el-option label="未开始" :value="1"></el-option>
|
||||||
<el-option label="学习中" :value="2"></el-option>
|
<el-option label="进行中" :value="2"></el-option>
|
||||||
<el-option label="已终止" :value="8"></el-option>
|
|
||||||
<el-option label="学习完成" :value="9"></el-option>
|
<el-option label="已完成" :value="9"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -97,17 +94,13 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="5">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="getStudyRecords()">查 询</el-button>
|
<el-button type="primary" @click="getStudyRecords()">查 询</el-button>
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="2">
|
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button @click="resetStudyRecords()">重 置</el-button>
|
<el-button @click="resetStudyRecords()">重 置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4" :offset="2">
|
<el-col :span="4" :offset="1">
|
||||||
<div class="grid-content bg-purple" style="text-align: right;">
|
<div class="grid-content bg-purple" style="text-align: right;">
|
||||||
<el-button type="primary" icon="el-icon-upload2" @click="handleExportStudyDetail">导出学习课程记录</el-button>
|
<el-button type="primary" icon="el-icon-upload2" @click="handleExportStudyDetail">导出学习课程记录</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -126,14 +119,14 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="addTime" label="学习时间"></el-table-column>
|
<el-table-column prop="addTime" label="学习时间"></el-table-column>
|
||||||
<el-table-column prop="totalDuration" label="学习时长(分)">
|
<el-table-column prop="totalDuration" label="学习时长">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.totalDuration == 0? '0': (scope.row.totalDuration/60).toFixed(2)}}
|
{{ scope.row.totalDuration }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="学习状态">
|
<el-table-column label="学习状态">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ studyStatusEnum[scope.row.status] }}
|
{{ recourseStudyStatusEnum[scope.row.status] }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="progress" label="学习进度">
|
<el-table-column prop="progress" label="学习进度">
|
||||||
@@ -159,22 +152,18 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="资源学习情况" name="first">
|
<el-tab-pane label="资源学习情况" name="first">
|
||||||
<el-row style="margin-bottom: 20px;">
|
<el-row style="margin-bottom: 20px;" :gutter="20">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<div class="grid-content bg-purple"><el-input clearable v-model="recourseListQuery.contentName"
|
<div class="grid-content bg-purple"><el-input clearable v-model="recourseListQuery.contentName"
|
||||||
placeholder="资源名称"></el-input></div>
|
placeholder="资源名称"></el-input></div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="5">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button style="margin-left: 20px;" type="primary" @click="getResourseList">搜索</el-button>
|
<el-button type="primary" @click="getResourseList">搜索</el-button>
|
||||||
|
<el-button @click="resetResourseList">重置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="6" :offset="9">
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button style="margin-left: 20px;" @click="resetResourseList">重置</el-button>
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="6" :offset="10">
|
|
||||||
<div class="grid-content bg-purple" style="text-align: right;">
|
<div class="grid-content bg-purple" style="text-align: right;">
|
||||||
<el-button type="primary" icon="el-icon-upload2" @click="handleExportStudyResource">导出资源学习记录</el-button>
|
<el-button type="primary" icon="el-icon-upload2" @click="handleExportStudyResource">导出资源学习记录</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -226,7 +215,12 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="status" label="学习状态">
|
<el-table-column prop="status" label="学习状态">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ studyStatusEnum[scope.row.status] }}</span>
|
<span>{{ recourseStudyStatusEnum[scope.row.status] }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="status" label="学习时长">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.row.studyDuration }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="duration" label="学习进度">
|
<el-table-column prop="duration" label="学习进度">
|
||||||
@@ -258,20 +252,16 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-select v-model="commonResourceStudyPeopleQuery.status" placeholder="完成状态" clearable>
|
<el-select style="width: 100%;" v-model="commonResourceStudyPeopleQuery.status" placeholder="完成状态" clearable>
|
||||||
<el-option label="未开始" :value="1"></el-option>
|
<el-option label="未开始" :value="1"></el-option>
|
||||||
<el-option label="已完成" :value="2"></el-option>
|
<el-option label="已完成" :value="2"></el-option>
|
||||||
<el-option label="进行中" :value="3"></el-option>
|
<el-option label="进行中" :value="3"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="8">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="queryResourceStudyPeopleList">查 询</el-button>
|
<el-button type="primary" @click="queryResourceStudyPeopleList">查 询</el-button>
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="4">
|
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button @click="resetCommonResourceQuery">重 置</el-button>
|
<el-button @click="resetCommonResourceQuery">重 置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -324,21 +314,17 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-select v-model="examResourceStudyPeopleQuery.status" placeholder="完成状态" clearable>
|
<el-select style="width: 100%;" v-model="examResourceStudyPeopleQuery.status" placeholder="完成状态" clearable>
|
||||||
<el-option label="未开始" :value="1"></el-option>
|
<el-option label="未开始" :value="1"></el-option>
|
||||||
<el-option label="已完成" :value="2"></el-option>
|
<el-option label="已完成" :value="2"></el-option>
|
||||||
<el-option label="进行中" :value="3"></el-option>
|
<el-option label="进行中" :value="3"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="8">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="queryExamStudyPeopleList">查 询</el-button>
|
<el-button type="primary" @click="queryExamStudyPeopleList">查 询</el-button>
|
||||||
</div>
|
<el-button @click="resetExamCommonResourceQuery">重 置</el-button>
|
||||||
</el-col>
|
|
||||||
<el-col :span="4">
|
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button @click="resetExamCommonResourceQuery">重 置</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -411,30 +397,11 @@ export default {
|
|||||||
return {
|
return {
|
||||||
pickerOptions: {
|
pickerOptions: {
|
||||||
shortcuts: [
|
shortcuts: [
|
||||||
{
|
{
|
||||||
text: "最近一周",
|
text: "今年以来",
|
||||||
onClick(picker) {
|
onClick(picker) {
|
||||||
const end = new Date();
|
const end = new Date();
|
||||||
const start = new Date();
|
const start = new Date(end.getFullYear(), 0, 1);
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
||||||
picker.$emit("pick", [start, end]);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: "最近一个月",
|
|
||||||
onClick(picker) {
|
|
||||||
const end = new Date();
|
|
||||||
const start = new Date();
|
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
||||||
picker.$emit("pick", [start, end]);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
text: "最近三个月",
|
|
||||||
onClick(picker) {
|
|
||||||
const end = new Date();
|
|
||||||
const start = new Date();
|
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
||||||
picker.$emit("pick", [start, end]);
|
picker.$emit("pick", [start, end]);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -447,6 +414,36 @@ export default {
|
|||||||
picker.$emit("pick", [start, end]);
|
picker.$emit("pick", [start, end]);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: "最近三个月",
|
||||||
|
onClick(picker) {
|
||||||
|
const end = new Date();
|
||||||
|
const start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
||||||
|
picker.$emit("pick", [start, end]);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "最近一个月",
|
||||||
|
onClick(picker) {
|
||||||
|
const end = new Date();
|
||||||
|
const start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||||
|
picker.$emit("pick", [start, end]);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
text: "最近一周",
|
||||||
|
onClick(picker) {
|
||||||
|
const end = new Date();
|
||||||
|
const start = new Date();
|
||||||
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||||
|
picker.$emit("pick", [start, end]);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
studyDateTime: [],
|
studyDateTime: [],
|
||||||
@@ -595,7 +592,15 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
handleShowResourdeDetailList(row) {
|
handleShowResourdeDetailList(row) {
|
||||||
this.resetCommonResourceQuery();
|
console.log(row);
|
||||||
|
console.log(7777);
|
||||||
|
this.commonResourceStudyPeopleQuery = {
|
||||||
|
pageIndex: 1, //第几页
|
||||||
|
pageSize: 10, // 每页多少条
|
||||||
|
count: 0,
|
||||||
|
name: "",
|
||||||
|
status: "",
|
||||||
|
};
|
||||||
this.rousourceRow = row;
|
this.rousourceRow = row;
|
||||||
if (row.contentType == "61") {
|
if (row.contentType == "61") {
|
||||||
// 考试
|
// 考试
|
||||||
@@ -663,6 +668,8 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
queryResourceStudyPeopleList() {
|
queryResourceStudyPeopleList() {
|
||||||
|
console.log(this.rousourceRow);
|
||||||
|
console.log(888)
|
||||||
apicourseStudy
|
apicourseStudy
|
||||||
.studyContentRecords({
|
.studyContentRecords({
|
||||||
courseId: this.courseDetail.id,
|
courseId: this.courseDetail.id,
|
||||||
@@ -1065,7 +1072,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.resetDatePicker {
|
.resetDatePicker {
|
||||||
.el-date-editor {
|
.el-date-editor {
|
||||||
width: 250px;
|
width: 255px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.course-info {
|
.course-info {
|
||||||
|
|||||||
@@ -40,13 +40,9 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="2">
|
<el-col :span="5">
|
||||||
<div class="grid-content bg-purple">
|
<div class="grid-content bg-purple">
|
||||||
<el-button type="primary" @click="findList">查 询</el-button>
|
<el-button type="primary" @click="findList">查 询</el-button>
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="2">
|
|
||||||
<div class="grid-content bg-purple">
|
|
||||||
<el-button @click="reset">重 置</el-button>
|
<el-button @click="reset">重 置</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -527,10 +523,13 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
async delItem(row) {
|
async delItem(row) {
|
||||||
this.$messageBox.confirm({
|
this.$confirm(`<i class="el-icon-warning-outline"></i>确认删除${row.name}吗?`, '删除确认', {
|
||||||
title: "删除确认",
|
confirmButtonText: '确定',
|
||||||
message: `确认删除${row.name}吗?`,
|
cancelButtonText: '取消',
|
||||||
handleConfirm: async () => {
|
dangerouslyUseHTMLString: true,
|
||||||
|
type: 'warning',
|
||||||
|
customClass: 'custom-confirm-dialog'
|
||||||
|
}).then(async () => {
|
||||||
let params = {
|
let params = {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
title: row.name,
|
title: row.name,
|
||||||
@@ -548,11 +547,7 @@ export default {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
}
|
}
|
||||||
},
|
})
|
||||||
handleCancel: () => {
|
|
||||||
this.$showMessage('已取消删除', 'warning')
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
jumpRouter(item) {
|
jumpRouter(item) {
|
||||||
if (item.published) {
|
if (item.published) {
|
||||||
|
|||||||
Reference in New Issue
Block a user