|
|
@@ -20,7 +20,7 @@
|
|
|
</div> -->
|
|
|
</div>
|
|
|
<el-table
|
|
|
- :data="tableData"
|
|
|
+ :data="copyTableData"
|
|
|
class="scoTab"
|
|
|
v-loading="tabLoading"
|
|
|
style="width: 100%"
|
|
|
@@ -372,6 +372,14 @@ export default {
|
|
|
teacherName: {
|
|
|
type: String,
|
|
|
default: ""
|
|
|
+ },
|
|
|
+ timeA: {
|
|
|
+ type:String,
|
|
|
+ default:""
|
|
|
+ },
|
|
|
+ timeB: {
|
|
|
+ type: String,
|
|
|
+ default:""
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
@@ -403,9 +411,11 @@ export default {
|
|
|
oid: this.$route.query.oid, //学校id
|
|
|
org: this.$route.query.org, //组织id
|
|
|
tableData: [],
|
|
|
+ copyTableData:[],
|
|
|
TeachingOptions: [],
|
|
|
PageBaseDataTwo: [],
|
|
|
- remDig: false
|
|
|
+ remDig: false,
|
|
|
+ timeSortList:[],
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -414,6 +424,16 @@ export default {
|
|
|
},
|
|
|
digType(newVal, oldVal) {
|
|
|
this.getDataDig();
|
|
|
+ },
|
|
|
+ timeA(newVal){
|
|
|
+ if(newVal){
|
|
|
+ this.timeSortFn()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ timeB(newVal){
|
|
|
+ if(newVal){
|
|
|
+ this.timeSortFn()
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -494,9 +514,10 @@ export default {
|
|
|
};
|
|
|
// console.log(params);
|
|
|
this.ajax
|
|
|
- .get(this.$store.state.api + "selectTestExaminePersonData", params)
|
|
|
+ .get(this.$store.state.api + "selectTestExaminePersonData_filterTime", params)
|
|
|
.then(res => {
|
|
|
let data = res.data[0];
|
|
|
+ console.log(data)
|
|
|
|
|
|
data.forEach(e => {
|
|
|
e.json = JSON.parse(e.json);
|
|
|
@@ -533,7 +554,9 @@ export default {
|
|
|
e.cogSco = e.cogSco.toFixed(2);
|
|
|
});
|
|
|
this.tableData = data;
|
|
|
+ this.copyTableData = data;
|
|
|
this.tabLoading = false;
|
|
|
+ this.timeSortFn()
|
|
|
})
|
|
|
.catch(error => {
|
|
|
this.tabLoading = false;
|
|
|
@@ -554,6 +577,9 @@ export default {
|
|
|
this.diaSco = true;
|
|
|
this.digUserid = val.userid;
|
|
|
this.disTeaClass = val.tea;
|
|
|
+ if(val.timeValue){
|
|
|
+ this.timeSortList = JSON.parse(val.timeValue)
|
|
|
+ }
|
|
|
this.cutPerson();
|
|
|
this.getPageBase();
|
|
|
},
|
|
|
@@ -784,7 +810,13 @@ export default {
|
|
|
return this.$message.error("暂无人员提交");
|
|
|
// this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.userid}`;
|
|
|
|
|
|
- this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}`;
|
|
|
+ if(this.timeSortList){
|
|
|
+ let timeValue = this.timeSortList.time
|
|
|
+ this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&timeLimit=${timeValue}&review=1`;
|
|
|
+ }else{
|
|
|
+ this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&review=1`;
|
|
|
+
|
|
|
+ }
|
|
|
// this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
|
|
|
this.diaIframe = true;
|
|
|
},
|
|
|
@@ -838,25 +870,25 @@ export default {
|
|
|
this.digLoading = true;
|
|
|
|
|
|
this.cutTeaNum--;
|
|
|
- this.digUsername = this.tableData[this.cutTeaNum].username;
|
|
|
- this.disTeaClass = this.tableData[this.cutTeaNum].tea;
|
|
|
- this.digUserid = this.tableData[this.cutTeaNum].userid;
|
|
|
- this.digTid = this.tableData[this.cutTeaNum].id;
|
|
|
+ this.digUsername = this.copyTableData[this.cutTeaNum].username;
|
|
|
+ this.disTeaClass = this.copyTableData[this.cutTeaNum].tea;
|
|
|
+ this.digUserid = this.copyTableData[this.cutTeaNum].userid;
|
|
|
+ this.digTid = this.copyTableData[this.cutTeaNum].id;
|
|
|
|
|
|
this.getPageBase();
|
|
|
},
|
|
|
// 弹框切换下一个教师
|
|
|
nextTea() {
|
|
|
// console.log("this.tableData", this.tableData);
|
|
|
- if (this.cutTeaNum + 1 >= this.tableData.length)
|
|
|
+ if (this.cutTeaNum + 1 >= this.copyTableData.length)
|
|
|
return this.$message.error("已经是最后一个了");
|
|
|
this.digLoading = true;
|
|
|
|
|
|
this.cutTeaNum++;
|
|
|
- this.digUsername = this.tableData[this.cutTeaNum].username;
|
|
|
- this.disTeaClass = this.tableData[this.cutTeaNum].tea;
|
|
|
- this.digUserid = this.tableData[this.cutTeaNum].userid;
|
|
|
- this.digTid = this.tableData[this.cutTeaNum].id;
|
|
|
+ this.digUsername = this.copyTableData[this.cutTeaNum].username;
|
|
|
+ this.disTeaClass = this.copyTableData[this.cutTeaNum].tea;
|
|
|
+ this.digUserid = this.copyTableData[this.cutTeaNum].userid;
|
|
|
+ this.digTid = this.copyTableData[this.cutTeaNum].id;
|
|
|
|
|
|
this.getPageBase();
|
|
|
},
|
|
|
@@ -980,6 +1012,7 @@ export default {
|
|
|
},
|
|
|
// 评分关闭弹框
|
|
|
handleClose(done) {
|
|
|
+ this.timeSortList = [];
|
|
|
this.getData();
|
|
|
done();
|
|
|
},
|
|
|
@@ -1010,9 +1043,19 @@ export default {
|
|
|
testId: val.join(",")
|
|
|
}
|
|
|
];
|
|
|
+
|
|
|
+
|
|
|
+ let _fnStr = `selectExamineTestName`
|
|
|
+ if(this.timeSortList){
|
|
|
+ const timeValue = this.timeSortList.time;
|
|
|
+ params[0].startTime = timeValue[0];
|
|
|
+ params[0].endTime = timeValue[1];
|
|
|
+ _fnStr = `selectExamineTestNameFilterTime`
|
|
|
+ }
|
|
|
+
|
|
|
return new Promise(resolve => {
|
|
|
this.ajax
|
|
|
- .post(this.$store.state.api + "selectExamineTestName", params)
|
|
|
+ .post(this.$store.state.api + _fnStr, params)
|
|
|
.then(res => {
|
|
|
resolve(res.data[0]);
|
|
|
})
|
|
|
@@ -1020,6 +1063,15 @@ export default {
|
|
|
console.log(error);
|
|
|
});
|
|
|
});
|
|
|
+ },
|
|
|
+ //时间筛选
|
|
|
+ timeSortFn(){
|
|
|
+ console.log("timeSortFn",this.timeA,this.timeB)
|
|
|
+ if(this.pType == 1 && this.timeA){
|
|
|
+ this.copyTableData = this.tableData.filter(i=>i.time == this.timeA)
|
|
|
+ }else if(this.pType == 2 && this.timeB){
|
|
|
+ this.copyTableData = this.tableData.filter(i=>i.time == this.timeB)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|
SanHQin