|
|
@@ -43,12 +43,18 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="是否及时评价" v-model="searchForm.isRepliedTimely" clearable>
|
|
|
+ <el-select placeholder="及时评价" v-model="searchForm.isRepliedTimely" clearable>
|
|
|
<el-option label="是" value="1"></el-option>
|
|
|
<el-option label="否" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <br>
|
|
|
+ <el-form-item>
|
|
|
+ <el-select placeholder="是否有vip" v-model="searchForm.existVipCourse" clearable>
|
|
|
+ <el-option label="是" value="1"></el-option>
|
|
|
+ <el-option label="否" value="0"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <br />
|
|
|
<el-form-item label="布置时间">
|
|
|
<el-date-picker
|
|
|
v-model.trim="searchForm.timer"
|
|
|
@@ -60,8 +66,8 @@
|
|
|
end-placeholder="布置结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <br>
|
|
|
- <el-form-item label="截止时间">
|
|
|
+ <br />
|
|
|
+ <el-form-item label="截止时间">
|
|
|
<el-date-picker
|
|
|
v-model.trim="searchForm.expireDate"
|
|
|
style="width:400px;"
|
|
|
@@ -72,11 +78,16 @@
|
|
|
end-placeholder="截止结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<el-button type="danger" @click="search">搜索</el-button>
|
|
|
<el-button @click="onReSet" type="primary">重置</el-button>
|
|
|
- <el-button @click="onExport" type="primary" v-permission="'export/extraExercisesReplys'" style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
|
|
|
+ <el-button
|
|
|
+ @click="onExport"
|
|
|
+ type="primary"
|
|
|
+ v-permission="'export/extraExercisesReplys'"
|
|
|
+ style=" background: #14928a; border:1px solid #14928a;"
|
|
|
+ >导出</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div class="tableWrap">
|
|
|
@@ -86,14 +97,10 @@
|
|
|
:data="tableList"
|
|
|
>
|
|
|
<el-table-column align="center" prop="createTime" label="布置时间" width="150">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.createTime | dateForMinFormat}}
|
|
|
- </template>
|
|
|
+ <template slot-scope="scope">{{scope.row.createTime | dateForMinFormat}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="expireDate" label="截止时间" width="150">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.expireDate | dateForMinFormat}}
|
|
|
- </template>
|
|
|
+ <template slot-scope="scope">{{scope.row.expireDate | dateForMinFormat}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="title" label="训练标题">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -113,25 +120,32 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="userId" label="学生编号">
|
|
|
-
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column align="center" prop="userId" label="学生编号"></el-table-column>
|
|
|
<el-table-column align="center" label="提交作业">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{scope.row.status?'是':'否'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="createTime" label="提交时间" width="150">
|
|
|
- <template slot-scope="scope">
|
|
|
- {{scope.row.submitTime | dateForMinFormat}}
|
|
|
- </template>
|
|
|
+ <el-table-column align="center" prop="createTime" label="提交时间" width="150">
|
|
|
+ <template slot-scope="scope">{{scope.row.submitTime | dateForMinFormat}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" prop="isReplied" label="是否评价">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{scope.row.isReplied?'是':'否'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="isRepliedTimely" label="是否及时评价">
|
|
|
+ <el-table-column align="center" label="是否有vip" width="100" fixed="right">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>{{scope.row.existVipCourse?'是':'否'}}</div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ prop="isRepliedTimely"
|
|
|
+ label="及时评价"
|
|
|
+ width="100"
|
|
|
+ fixed="right"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{scope.row.isRepliedTimely?'是':'否'}}</div>
|
|
|
</template>
|
|
|
@@ -141,10 +155,14 @@
|
|
|
<div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
|
|
|
</template>
|
|
|
</el-table-column>-->
|
|
|
- <el-table-column align="center" label="操作">
|
|
|
+ <el-table-column align="center" label="操作" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <el-button type="text" v-permission="'afterWorkList/look'" @click="lookDetail(scope.row)">查看</el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ v-permission="'afterWorkList/look'"
|
|
|
+ @click="lookDetail(scope.row)"
|
|
|
+ >查看</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -230,7 +248,8 @@ export default {
|
|
|
isRepliedTimely: null,
|
|
|
isView: null,
|
|
|
organIdList: null,
|
|
|
- expireDate:[]
|
|
|
+ expireDate: [],
|
|
|
+ existVipCourse: null
|
|
|
},
|
|
|
rules: {
|
|
|
// 分页规则
|
|
|
@@ -254,7 +273,7 @@ export default {
|
|
|
workVisible: false,
|
|
|
activeSrc: "",
|
|
|
extracurricularExercisesId: null,
|
|
|
- show:true
|
|
|
+ show: true
|
|
|
};
|
|
|
},
|
|
|
//生命周期 - 创建完成（可以访问当前this实例）
|
|
|
@@ -290,12 +309,15 @@ export default {
|
|
|
// this.searchForm.timer.push(endDate);
|
|
|
|
|
|
this.extracurricularExercisesId = this.$route.query.extracurricularExercisesId;
|
|
|
- if(this.extracurricularExercisesId){
|
|
|
- this.show = false
|
|
|
+ if (this.extracurricularExercisesId) {
|
|
|
+ this.show = false;
|
|
|
}
|
|
|
- this.searchForm.search = this.$route.query.studentId
|
|
|
- if(this.$route.query.startTime&&this.$route.query.endTime){
|
|
|
- this.searchForm.timer = [this.$route.query.startTime,this.$route.query.endTime]
|
|
|
+ this.searchForm.search = this.$route.query.studentId;
|
|
|
+ if (this.$route.query.startTime && this.$route.query.endTime) {
|
|
|
+ this.searchForm.timer = [
|
|
|
+ this.$route.query.startTime,
|
|
|
+ this.$route.query.endTime
|
|
|
+ ];
|
|
|
}
|
|
|
// console.log(this.$route.query)
|
|
|
this.getList();
|
|
|
@@ -314,10 +336,10 @@ export default {
|
|
|
this.rules.page = 1;
|
|
|
this.getList();
|
|
|
},
|
|
|
- // 导出
|
|
|
- onExport(){
|
|
|
- let url = "/api-web/export/extraExercisesReplys";
|
|
|
- let obj = this.getDate()
|
|
|
+ // 导出
|
|
|
+ onExport() {
|
|
|
+ let url = "/api-web/export/extraExercisesReplys";
|
|
|
+ let obj = this.getDate();
|
|
|
const options = {
|
|
|
method: "get",
|
|
|
headers: {
|
|
|
@@ -342,11 +364,18 @@ export default {
|
|
|
});
|
|
|
let objectUrl = URL.createObjectURL(blob);
|
|
|
let link = document.createElement("a");
|
|
|
- let nowTime = new Date()
|
|
|
- let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
|
|
|
- nowTime.getHours() +
|
|
|
- '' + nowTime.getMinutes()
|
|
|
- let fname =ymd+"课外训练(学员)";
|
|
|
+ let nowTime = new Date();
|
|
|
+ let ymd =
|
|
|
+ nowTime.getFullYear() +
|
|
|
+ "" +
|
|
|
+ (nowTime.getMonth() + 1) +
|
|
|
+ "" +
|
|
|
+ nowTime.getDate() +
|
|
|
+ "" +
|
|
|
+ nowTime.getHours() +
|
|
|
+ "" +
|
|
|
+ nowTime.getMinutes();
|
|
|
+ let fname = ymd + "课外训练(学员)";
|
|
|
link.href = objectUrl;
|
|
|
link.setAttribute("download", fname);
|
|
|
document.body.appendChild(link);
|
|
|
@@ -355,18 +384,18 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
- getDate(){
|
|
|
- let obj = {};
|
|
|
+ getDate() {
|
|
|
+ let obj = {};
|
|
|
if (this.searchForm.timer && this.searchForm.timer.length > 0) {
|
|
|
obj.submitStartTime = this.searchForm.timer[0];
|
|
|
obj.submitEndTime = this.searchForm.timer[1];
|
|
|
}
|
|
|
- if(this.searchForm.expireDate && this.searchForm.expireDate.length>0){
|
|
|
- obj.expireStartDate = this.searchForm.expireDate[0]
|
|
|
- obj.expireEndDate = this.searchForm.expireDate[1]
|
|
|
+ if (this.searchForm.expireDate && this.searchForm.expireDate.length > 0) {
|
|
|
+ obj.expireStartDate = this.searchForm.expireDate[0];
|
|
|
+ obj.expireEndDate = this.searchForm.expireDate[1];
|
|
|
}
|
|
|
obj.page = this.rules.page;
|
|
|
-
|
|
|
+
|
|
|
(obj.rows = this.rules.limit),
|
|
|
this.searchForm.teacherId
|
|
|
? (obj.teacherId = this.searchForm.teacherId)
|
|
|
@@ -377,11 +406,17 @@ export default {
|
|
|
? (obj.isRepliedTimely = this.searchForm.isRepliedTimely)
|
|
|
: null;
|
|
|
this.searchForm.isView ? (obj.isView = this.searchForm.isView) : null;
|
|
|
- this.extracurricularExercisesId&&this.extracurricularExercisesId !='yes'
|
|
|
+ this.extracurricularExercisesId &&
|
|
|
+ this.extracurricularExercisesId != "yes"
|
|
|
? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
|
|
|
: null;
|
|
|
- this.searchForm.organIdList ? (obj.organIdList = this.searchForm.organIdList) : null;
|
|
|
- return obj
|
|
|
+ this.searchForm.organIdList
|
|
|
+ ? (obj.organIdList = this.searchForm.organIdList)
|
|
|
+ : null;
|
|
|
+ this.searchForm.existVipCourse
|
|
|
+ ? (obj.existVipCourse = this.searchForm.existVipCourse)
|
|
|
+ : null;
|
|
|
+ return obj;
|
|
|
},
|
|
|
onReSet() {
|
|
|
this.searchForm = {
|
|
|
@@ -391,7 +426,8 @@ export default {
|
|
|
isReplied: null,
|
|
|
isView: null,
|
|
|
organId: null,
|
|
|
- expireDate:[]
|
|
|
+ expireDate: [],
|
|
|
+ existVipCourse: null
|
|
|
};
|
|
|
this.extracurricularExercisesId = null;
|
|
|
this.getList();
|
|
|
@@ -421,10 +457,10 @@ export default {
|
|
|
this.workVisible = true;
|
|
|
}
|
|
|
},
|
|
|
- watch:{
|
|
|
- workVisible(val){
|
|
|
- if(!val){
|
|
|
- this.activeSrc = '';
|
|
|
+ watch: {
|
|
|
+ workVisible(val) {
|
|
|
+ if (!val) {
|
|
|
+ this.activeSrc = "";
|
|
|
}
|
|
|
}
|
|
|
}
|
