|
|
@@ -31,12 +31,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select
|
|
|
- v-model.trim="searchForm.eduTeacherId"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="教务老师"
|
|
|
- >
|
|
|
+ <el-select v-model.trim="searchForm.eduTeacherId" filterable clearable placeholder="教务老师">
|
|
|
<el-option
|
|
|
v-for="(item,index) in educationList"
|
|
|
:key="index"
|
|
|
@@ -63,9 +58,9 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="完成评价" v-model="searchForm.hasReview" clearable>
|
|
|
- <el-option label="完成" value="1"></el-option>
|
|
|
- <el-option label="未完成" value="0"></el-option>
|
|
|
+ <el-select placeholder="老师评价" v-model="searchForm.hasReview" clearable>
|
|
|
+ <el-option label="评价" value="1"></el-option>
|
|
|
+ <el-option label="未评价" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -79,9 +74,12 @@
|
|
|
<el-date-picker
|
|
|
:clearable="false"
|
|
|
v-model="searchForm.month"
|
|
|
- type="month"
|
|
|
- value-format="yyyy-MM"
|
|
|
- placeholder="选择年月"
|
|
|
+ type="datetimerange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -112,9 +110,9 @@
|
|
|
<div>{{ scope.row.studentReview | studentReviewFilter}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" label="完成评价">
|
|
|
+ <el-table-column align="center" label="老师评价">
|
|
|
<template slot-scope="scope">
|
|
|
- <div>{{scope.row.evaluateStatus?'是':'否'}}</div>
|
|
|
+ <div>{{scope.row.reviewId>0?'是':'否'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" label="提交作业">
|
|
|
@@ -182,23 +180,28 @@
|
|
|
<div class="leftCell">
|
|
|
<p>课程评价</p>
|
|
|
<div class="chioseWrap">
|
|
|
- <el-tag :type="mychiose =='好'?'danger':'info'" @click="courseScheduleReview.courseReview='好'">好</el-tag>
|
|
|
-
|
|
|
<el-tag
|
|
|
- :type="mychiose == '中'?'danger':'info'" @click="courseScheduleReview.courseReview='中'"
|
|
|
+ :type="mychiose =='好'?'danger':'info'"
|
|
|
+ @click="courseScheduleReview.courseReview='好'"
|
|
|
+ >好</el-tag>
|
|
|
+
|
|
|
+ <el-tag
|
|
|
+ :type="mychiose == '中'?'danger':'info'"
|
|
|
+ @click="courseScheduleReview.courseReview='中'"
|
|
|
>中</el-tag>
|
|
|
<el-tag
|
|
|
- :type="mychiose == '差'?'danger':'info'" @click="courseScheduleReview.courseReview='差'"
|
|
|
+ :type="mychiose == '差'?'danger':'info'"
|
|
|
+ @click="courseScheduleReview.courseReview='差'"
|
|
|
>差</el-tag>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="commitRight">
|
|
|
<div v-if="courseScheduleComplaints">
|
|
|
- <div class="rightCell">
|
|
|
+ <div class="rightCell">
|
|
|
<p>学员评价</p>
|
|
|
<div class="chioseWrap">
|
|
|
- <el-rate v-model="courseScheduleComplaints.score" disabled text-color="#ff9900"></el-rate>
|
|
|
+ <el-rate v-model="courseScheduleComplaints[0].score" disabled text-color="#ff9900"></el-rate>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-input type="textarea" v-model="courseScheduleComplaints.reason"></el-input>
|
|
|
@@ -274,7 +277,7 @@ export default {
|
|
|
hasHandHomework: null,
|
|
|
hasReview: null,
|
|
|
courseReview: null,
|
|
|
- month: null
|
|
|
+ month: []
|
|
|
},
|
|
|
organList: [],
|
|
|
teacherList: [],
|
|
|
@@ -290,8 +293,8 @@ export default {
|
|
|
value: null,
|
|
|
teacherClassHeadInfo: null,
|
|
|
courseScheduleReview: null,
|
|
|
- courseScheduleComplaints:null,
|
|
|
- activeId:null
|
|
|
+ courseScheduleComplaints: null,
|
|
|
+ activeId: null
|
|
|
};
|
|
|
},
|
|
|
//生命周期 - 创建完成（可以访问当前this实例）
|
|
|
@@ -306,14 +309,26 @@ export default {
|
|
|
methods: {
|
|
|
init() {
|
|
|
// 获取默认月份
|
|
|
- if (!this.searchForm.month) {
|
|
|
+ if (this.searchForm.month.length<=0) {
|
|
|
var now = new Date();
|
|
|
- this.searchForm.month = new Date(
|
|
|
+
|
|
|
+ var startDate = new Date(
|
|
|
+ Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
+ )
|
|
|
+ .toISOString()
|
|
|
+ .slice(0, 10);
|
|
|
+ // + " 00:00:00" + " 23:59:59"
|
|
|
+ var endDate = new Date(
|
|
|
Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
)
|
|
|
.toISOString()
|
|
|
- .slice(0, 7);
|
|
|
+ .slice(0, 10);
|
|
|
+ this.searchForm.month = [];
|
|
|
+ this.searchForm.month.push(startDate);
|
|
|
+ this.searchForm.month.push(endDate);
|
|
|
+ console.log(this.searchForm.month)
|
|
|
}
|
|
|
+
|
|
|
// 获取指导老师
|
|
|
getTeacher({}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -332,7 +347,7 @@ export default {
|
|
|
this.educationList = res.data;
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
this.getList();
|
|
|
},
|
|
|
getList() {
|
|
|
@@ -345,7 +360,11 @@ export default {
|
|
|
obj.hasHandHomework = this.searchForm.hasHandHomework || null;
|
|
|
obj.hasReview = this.searchForm.hasHandHomework || null;
|
|
|
obj.courseReview = this.searchForm.courseReview || null;
|
|
|
- obj.startTime = this.searchForm.month || null;
|
|
|
+ if(this.searchForm.month.length > 0){
|
|
|
+ obj.startTime = this.searchForm.month[0];
|
|
|
+ obj.endTime = this.searchForm.month[1];
|
|
|
+ }
|
|
|
+
|
|
|
obj.page = this.rules.page;
|
|
|
obj.rows = this.rules.limit;
|
|
|
getPracticeGroup(obj).then(res => {
|
|
|
@@ -357,34 +376,37 @@ export default {
|
|
|
},
|
|
|
lookDetail(row) {
|
|
|
this.activeId = row.reviewId;
|
|
|
- getReviewInfo({ id:this.activeId }).then(res => {
|
|
|
+ getReviewInfo({ id: this.activeId }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.teacherClassHeadInfo = res.data.teacherClassHeadInfo;
|
|
|
this.courseScheduleReview = res.data.courseScheduleReview;
|
|
|
this.courseScheduleComplaints = res.data.courseScheduleComplaints;
|
|
|
|
|
|
- // 教务评价详情
|
|
|
- // eduCourseReviewGetReviewInfo({id}).then(res=>{
|
|
|
- // if(res.code == 200){
|
|
|
+ // 教务评价详情
|
|
|
+ // eduCourseReviewGetReviewInfo({id}).then(res=>{
|
|
|
+ // if(res.code == 200){
|
|
|
|
|
|
- // }
|
|
|
- // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
this.netWorkVisible = true;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- submitNetwork(){
|
|
|
- if(!this.courseScheduleReview.courseReview){
|
|
|
- this.$message.error('请评价课程');
|
|
|
- return
|
|
|
+ submitNetwork() {
|
|
|
+ if (!this.courseScheduleReview.courseReview) {
|
|
|
+ this.$message.error("请评价课程");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ updateReviewInfo({
|
|
|
+ id: this.activeId,
|
|
|
+ courseReview: this.courseScheduleReview.courseReview
|
|
|
+ }).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.$message.success("评价成功");
|
|
|
+ this.netWorkVisible = false;
|
|
|
+ this.getList();
|
|
|
}
|
|
|
- updateReviewInfo({id:this.activeId,courseReview:this.courseScheduleReview.courseReview }).then(res=>{
|
|
|
- if(res.code == 200){
|
|
|
- this.$message.success('评价成功');
|
|
|
- this.netWorkVisible = false;
|
|
|
- this.getList()
|
|
|
- }
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
search() {
|
|
|
this.rules.page = 1;
|
|
|
@@ -404,12 +426,21 @@ export default {
|
|
|
month: null
|
|
|
};
|
|
|
var now = new Date();
|
|
|
- this.searchForm.month = new Date(
|
|
|
+
|
|
|
+ var startDate = new Date(
|
|
|
Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
)
|
|
|
.toISOString()
|
|
|
- .slice(0, 7);
|
|
|
-
|
|
|
+ .slice(0, 10);
|
|
|
+ // + " 00:00:00" + " 23:59:59"
|
|
|
+ var endDate = new Date(
|
|
|
+ Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
+ )
|
|
|
+ .toISOString()
|
|
|
+ .slice(0, 10);
|
|
|
+ this.searchForm.month = [];
|
|
|
+ this.searchForm.month.push(startDate);
|
|
|
+ this.searchForm.month.push(endDate);
|
|
|
this.getList();
|
|
|
}
|
|
|
},
|
|
|
@@ -427,18 +458,18 @@ export default {
|
|
|
) {
|
|
|
return this.courseScheduleReview.teachingMaterial;
|
|
|
} else {
|
|
|
- return ""
|
|
|
+ return "";
|
|
|
}
|
|
|
},
|
|
|
- mychiose(){
|
|
|
- if(this.courseScheduleReview&&this.courseScheduleReview.courseReview){
|
|
|
- return this.courseScheduleReview.courseReview
|
|
|
- }else {
|
|
|
- return ''
|
|
|
- }
|
|
|
+ mychiose() {
|
|
|
+ if (this.courseScheduleReview && this.courseScheduleReview.courseReview) {
|
|
|
+ return this.courseScheduleReview.courseReview;
|
|
|
+ } else {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+};
|
|
|
</script>
|
|
|
<style lang='scss' scoped>
|
|
|
.wrap {
|
|
|
@@ -468,6 +499,6 @@ export default {
|
|
|
}
|
|
|
|
|
|
/deep/.el-tag {
|
|
|
- cursor: pointer;
|
|
|
+ cursor: pointer;
|
|
|
}
|
|
|
</style>
|
