From 1c0de78d1bdd340cf12b83bc972a382d4b359015 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 8 Nov 2024 13:46:36 +0800 Subject: [PATCH] fix --- src/api/index.js | 1 + src/layouts/navbar/index.vue | 4 +- src/pages/allocationReview/list/index.vue | 19 ++-- src/pages/allocationReview/list/setup.vue | 4 +- src/pages/allocationReview/records/index.vue | 90 ++++++++++++------- src/pages/myReview/list/index.vue | 18 ++-- src/pages/myReview/records/index.vue | 94 +++++++++++++------- 7 files changed, 139 insertions(+), 91 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index a66d19e..0e3ed0a 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -31,6 +31,7 @@ export default { occupationlabStaff: `/occupationlab/occupationlab/staff/staffList`, querySchoolByReadAndAppraise: `/nakadai/nakadai/school/querySchoolByReadAndAppraise`, querySchool: `/nakadai/nakadai/school/querySchool`, + myClass: `/occupationlab/occupationlab/achievement/myClass`, getDetailedExamScores: `/exam/exam/paper/getDetailedExamScores`, reviewSettingsList: `/competition/competition/readAndAppraise/reviewSettingsList`, diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index e5c301b..5615264 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -37,6 +37,8 @@ import { mapState, mapActions } from 'vuex' import Setting from '@/setting' import addRoutes from '@/libs/route/addRoutes' + +const fromNakadai = localStorage.getItem('reviewFromNakadai') export default { data () { return { @@ -93,7 +95,7 @@ export default { const { btns, defaultMenus: all } = this const menus = [all[0]] btns.find(e => e === '分配评阅任务') && menus.push(all[1]) - btns.find(e => e === '专家管理') && menus.push(all[2]) + fromNakadai && btns.find(e => e === '专家管理') && menus.push(all[2]) this.menus = menus } else { this.menus = this.defaultMenus diff --git a/src/pages/allocationReview/list/index.vue b/src/pages/allocationReview/list/index.vue index 4479aba..4a2e2ee 100644 --- a/src/pages/allocationReview/list/index.vue +++ b/src/pages/allocationReview/list/index.vue @@ -38,23 +38,20 @@
  • - +
    • - - + + + diff --git a/src/pages/allocationReview/list/setup.vue b/src/pages/allocationReview/list/setup.vue index f7a2f1b..8bfb64c 100644 --- a/src/pages/allocationReview/list/setup.vue +++ b/src/pages/allocationReview/list/setup.vue @@ -41,7 +41,7 @@ 取平均分 取修剪平均分 - + diff --git a/src/pages/allocationReview/records/index.vue b/src/pages/allocationReview/records/index.vue index a4474d2..ee65631 100644 --- a/src/pages/allocationReview/records/index.vue +++ b/src/pages/allocationReview/records/index.vue @@ -4,26 +4,35 @@
    筛选
    批量分配评阅人员 修改评阅设置 - 批量导出列表 +
    @@ -56,10 +65,13 @@ @selection-change="handleSelectionChange"> - - - - + + @@ -106,14 +118,13 @@ import Setup from '../list/setup' import Allocation from './allocation' import Breadcrumb from '@/components/breadcrumb' import Util from '@/libs/util' -import Setting from '@/setting' -import Const from '@/const/ques' -import Qs from 'qs' -import dayjs from 'dayjs' + +const fromNakadai = localStorage.getItem('reviewFromNakadai') export default { components: { Allocation, Setup, Breadcrumb }, data () { return { + fromNakadai, crumbs: [], competitionId: this.$route.query.competitionId || '', assessmentId: this.$route.query.assessmentId || '', @@ -123,6 +134,7 @@ export default { provinces: [], cities: [], schools: [], + classList: [], evaluationStatus: [ { name: '待评阅' @@ -143,6 +155,7 @@ export default { ], date: [], filter: { + classId: '', cityId: '', provinceId: '', realSchoolId: '', @@ -196,8 +209,13 @@ export default { this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}`).catch(() => { }) } - this.getProvince() - this.getSchool() + if (fromNakadai) { + this.getProvince() + this.getSchool() + } else { + this.getClassData() + } + this.getList() }, methods: { @@ -267,6 +285,12 @@ export default { this.schools = list }, + // 获取班级 + getClassData () { + this.$post(this.api.myClass).then(res => { + this.classList = res.list + }).catch(res => { }) + }, // 批量分配评阅人员 async batchAlloc () { diff --git a/src/pages/myReview/list/index.vue b/src/pages/myReview/list/index.vue index 1490bae..6924bf5 100644 --- a/src/pages/myReview/list/index.vue +++ b/src/pages/myReview/list/index.vue @@ -27,22 +27,20 @@
  • - +
    • - - + + + diff --git a/src/pages/myReview/records/index.vue b/src/pages/myReview/records/index.vue index b808e0b..d5d848a 100644 --- a/src/pages/myReview/records/index.vue +++ b/src/pages/myReview/records/index.vue @@ -5,26 +5,35 @@
      @@ -36,7 +45,8 @@
    • -
    @@ -50,13 +60,16 @@ @@ -91,14 +104,13 @@