diff --git a/src/api/index.js b/src/api/index.js
index e6fff7f..21fcb50 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -15,4 +15,5 @@ export default {
reviewSettingsList: `/competition/competition/readAndAppraise/reviewSettingsList`,
evaluationSave: `/nakadai/evaluation/saveOrUpdate`,
evaluationFind: `/nakadai/evaluation/findById`,
+ competitionUserReport: `/nakadai/evaluation/competitionUserReport`,
}
\ No newline at end of file
diff --git a/src/pages/allocationReview/list/index.vue b/src/pages/allocationReview/list/index.vue
index 40941fb..1b1fd70 100644
--- a/src/pages/allocationReview/list/index.vue
+++ b/src/pages/allocationReview/list/index.vue
@@ -40,7 +40,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
评阅进度
修改评阅设置
任务分配
@@ -66,7 +66,8 @@
@@ -86,8 +87,6 @@ export default {
components: { Setup, Progress },
data () {
return {
- difficults: Const.difficults,
- questionTypes: Const.questionTypes,
loading: false,
dateList: [
{
@@ -159,7 +158,7 @@ export default {
timer: null,
list: [],
page: +this.$route.query.page || 1,
- pageSize: 10,
+ pageSize: +this.$route.query.pageSize || 10,
total: 0,
setupVisible: false,
@@ -199,61 +198,61 @@ export default {
const { query } = this.$route
if (query.page) {
- const { questionTypes, correctRateEnd, correctRateStart, difficultys, specialtyIds, status, keyWord, questionTypeSort, givenYearSort, difficultySort, correctRateSort, updateTimeSort, referenceCountSort, givenYears, knowledgePointIds, questionBankId, questionBankName, questionBankCategory } = query
+ const { month, startTime, endTime, reviewStage, reviewStatus, taskAllocationStatus, keyWord } = query
this.filter = {
- questionTypes: questionTypes ? questionTypes.split(',') : [],
- correctRateEnd: correctRateEnd || '',
- correctRateStart: correctRateStart || '',
- difficultys: difficultys ? difficultys.split(',') : [],
- specialtyIds: specialtyIds ? specialtyIds.split(',').map(e => +e) : [],
- status: status ? +status : '',
+ month: !startTime && month ? +month : '',
+ reviewStage: reviewStage ? +reviewStage : '',
+ reviewStatus: reviewStatus ? +reviewStatus : '',
+ taskAllocationStatus: taskAllocationStatus ? +taskAllocationStatus : '',
keyWord: keyWord || '',
- questionTypeSort: questionTypeSort || '',
- givenYearSort: givenYearSort || '',
- difficultySort: difficultySort || '',
- correctRateSort: correctRateSort || '',
- updateTimeSort: updateTimeSort || '',
- referenceCountSort: referenceCountSort || '',
}
- this.givenYears = givenYears || ''
- this.knowledgePointIds = knowledgePointIds ? JSON.parse(knowledgePointIds) : []
+ if (startTime) this.date = [startTime, endTime]
- this.$router.push(`/myReview?questionBankId=${questionBankId}&questionBankName=${questionBankName}&questionBankCategory=${questionBankCategory}`).catch(() => { })
+ this.$router.push(`/allocationReview`).catch(() => { })
}
- this.initData()
+ this.getList()
},
methods: {
async getList () {
- const { pageList } = await this.$post(this.api.reviewSettingsList, {
- ...this.filter,
- pageNum: this.page,
- pageSize: this.pageSize,
- platformSource: 0,
- })
+ try {
+ this.loading = true
+ const { pageList } = await this.$post(this.api.reviewSettingsList, {
+ ...this.filter,
+ pageNum: this.page,
+ pageSize: this.pageSize,
+ platformSource: 0,
+ })
- const list = pageList.records
- list.forEach(e => {
- // e.reviewStageName = this.reviewStage.find(n => n.id === e.reviewStage).name
- // if (e.reviewStatus !== null) e.reviewStatusName = this.reviewStatus.find(n => n.id === e.reviewStatus).name
- // e.reviewStageName = this.reviewStage.find(n => n.id === e.reviewStage).name
- e.stage = '-'
- e.time = e.evaluationId ?
- e.isTimed ?
- e.startTime + ' ~ ' + e.endTime :
- '不限时' :
- '-'
- })
- this.list = list
- this.getNow()
- this.handleStage()
- this.total = pageList.total
+ const list = pageList.records
+ list.forEach(e => {
+ // e.reviewStageName = this.reviewStage.find(n => n.id === e.reviewStage).name
+ // if (e.reviewStatus !== null) e.reviewStatusName = this.reviewStatus.find(n => n.id === e.reviewStatus).name
+ // e.reviewStageName = this.reviewStage.find(n => n.id === e.reviewStage).name
+ e.stage = '-'
+ e.time = e.evaluationId && e.hasManualScoreType ?
+ e.isTimed ?
+ e.startTime + ' ~ ' + e.endTime :
+ '不限时' :
+ '-'
+ })
+ this.list = list
+ this.getNow()
+ this.handleStage()
+ this.total = pageList.total
+ } finally {
+ this.loading = false
+ }
},
// 切换页码
currentChange (val) {
this.page = val
this.getList()
},
+ sizeChange (val) {
+ this.pageSize = val
+ this.initData()
+ },
initData () {
this.$refs.table.clearSelection()
this.page = 1
@@ -263,7 +262,7 @@ export default {
async handleStage () {
this.list.forEach(e => {
let stage = '-'
- if (e.evaluationId) {
+ if (e.evaluationId && e.hasManualScoreType) {
if (e.isTimed) {
if (e.startTime && e.endTime) {
const startTime = new Date(e.startTime)
@@ -280,7 +279,6 @@ export default {
}
e.stage = stage
})
- console.log("🚀 ~ this.timer=setInterval ~ this.list:", this.list)
},
// 获取最新时间自动计算
async getNow () {
@@ -303,7 +301,12 @@ export default {
},
// 任务分配
toTask (row) {
- this.$router.push(`records`)
+ this.$store.commit('user/setReferrer', {
+ i: 1,
+ url: `${this.$route.path}?${Qs.stringify(this.filter)}&page=${this.page}&pageSize=${this.pageSize}`
+ })
+ localStorage.setItem('review_row', JSON.stringify(row))
+ this.$router.push(`records?competitionId=${row.id}&stageId=${row.stageId}`)
},
}
};
diff --git a/src/pages/allocationReview/records/allocation.vue b/src/pages/allocationReview/records/allocation.vue
index 88177c3..b2a46de 100644
--- a/src/pages/allocationReview/records/allocation.vue
+++ b/src/pages/allocationReview/records/allocation.vue
@@ -86,7 +86,7 @@ export default {
watch: {
visible () {
this.allocationVisible = this.visible
- this.visible && this.init()
+ // this.visible && this.init()
}
},
mounted () {
diff --git a/src/pages/allocationReview/records/index.vue b/src/pages/allocationReview/records/index.vue
index 8f33213..114b7ca 100644
--- a/src/pages/allocationReview/records/index.vue
+++ b/src/pages/allocationReview/records/index.vue
@@ -15,13 +15,13 @@
+ @clear="clearcity" @change="cityChange">
-
@@ -57,22 +57,24 @@
@selection-change="handleSelectionChange">
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ scope.row.timeSum }}min
+
+
+
+
-
-
+
+
@@ -83,7 +85,8 @@
@@ -106,9 +109,8 @@ export default {
data () {
return {
crumbs: [],
- paperName: this.$route.query.paperName,
- difficults: Const.difficults,
- questionTypes: Const.questionTypes,
+ competitionId: this.$route.query.competitionId,
+ stageId: this.$route.query.stageId,
loading: false,
provinces: [],
@@ -126,13 +128,13 @@ export default {
],
date: [],
filter: {
- month: '',
- startTime: null,
- endTime: null,
+ cityId: '',
+ provinceId: '',
+ realSchoolId: '',
status: '',
keyword: '',
},
- list: [{}],
+ list: [],
page: +this.$route.query.page || 1,
pageSize: 10,
total: 0,
@@ -145,34 +147,19 @@ export default {
};
},
watch: {
- 'filter.month': function (val) {
- if (val) {
- let unit = 24 * 60 * 60 * 1000
- this.date = [dayjs(new Date(Date.now() - unit * 30 * val)).format('YYYY-MM-DD'), dayjs(new Date(Date.now() + unit)).format('YYYY-MM-DD')]
- } else {
- this.date = []
- }
- },
- date: function (val) {
- if (val) {
- this.filter.startTime = val[0];
- this.filter.endTime = val[1];
- } else {
- this.filter.startTime = ''
- this.filter.endTime = ''
- }
- // this.initData();
- },
'filter.keyword': function () {
clearTimeout(this.searchTimer)
this.searchTimer = setTimeout(this.initData, 500)
},
},
mounted () {
+ const row = localStorage.getItem('review_row')
+ if (row) this.curRow = JSON.parse(row)
+ const { referrer1 } = this.$store.state.user
this.crumbs = [
{
- name: '分配评阅任务',
- route: '/allocationReview'
+ name: row.competitionContent || '分配评阅任务',
+ route: referrer1 || '/allocationReview'
},
{
name: '任务分配'
@@ -205,38 +192,31 @@ export default {
}
this.getProvince()
- // this.getProfessional()
+ this.getList()
// this.getKnowledge()
},
methods: {
async getList () {
- let type = this.$refs.typeTree.getCurrentKey()
- const k = this.knowledgePointIds
- if (k.length) { // 右边筛选里的知识点
- type = k.map(e => {
- return e[e.length - 1]
- })
- } else if (type) {
- type = [type]
- }
- const { message } = await this.$post(this.api.listQuestion, {
+ const { page } = await this.$post(this.api.competitionUserReport, {
...this.filter,
- givenYears: this.givenYears ? [this.givenYears] : [],
- isNotJoin: this.isNotJoin || '',
pageNum: this.page,
pageSize: this.pageSize,
- questionBankId: this.questionBankId,
- knowledgePointIds: type || [],
+ competitionId: this.competitionId,
+ stageId: this.stageId,
})
- this.list = Util.removeTag(message.records)
- this.total = message.total
+ this.list = page.records
+ this.total = page.total
},
// 切换页码
currentChange (val) {
this.page = val
this.getList()
},
- handleSelectionChange (val) { // 多选
+ sizeChange (val) {
+ this.pageSize = val
+ this.initData()
+ },
+ handleSelectionChange (val) {
this.multipleSelection = val
},
initData () {
@@ -253,7 +233,7 @@ export default {
// 清除省份
clearprovince () {
this.filter.cityId = '',
- this.filter.schoolId = ''
+ this.filter.realSchoolId = ''
},
// 省份选择回调
provinceChange () {
@@ -270,11 +250,11 @@ export default {
},
// 清除城市
clearcity () {
- this.filter.schoolId = ''
+ this.filter.realSchoolId = ''
},
// 城市选择回调
cityChange () {
- this.filter.schoolId = ''
+ this.filter.realSchoolId = ''
this.getSchool()
this.initData()
},
diff --git a/src/pages/expert/list/index.vue b/src/pages/expert/list/index.vue
new file mode 100644
index 0000000..ab13f4c
--- /dev/null
+++ b/src/pages/expert/list/index.vue
@@ -0,0 +1,401 @@
+
+
+
筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+ 重置密码
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/myReview/list/index.vue b/src/pages/myReview/list/index.vue
index 908dc74..f9ea581 100644
--- a/src/pages/myReview/list/index.vue
+++ b/src/pages/myReview/list/index.vue
@@ -51,7 +51,8 @@
@@ -196,6 +197,10 @@ export default {
this.page = val
this.getList()
},
+ sizeChange (val) {
+ this.pageSize = val
+ this.initData()
+ },
initData () {
this.$refs.table.clearSelection()
this.page = 1
diff --git a/src/pages/myReview/records/index.vue b/src/pages/myReview/records/index.vue
index 4a8a7ef..d256c95 100644
--- a/src/pages/myReview/records/index.vue
+++ b/src/pages/myReview/records/index.vue
@@ -66,7 +66,8 @@
@@ -209,7 +210,11 @@ export default {
this.page = val
this.getList()
},
- handleSelectionChange (val) { // 多选
+ sizeChange (val) {
+ this.pageSize = val
+ this.initData()
+ },
+ handleSelectionChange (val) {
this.multipleSelection = val
},
initData () {
diff --git a/src/router/modules/expert.js b/src/router/modules/expert.js
new file mode 100644
index 0000000..2d1c6ea
--- /dev/null
+++ b/src/router/modules/expert.js
@@ -0,0 +1,19 @@
+import BasicLayout from '@/layouts/home'
+
+const meta = {}
+
+export default {
+ path: '/expert',
+ redirect: {
+ path: `/expert/list`
+ },
+ meta,
+ component: BasicLayout,
+ children: [
+ {
+ path: 'list',
+ component: () => import('@/pages/expert/list'),
+ meta: { title: '专家管理' }
+ },
+ ]
+};