diff --git a/src/components/page/Assessment.vue b/src/components/page/Assessment.vue index d0709c7..2f14009 100644 --- a/src/components/page/Assessment.vue +++ b/src/components/page/Assessment.vue @@ -163,7 +163,7 @@ export default { stopTime: this.form.endTime, searchContent: this.core.encodeString(this.keyword), status: this.form.status, - pageNum: this.pageNo, + pageNum: 1, pageSize: 10000, } this.$post(this.api.stuAssessmentByScreen,data).then(res => { @@ -187,27 +187,32 @@ export default { result.push(n) } }) - this.$post(this.api.fictitiousRecord, { - classId: '', - userId: this.userId, - page: 1, - size: 1000, - searchContent: '', - source: 2, - systemId: 3 - }).then(res => { - let recordList = res.data.list - result.map(n => { - let same = recordList.find(e => e.className == n.className) - if(same){ - n.reportId = same.reportId - } - }) - this.listDataAll = result - this.totals = result.length - this.handlePage() - }).catch(err => {}) - }).catch(res => {}); + this.listDataAll = result + this.totals = result.length + this.getRecord() + }).catch(res => {}) + }, + getRecord(){ + this.$post(this.api.fictitiousRecord, { + classId: '', + userId: this.userId, + page: 1, + size: 1000, + searchContent: '', + source: 2, + systemId: 3 + }).then(res => { + let list = this.listDataAll + let recordList = res.data.list + list.map(n => { + let same = recordList.find(e => e.className == n.className) + if(same){ + n.reportId = same.reportId + } + }) + this.listDataAll = list + this.handlePage() + }).catch(err => {}) }, handlePage(){ let list = this.listDataAll diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue index be406a2..4dd7a80 100644 --- a/src/components/page/Dashboard.vue +++ b/src/components/page/Dashboard.vue @@ -22,7 +22,7 @@ - + @@ -205,12 +205,15 @@ export default { if(index == 3 && !isIndex){ this.toEvaluation(1,3) + }else if(index == 2){ + location.hash = `${this.routeName}#0` } } }, saveActive(activeName,oldActiveName){ this.lastClick = oldActiveName if(activeName == 'second'){ + this.activeName = oldActiveName return false } }, diff --git a/src/utils/api.js b/src/utils/api.js index c723873..44db5c1 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -1,5 +1,5 @@ // let host = 'http://192.168.31.125:9090'//林 -// let host = 'http://192.168.31.152:9090'//榕 +// let host = 'http://192.168.31.151:9090'//榕 // let host = 'http://192.168.31.137:9090'//陈 // let host = 'http://122.9.154.146'