|
@@ -50,6 +50,13 @@
|
|
|
<span :class="search.hasLiaison==0?'actived':''" @click="search.hasLiaison=0">否</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="dropItem">
|
|
|
+ <p class="dropTitle">学生是否到课</p>
|
|
|
+ <div class="radioGroup">
|
|
|
+ <span :class="search.hasArrived==1?'actived':''" @click="search.hasArrived=1">是</span>
|
|
|
+ <span :class="search.hasArrived==0?'actived':''" @click="search.hasArrived=0">否</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="btnGroup">
|
|
|
<div class="btn btn-reset" @click="resetSerach">重置</div>
|
|
|
<div class="btn btn-sure" @click="submitInfo">确定</div>
|
|
@@ -60,36 +67,36 @@
|
|
|
<!-- -->
|
|
|
|
|
|
<!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh"> -->
|
|
|
- <div>
|
|
|
- <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList" >
|
|
|
- <van-cell
|
|
|
- v-for="(item,index) in courseList"
|
|
|
- :key="index"
|
|
|
- class="cellGroup"
|
|
|
- :title="item.classDate | filterClass"
|
|
|
- title-class="sectionTitle"
|
|
|
- value-class="sectionValue"
|
|
|
- >
|
|
|
- <template solt="default">
|
|
|
- <p class="content van-ellipsis">{{ item.courseName }}</p>
|
|
|
- <van-button
|
|
|
- type="primary"
|
|
|
- round
|
|
|
- size="small"
|
|
|
- v-if="item.reviewId==0"
|
|
|
- @click="submitReview(item)"
|
|
|
- >提交评价</van-button>
|
|
|
- <van-button
|
|
|
- type="primary"
|
|
|
- round
|
|
|
- size="small"
|
|
|
- v-if="item.reviewId>0"
|
|
|
- @click="submitReview(item)"
|
|
|
- >修改评价</van-button>
|
|
|
- </template>
|
|
|
- </van-cell>
|
|
|
- </van-list>
|
|
|
- </div>
|
|
|
+ <div>
|
|
|
+ <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
|
|
|
+ <van-cell
|
|
|
+ v-for="(item,index) in courseList"
|
|
|
+ :key="index"
|
|
|
+ class="cellGroup"
|
|
|
+ :title="item.classDate | filterClass"
|
|
|
+ title-class="sectionTitle"
|
|
|
+ value-class="sectionValue"
|
|
|
+ >
|
|
|
+ <template solt="default">
|
|
|
+ <p class="content van-ellipsis">{{ item.courseName }}</p>
|
|
|
+ <van-button
|
|
|
+ type="primary"
|
|
|
+ round
|
|
|
+ size="small"
|
|
|
+ v-if="item.reviewId==0"
|
|
|
+ @click="submitReview(item)"
|
|
|
+ >提交评价</van-button>
|
|
|
+ <van-button
|
|
|
+ type="primary"
|
|
|
+ round
|
|
|
+ size="small"
|
|
|
+ v-if="item.reviewId>0"
|
|
|
+ @click="submitReview(item)"
|
|
|
+ >修改评价</van-button>
|
|
|
+ </template>
|
|
|
+ </van-cell>
|
|
|
+ </van-list>
|
|
|
+ </div>
|
|
|
<!-- </van-pull-refresh> -->
|
|
|
|
|
|
<!-- -->
|
|
@@ -150,7 +157,8 @@ export default {
|
|
|
status: false,
|
|
|
hasReview: null,
|
|
|
hasHandHomework: null,
|
|
|
- hasLiaison: null
|
|
|
+ hasLiaison: null,
|
|
|
+ hasArrived: null
|
|
|
},
|
|
|
courseList: [],
|
|
|
loading: false,
|
|
@@ -165,7 +173,6 @@ export default {
|
|
|
localStorage.setItem("Authorization", decodeURI(params.Authorization));
|
|
|
localStorage.setItem("userInfo", decodeURI(params.Authorization));
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
mounted() {
|
|
|
this.dateSection.currentDate = new Date();
|
|
@@ -176,24 +183,22 @@ export default {
|
|
|
this.dateEndSection.showEndDate = this.timeFormat(
|
|
|
this.dateEndSection.currentDate
|
|
|
);
|
|
|
- let evaluationList = sessionStorage.getItem('evaluationList');
|
|
|
- if(evaluationList) {
|
|
|
- this.search = JSON.parse(evaluationList);
|
|
|
- this.dateSection.showStartDate = this.timeFormat(
|
|
|
- new Date(this.search.startTime.replace(/-/g, '/'))
|
|
|
- );
|
|
|
- this.dateSection.currentDate = this.timeFormat(
|
|
|
- new Date(this.search.startTime.replace(/-/g, '/'))
|
|
|
- );
|
|
|
- this.dateEndSection.currentDate = this.timeFormat(
|
|
|
- new Date(this.search.endTime.replace(/-/g, '/'))
|
|
|
-
|
|
|
- );
|
|
|
- this.dateEndSection.showEndDate = this.timeFormat(
|
|
|
- new Date(this.search.endTime.replace(/-/g, '/'))
|
|
|
-
|
|
|
- );
|
|
|
- }
|
|
|
+ let evaluationList = sessionStorage.getItem("evaluationList");
|
|
|
+ if (evaluationList) {
|
|
|
+ this.search = JSON.parse(evaluationList);
|
|
|
+ this.dateSection.showStartDate = this.timeFormat(
|
|
|
+ new Date(this.search.startTime.replace(/-/g, "/"))
|
|
|
+ );
|
|
|
+ this.dateSection.currentDate = this.timeFormat(
|
|
|
+ new Date(this.search.startTime.replace(/-/g, "/"))
|
|
|
+ );
|
|
|
+ this.dateEndSection.currentDate = this.timeFormat(
|
|
|
+ new Date(this.search.endTime.replace(/-/g, "/"))
|
|
|
+ );
|
|
|
+ this.dateEndSection.showEndDate = this.timeFormat(
|
|
|
+ new Date(this.search.endTime.replace(/-/g, "/"))
|
|
|
+ );
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
formatter(type, val) {
|
|
@@ -238,7 +243,8 @@ export default {
|
|
|
status: false,
|
|
|
hasReview: null,
|
|
|
hasHandHomework: null,
|
|
|
- hasLiaison: null
|
|
|
+ hasLiaison: null,
|
|
|
+ hasArrived: null
|
|
|
};
|
|
|
},
|
|
|
submitInfo() {
|
|
@@ -248,34 +254,33 @@ export default {
|
|
|
this.$refs.item.toggle();
|
|
|
},
|
|
|
getList() {
|
|
|
- this.loading = true;
|
|
|
+ this.loading = true;
|
|
|
this.search.startTime =
|
|
|
this.dateSection.showStartDate.replace(/\//g, "-") + " 00:00:00";
|
|
|
(this.search.endTime =
|
|
|
this.dateEndSection.showEndDate.replace(/\//g, "-") + " 23:59:59"),
|
|
|
(this.search.page = this.page);
|
|
|
- this.search.rows = 20;
|
|
|
- // this.page++;
|
|
|
+ this.search.rows = 20;
|
|
|
+ // this.page++;
|
|
|
getPracticeGroup(this.search).then(res => {
|
|
|
- let result = res.data
|
|
|
- this.loading = false
|
|
|
- if(result.code == 200) {
|
|
|
- sessionStorage.setItem('evaluationList',JSON.stringify(this.search));
|
|
|
- this.page = result.data.pageNo
|
|
|
- this.courseList = this.courseList.concat(result.data.rows)
|
|
|
- if(this.page >= result.data.totalPage) {
|
|
|
- this.finished = true
|
|
|
- }
|
|
|
- this.page++
|
|
|
+ let result = res.data;
|
|
|
+ this.loading = false;
|
|
|
+ if (result.code == 200) {
|
|
|
+ sessionStorage.setItem("evaluationList", JSON.stringify(this.search));
|
|
|
+ this.page = result.data.pageNo;
|
|
|
+ this.courseList = this.courseList.concat(result.data.rows);
|
|
|
+ if (this.page >= result.data.totalPage) {
|
|
|
+ this.finished = true;
|
|
|
+ }
|
|
|
+ this.page++;
|
|
|
} else {
|
|
|
- this.finished = true
|
|
|
+ this.finished = true;
|
|
|
}
|
|
|
// 判断是否有数据
|
|
|
// if(this.dataList.length <= 0) {
|
|
|
// this.dataShow = false
|
|
|
// }
|
|
|
|
|
|
-
|
|
|
// if (res.data.code == 200) {
|
|
|
// this.loading = false;
|
|
|
// if (res.data.data.rows.length < 10) {
|
|
@@ -286,7 +291,7 @@ export default {
|
|
|
// } else {
|
|
|
// this.courseList = res.data.data.rows;
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
// this.refreshing = false;
|
|
|
// } else {
|
|
|
// this.finished = true;
|
|
@@ -308,7 +313,7 @@ export default {
|
|
|
submitReview(item) {
|
|
|
this.$router.push({
|
|
|
path: "/courseEvaluation",
|
|
|
- query: { id: item.id, reviewId: item.reviewId,isInside:true }
|
|
|
+ query: { id: item.id, reviewId: item.reviewId, isInside: true }
|
|
|
});
|
|
|
}
|
|
|
},
|
|
@@ -329,7 +334,6 @@ export default {
|
|
|
}
|
|
|
|
|
|
.searchSection {
|
|
|
-
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
background: #fff;
|