diff --git a/src/api/index.js b/src/api/index.js index ddfd816..285e215 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -10,6 +10,7 @@ export default { treeListArch: `/nakadai/nakadai/staffAccountArchitecture/treeList`, staffList: `/nakadai/nakadai/backstageStaff/staffList`, querySchoolByReadAndAppraise: `/nakadai/nakadai/school/querySchoolByReadAndAppraise`, + querySchool: `/nakadai/nakadai/school/querySchool`, getDetailedExamScores: `/exam/exam/paper/getDetailedExamScores`, reviewSettingsList: `/competition/competition/readAndAppraise/reviewSettingsList`, diff --git a/src/pages/allocationReview/list/index.vue b/src/pages/allocationReview/list/index.vue index 50eaa8b..b583fcc 100644 --- a/src/pages/allocationReview/list/index.vue +++ b/src/pages/allocationReview/list/index.vue @@ -218,7 +218,6 @@ export default { }) this.list = list this.getNow() - this.handleStage() this.total = pageList.total } finally { this.loading = false @@ -264,6 +263,7 @@ export default { async getNow () { if (!this.now) { this.now = await Util.getNow() + this.handleStage() clearInterval(this.timer) this.timer = setInterval(() => { this.now = new Date(this.now.setSeconds(this.now.getSeconds() + 1)) diff --git a/src/pages/allocationReview/records/index.vue b/src/pages/allocationReview/records/index.vue index eb9187b..beaebf7 100644 --- a/src/pages/allocationReview/records/index.vue +++ b/src/pages/allocationReview/records/index.vue @@ -15,14 +15,13 @@
  • + @change="initData">
  • - + @@ -74,8 +73,7 @@ - + - - - + @@ -189,11 +185,11 @@ export default { keyWord: keyword || '', } provinceId && this.getCity() - cityId && this.getSchool() this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}`).catch(() => { }) } this.getProvince() + this.getSchool() this.getList() }, methods: { @@ -239,7 +235,6 @@ export default { // 清除省份 clearProvince () { this.filter.cityId = '' - this.filter.realSchoolId = '' }, // 省份选择回调 provinceChange () { @@ -257,26 +252,10 @@ export default { this.cities = list } }, - // 清除城市 - clearCity () { - this.filter.realSchoolId = '' - }, - // 城市选择回调 - cityChange () { - this.filter.realSchoolId = '' - this.getSchool() - this.initData() - }, // 获取学校 async getSchool () { - const { provinceId, cityId } = this.filter - if (cityId) { - const { list } = await this.$get(this.api.querySchoolByReadAndAppraise, { - provinceId, - cityId, - }) - this.schools = list - } + const { list } = await this.$get(this.api.querySchool) + this.schools = list }, diff --git a/src/pages/myReview/list/index.vue b/src/pages/myReview/list/index.vue index 5605329..e15a9e9 100644 --- a/src/pages/myReview/list/index.vue +++ b/src/pages/myReview/list/index.vue @@ -47,7 +47,8 @@ @@ -104,7 +105,7 @@ export default { }, { id: 2, - name: '已完成' + name: '已结束' }, ], reviewStatus: [ @@ -183,7 +184,6 @@ export default { }) this.list = list this.getNow() - this.handleStage() this.total = page.total } finally { this.loading = false @@ -227,6 +227,7 @@ export default { async getNow () { if (!this.now) { this.now = await Util.getNow() + this.handleStage() clearInterval(this.timer) this.timer = setInterval(() => { this.now = new Date(this.now.setSeconds(this.now.getSeconds() + 1)) @@ -257,12 +258,12 @@ export default { }, // 评阅 - toReview (row) { + toReview (row, readonly = 0) { this.$store.commit('user/setReferrer', { i: 1, url: `${this.$route.path}?${Qs.stringify(this.filter)}&month=${this.month}&page=${this.page}&pageSize=${this.pageSize}` }) - this.$router.push(`records?competitionId=${row.competitionId}&stageId=${row.stageId}`) + this.$router.push(`records?competitionId=${row.competitionId}&stageId=${row.stageId}&readonly=${row.stage === '已结束' && readonly ? 1 : 0}`) }, } }; diff --git a/src/pages/myReview/records/index.vue b/src/pages/myReview/records/index.vue index 366d57d..02afada 100644 --- a/src/pages/myReview/records/index.vue +++ b/src/pages/myReview/records/index.vue @@ -16,14 +16,13 @@
  • + @change="initData">
  • - + @@ -76,7 +75,8 @@ @@ -102,6 +102,7 @@ export default { crumbs: [], competitionId: this.$route.query.competitionId, stageId: this.$route.query.stageId, + readonly: !!(+this.$route.query.readonly), // 已结束的评阅只允许查看 loading: false, provinces: [], @@ -163,11 +164,11 @@ export default { keyWord: keyword || '', } provinceId && this.getCity() - cityId && this.getSchool() this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}`).catch(() => { }) } this.getProvince() + this.getSchool() this.getList() }, methods: { @@ -230,7 +231,6 @@ export default { // 清除省份 clearProvince () { this.filter.cityId = '' - this.filter.realSchoolId = '' }, // 省份选择回调 provinceChange () { @@ -248,26 +248,10 @@ export default { this.cities = list } }, - // 清除城市 - clearCity () { - this.filter.realSchoolId = '' - }, - // 城市选择回调 - cityChange () { - this.filter.realSchoolId = '' - this.getSchool() - this.initData() - }, // 获取学校 async getSchool () { - const { provinceId, cityId } = this.filter - if (cityId) { - const { list } = await this.$get(this.api.querySchoolByReadAndAppraise, { - provinceId, - cityId, - }) - this.schools = list - } + const { list } = await this.$get(this.api.querySchool) + this.schools = list }, // 批量评阅 @@ -295,8 +279,8 @@ export default { } }, // 评阅 - toReview (row, i) { - window.open(this.$router.resolve(`/theoryReview?id=${row.reportId}&u=${+this.showUserInfo}&m=${this.setup.hasManualScoreType}&c=${this.competitionId}&s=${this.stageId}`).href) + toReview (row, readonly = 0) { + window.open(this.$router.resolve(`/theoryReview?id=${row.reportId}&u=${+this.showUserInfo}&m=${this.setup.hasManualScoreType}&c=${this.competitionId}&s=${this.stageId}&r=${readonly ? 1 : 0}`).href) }, } }; diff --git a/src/pages/myReview/theoryReview/index.vue b/src/pages/myReview/theoryReview/index.vue index 71eccbe..208fc39 100644 --- a/src/pages/myReview/theoryReview/index.vue +++ b/src/pages/myReview/theoryReview/index.vue @@ -6,7 +6,7 @@
    上一个 下一个 - 一键保存分数 + 一键保存分数
    @@ -44,8 +44,8 @@ @click="filterStatus(item.id)">{{ item.name }}
    • -
    -