diff --git a/src/api/paper/paper.js b/src/api/paper/paper.js index a5f7f8f..c276d5b 100644 --- a/src/api/paper/paper.js +++ b/src/api/paper/paper.js @@ -1,9 +1,15 @@ -import { post } from '@/utils/request' +import { post, get } from '@/utils/request' /** * 试卷列表 * @param data */ export function listPaper(userId, examId) { - return post('/exam/api/paper/paper/paging', { current: 1, size: 5, params: { userId: userId, examId: examId }}) + return post('/exam/api/paper/paper/paging', { current: 1, size: 5, params: { userId: userId, examId: examId } }) +} + + +// 准备考试 +export function getRegExamList() { + return get(`/exam/api/exam/registration/getRegExamList?userId=${JSON.parse(localStorage.getItem("user")).id}&finishState=0`) } diff --git a/src/router/index.js b/src/router/index.js index 3eb4c76..b06d1d3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,14 +115,12 @@ export const asyncRoutes = [ roles: ['student', 'sa'] }, children: [ - { path: 'exam', component: () => import('@/views/paper/exam/list'), name: 'ExamOnline', - meta: { title: '在线考试', noCache: true, icon: 'guide' } + meta: { title: '模拟考试', noCache: true, icon: 'guide' } }, - { path: 'exam/prepare/:examId', component: () => import('@/views/paper/exam/preview'), @@ -130,7 +128,12 @@ export const asyncRoutes = [ meta: { title: '准备考试', noCache: true, activeMenu: '/my/exam' }, hidden: true }, - + { + path: 'exam/prepareexam', + component: () => import('@/views/paper/exam/prepareexam'), + name: 'PrepareExam', + meta: { title: '准备考试', noCache: true, icon: 'log' } + }, { path: 'exam/result/:id', component: () => import('@/views/paper/exam/result'), @@ -138,14 +141,12 @@ export const asyncRoutes = [ meta: { title: '考试结果', noCache: true, activeMenu: '/online/exam' }, hidden: true }, - { path: 'exam/records', component: () => import('@/views/user/exam/my'), name: 'ListMyExam', meta: { title: '我的成绩', noCache: true, icon: 'results' } }, - { path: 'book/list/:examId', component: () => import('@/views/user/book'), @@ -153,7 +154,6 @@ export const asyncRoutes = [ meta: { title: '考试错题', noCache: true, activeMenu: '/my/exam/records' }, hidden: true }, - { path: 'book/training/:examId', component: () => import('@/views/user/book/train'), @@ -161,7 +161,6 @@ export const asyncRoutes = [ meta: { title: '错题训练', noCache: true, activeMenu: '/my/exam/records' }, hidden: true } - ] }, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6cf0fd3..cebb3ae 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,7 @@ import { login, reg, logout, getInfo } from '@/api/user' import { getToken, setToken, removeToken } from '@/utils/auth' import router, { resetRouter } from '@/router' +import Cookies from 'js-cookie' const state = { token: getToken(), @@ -43,8 +44,15 @@ const actions = { return new Promise((resolve, reject) => { login({ username: username.trim(), password: password }).then(response => { const { data } = response + console.log(data) commit('SET_TOKEN', data.token) setToken(data.token) + localStorage.setItem("user", JSON.stringify({ + id: data.id, + cardNo: data.userName, + realName: data.realName, + phone: data.phone, + })); resolve() }).catch(error => { reject(error) diff --git a/src/utils/request.js b/src/utils/request.js index e8730fc..67da159 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -171,3 +171,15 @@ export function post(url, data = {}) { }) }) } + + +export function get(url, data = {}) { + return new Promise((resolve, reject) => { + instance.get(url, { params: data }) + .then(response => { + resolve(response) + }, err => { + reject(err) + }) + }) +} diff --git a/src/views/exam/exam/form.vue b/src/views/exam/exam/form.vue index 8b61722..beacf59 100644 --- a/src/views/exam/exam/form.vue +++ b/src/views/exam/exam/form.vue @@ -134,7 +134,7 @@ export default { filterText: '', treeLoading: false, dateValues: [], - timeValues: undefined, + timeValues: [], // 题库 repoList: [], // 已选择的题库 diff --git a/src/views/exam/exam/index.vue b/src/views/exam/exam/index.vue index f55196b..8a9c646 100644 --- a/src/views/exam/exam/index.vue +++ b/src/views/exam/exam/index.vue @@ -1,6 +1,9 @@