|
@@ -537,7 +537,7 @@
|
|
}
|
|
}
|
|
if (this.ctnToken) requestData.token = this.ctnToken;
|
|
if (this.ctnToken) requestData.token = this.ctnToken;
|
|
//校本评测根据学段查询
|
|
//校本评测根据学段查询
|
|
- if (this.scope == "school") requestData.period = this.filterPeriod;
|
|
|
|
|
|
+ if (this.scope == "school") requestData.period = this.$store.state.user.curPeriod.id;
|
|
//添加其他查询条件
|
|
//添加其他查询条件
|
|
if (this.filter.progress) requestData.progress = this.filter.progress;
|
|
if (this.filter.progress) requestData.progress = this.filter.progress;
|
|
if (this.filter.source) requestData.source = this.filter.source;
|
|
if (this.filter.source) requestData.source = this.filter.source;
|
|
@@ -972,9 +972,10 @@
|
|
},
|
|
},
|
|
"$store.state.user.curSemester": {
|
|
"$store.state.user.curSemester": {
|
|
deep: true,
|
|
deep: true,
|
|
- immediate:true,
|
|
|
|
|
|
+ immediate: true,
|
|
handler(n, old) {
|
|
handler(n, old) {
|
|
if (n) {
|
|
if (n) {
|
|
|
|
+ this.scope = this.$route.name === "schoolExam" ? "school" : "private";
|
|
this.semesterRange = this.$tools.getStTimeByYearAndSemester(n.year, n.index);
|
|
this.semesterRange = this.$tools.getStTimeByYearAndSemester(n.year, n.index);
|
|
let curPeriod = this.$store.state.user.curPeriod;
|
|
let curPeriod = this.$store.state.user.curPeriod;
|
|
this.filterPeriod = curPeriod.id;
|
|
this.filterPeriod = curPeriod.id;
|