-
-
{{questionType[k]}}（共{{subjects[k].length}}题，合计20分）
-
-
-
-
-
-
- {{i}}.{{item.options[i]}}
-
-
-
-
-
-
- {{i}}.{{item.options[i]}}
-
-
-
-
-
-
+
+
+
{{questionType[k]}}（共{{subjects[k].length}}题，合计{{scoreList[k]}}分）
+
+
+
+
+
+
+ {{i}}.{{item.options[i]}}
+
+
+
+
+
+
+ {{i}}.{{item.options[i]}}
+
+
+
+
+
+
+
+
剩余时间
-
00:59:00
+
{{time}}
答题进度
-
+
@@ -94,7 +96,31 @@ export default {
return {
subjects: [],
timer: null,
+ queryStateTimer: null,
+ singleCount: 0,
+ multipleCount: 0,
+ judgeCount: 0,
+ fillBlankCount: 0,
+ briefAnswerCount: 0,
+
+ singleAnsweredCount: 0,
+ multipleAnsweredCount: 0,
+ judgeAnsweredCount: 0,
+ fillBlankAnsweredCount: 0,
+ briefAnswerAnsweredCount: 0,
+
+ singlePoint: 0,
+ multipleChoiceScore: 0,
+ judgeScore: 0,
+ fillBlanksScore: 0,
+ briefAnswerScore: 0,
+ scoreList: [],
questionType: ['单选题','多选题','判断题','填空题','简答题'],
+ startTime: new Date().getTime(),
+ time: '00:00:00',
+ progress: 0,
+ isSubmit: false,
+ isDone: false
};
},
computed: {
@@ -102,14 +128,15 @@ export default {
'userId'
]),
...mapState('exam', [
- 'testPaperId','assessmentId'
+ 'testPaperId','assessmentId','teacherId','classId','duration'
]),
},
directives: {
countdown: {
bind: function(el,binding,vnode) {
let that = vnode.context
- let time = el.innerHTML
+ let duration = that.duration
+ let time = duration > 60 ? util.formateTime(Math.floor(duration / 60)) + ':' + util.formateTime(Math.floor(duration % 60)) + ':00' : `00:${duration}:00`
that.timer = setInterval(() => {
let timeList = time.split(':')
let total = Number.parseInt(timeList[0] * 60 * 60) + Number.parseInt(timeList[1] * 60) + Number.parseInt(timeList[2])
@@ -120,23 +147,24 @@ export default {
let seconds = Math.floor(total % (60 * 60) % 60)
time = `${util.formateTime(hours)}:${util.formateTime(minutes)}:${util.formateTime(seconds)}`
}else{
+ that.save()
clearInterval(that.timer)
}
- el.innerHTML = time
+ that.time = time
},1000)
}
}
},
mounted() {
this.getData()
- this.getAnswer()
+ this.addLeaveEvent()
+ this.queryState()
},
- destroyed(){
- // this.$get(`${this.api.queryGzAnswerDetails}?userId=${this.userId}&assessmentId=${this.assessmentId}&questionId=${1}`)
- // .then(res => {
-
- // })
- // .catch(err => {});
+ beforeDestroy(){
+ clearInterval(this.timer)
+ clearInterval(this.queryStateTimer)
+ window.onbeforeunload = null
+ this.addRecords()
},
methods: {
getData() {
@@ -150,30 +178,68 @@ export default {
[...data.fillInTheBlanklist],
[...data.shortAnswerList],
]
+ this.singleCount = data.singleChoiceList.length
+ this.multipleCount = data.multipleChoiceList.length
+ this.judgeCount = data.trueOrFalseQuestionsList.length
+ this.fillBlankCount = data.fillInTheBlanklist.length
+ this.briefAnswerCount = data.shortAnswerList.length
+
+ this.singlePoint = data.singleChoiceList.length ? data.singleChoiceList[0].singleChoiceScore : 0
+ this.multipleChoiceScore = data.multipleChoiceList.length ? data.multipleChoiceList[0].multipleChoiceScore : 0
+ this.judgeScore = data.trueOrFalseQuestionsList.length ? data.trueOrFalseQuestionsList[0].judgeScore : 0
+ this.fillBlanksScore = data.fillInTheBlanklist.length ? data.fillInTheBlanklist[0].fillBlanksScore : 0
+ this.briefAnswerScore = data.shortAnswerList.length ? data.shortAnswerList[0].briefAnswerScore : 0
+ this.scoreList = [this.singlePoint,this.multipleChoiceScore,this.fillBlanksScore,this.briefAnswerScore,this.briefAnswerScore]
this.handleOptions()
})
- .catch(err => {});
+ .catch(err => {})
},
getAnswer() {
- this.$get(`${this.api.queryGzAnswerDetails}?userId=${this.userId}&assessmentId=${this.assessmentId}&questionId=${this.testPaperId}`)
+ this.$get(`${this.api.queryGzAnswerDetails}?userId=${this.userId}&assessmentId=${this.assessmentId}&testPaperId=${this.testPaperId}`)
.then(res => {
- this.subjects.forEach(e => {
- e.forEach(n => {
- n.questionStatus = 0
+ let records = res.data.data
+ let len = 0
+ this.subjects.map(n => len += n.length)
+ this.progress = len ? Math.floor((records.length / len * 100)) : 0
+
+ this.singleAnsweredCount = records.filter(n => n.typeId == 1).length
+ this.multipleAnsweredCount = records.filter(n => n.typeId == 2).length
+ this.judgeAnsweredCount = records.filter(n => n.typeId == 3).length
+ this.briefAnswerAnsweredCount = records.filter(n => n.typeId == 4).length
+ this.fillBlankAnsweredCount = records.filter(n => n.typeId == 5).length
+
+ this.subjects.forEach((e,i) => {
+ e.forEach((n,k) => {
+ let answered = records.find(j => j.questionId == n.id)
+ if(answered){
+ if(i == 1){
+ n.val = answered.userAnswer.split('')
+ }else if(i == 3){
+ let answer = answered.userAnswer.split('<>');
+ [...document.querySelectorAll(`.stem${i}${k} input`)].map((n,j) => {
+ n.value = answer[j]
+ })
+ n.val = answered.userAnswer
+ }else{
+ n.val = answered.userAnswer
+ }
+ n.questionStatus = 1
+ }else{
+ n.questionStatus = 0
+ }
})
})
- console.log(33,this.subjects)
})
.catch(err => {})
},
handleOptions(){
let subjects = this.subjects
- subjects.forEach(e => {
+ subjects.forEach((e,i) => {
e.forEach(n => {
- if(n.typeId == 2){
+ if(i == 1){
this.$set(n,'val',[])
- }else if(n.typeId == 4){
-
+ }else if(i == 3){
+ n.questionStem = n.questionStem.replace(/\(\)\(\)\(\)/g,`
`)
}else{
this.$set(n,'val','')
}
@@ -189,29 +255,42 @@ export default {
})
})
this.subjects = subjects
+ this.getAnswer()
},
- save(){
- console.log(this.subjects)
- let invalid = false
- this.subjects.map(e => {
- e.map(n => {
- if(n.typeId == 2){
- if(!n.val.length) invalid = true
- }else{
- if(n.val === '') invalid = true
+ addLeaveEvent(){
+ window.onbeforeunload = e => {
+ e = e || window.event;
+ if (e) {
+ e.returnValue = '关闭提示'
+ }
+ this.addRecords()
+ return '关闭提示'
+ }
+ },
+ queryState(){
+ this.queryStateTimer = setInterval(() => {
+ this.$post(`${this.api.getStateById}?id=${this.assessmentId}`)
+ .then(res => {
+ if(res.data.state == '已结束'){
+ this.isDone = true
+ this.save()
}
})
- })
- if(invalid) return this.$message.warning('请先答完所有题目')
-
+ .catch(err => {
+ this.$message.success('考试结束！')
+ this.$router.back()
+ })
+ },1000)
+ },
+ save(){
let data1 = []
this.subjects.map((e,i) => {
- e.map(n => {
+ e.map((n,k) => {
let userAnswer = ''
if(i == 1){
userAnswer = n.val.join('')
}else if(i == 3){
- // userAnswer = n.val.join('<>')
+ userAnswer = [...document.querySelectorAll(`.stem${i}${k} input`)].map(n => n.value).join('<>')
}else{
userAnswer = n.val
}
@@ -221,33 +300,76 @@ export default {
questionStatus : n.questionStatus,
testPaperId: this.testPaperId,
userAnswer: userAnswer,
- userId: this.userId,
+ userId: this.userId
})
})
})
- this.$post(`${this.api.addGzAnswerDetails}`,data1)
+
+ this.$post(`${this.api.coverGzAnswerDetails}?userId=${this.userId}&testPaperId=${this.testPaperId}&assessmentId=${this.assessmentId}`)
.then(res => {
- let data2 = {
- assessmentId: this.assessmentId,
- classId: this.classId,
- paperId: this.testPaperId,
- stuId: this.userId,
- teacherId: this.teacherId,
- timeSpent: 2,
- totalDuration: 10,
- totalScore: 100
- }
- this.$post(`${this.api.addTestPaperRecord}`,data2)
+ this.$post(`${this.api.addGzAnswerDetails}`,data1)
.then(res => {
- this.$post(`${this.api.calculationScore}`,data1)
+ let timeSpent = parseInt((new Date().getTime() - this.startTime) / 1000)
+ let data2 = {
+ testPaperId: this.testPaperId,
+ assessmentId: this.assessmentId,
+ classId: this.classId,
+ paperId: this.testPaperId,
+ stuId: this.userId,
+ teacherId: this.teacherId,
+ timeSpent,
+ totalDuration: this.duration,
+ totalScore: 100
+ }
+ this.$post(`${this.api.addTestPaperRecord}`,data2)
.then(res => {
-
+ this.$post(`${this.api.calculationScore}`,data1)
+ .then(res => {
+ this.isSubmit = true
+ this.$message.success(this.isDone ? '考试已结束，已经自动为您提交考试！' : '提交成功')
+ this.$router.back()
+ })
+ .catch(err => {})
})
- .catch(err => {});
+ .catch(err => {})
})
- .catch(err => {});
+ .catch(err => {})
})
- .catch(err => {});
+ .catch(err => {})
+ },
+ addRecords(){
+ if(!this.isSubmit){
+ let data1 = []
+ this.subjects.map((e,i) => {
+ e.map((n,k) => {
+ let userAnswer = ''
+ if(i == 1){
+ userAnswer = n.val.join('')
+ }else if(i == 3){
+ userAnswer = [...document.querySelectorAll(`.stem${i}${k} input`)].map(n => n.value).join('<>')
+ }else{
+ userAnswer = n.val
+ }
+ data1.push({
+ testPaperId: this.testPaperId,
+ assessmentId: this.assessmentId,
+ questionId: n.id,
+ questionStatus : n.questionStatus,
+ testPaperId: this.testPaperId,
+ userAnswer: userAnswer,
+ userId: this.userId
+ })
+ })
+ })
+
+ this.$post(`${this.api.coverGzAnswerDetails}?userId=${this.userId}&testPaperId=${this.testPaperId}&assessmentId=${this.assessmentId}`)
+ .then(res => {
+ this.$post(`${this.api.addGzAnswerDetails}`,data1)
+ .then(res => {})
+ .catch(err => {})
+ })
+ .catch(err => {})
+ }
}
},
}
@@ -287,11 +409,10 @@ export default {
}
.nums{
display: flex;
- justify-content: space-between;
flex-wrap: wrap;
span{
width: 24px;
- margin: 2px 0;
+ margin: 2px 1px;
line-height: 24px;
text-align: center;
color: #888;
@@ -300,9 +421,10 @@ export default {
border: 1px solid #e6e6e6;
border-radius: 50%;
}
- &.active{
+ .active{
color: #fff;
background-color: #e80909;
+ border-color: #e80909;
}
}
}
@@ -334,7 +456,7 @@ export default {
}
.name-wrap{
display: flex;
- align-items: flex-start;
+ align-items: center;
margin-bottom: 10px;
font-size: 13px;
color: #444;
@@ -342,6 +464,23 @@ export default {
font-size: 13px;
color: #444;
}
+ /deep/.input{
+ width: 100px;
+ height: 28px;
+ padding: 0 5px;
+ margin: 0 5px;
+ color: #444;
+ background-color: #fff;
+ border: 1px solid #ebebeb;
+ box-sizing: border-box;
+ &:focus{
+ outline: none;
+ }
+ &:disabled{
+ background-color: #e8e8e8;
+ cursor: not-allowed;
+ }
+ }
}
.options{
margin-top: 10px;
diff --git a/src/pages/exam/list/index.vue b/src/pages/exam/list/index.vue
index 75ebbfa..7c20db7 100644
--- a/src/pages/exam/list/index.vue
+++ b/src/pages/exam/list/index.vue
@@ -27,14 +27,13 @@
-
+
{{scope.$index + (page - 1) * pageSize + 1}}
-
{{getDegreeName(scope.row.degree)}}
@@ -42,17 +41,18 @@
-
-
-
+
+
+
- {{getStateName(scope.row.state)}}
+ {{scope.row.state == 2 ? '已提交' : '未提交'}}
-
+
+
进入考试
- 成绩查询
+ 成绩查询
@@ -106,7 +106,7 @@ export default {
'setInfo'
]),
getData() {
- this.$get(`${this.api.queryExam}?type=${this.type}&assessmentName=${this.keyword}&userId=${1}`).then(res => {
+ this.$get(`${this.api.queryExam}?type=${this.type}&assessmentName=${this.keyword}&userId=${this.userId}`).then(res => {
this.listData = res.data.Assessment
this.total = res.data.total
}).catch(res => {});
@@ -119,11 +119,18 @@ export default {
this.setInfo({
testPaperId: row.testPaperId,
assessmentId: row.assessmentId,
+ teacherId: row.teacherId,
+ classId: row.classId,
+ duration: row.duration
})
this.$router.push('do')
},
query(row){
-
+ this.setInfo({
+ testPaperId: row.testPaperId,
+ assessmentId: row.id
+ })
+ this.$router.push('detail')
}
}
};
diff --git a/src/pages/practice/list/myPractice.vue b/src/pages/practice/list/myPractice.vue
index 0495c7e..319c53f 100644
--- a/src/pages/practice/list/myPractice.vue
+++ b/src/pages/practice/list/myPractice.vue
@@ -72,15 +72,15 @@ export default {
},
methods: {
getData() {
- let data = {
- classificationId: this.classificationId,
- name: this.keyword,
- schoolId: this.schoolId
- }
- this.$get(`${this.api.queryCourseByCondition}/${this.page}/${this.pageSize}`,data).then(res => {
- this.listData = res.data.courseList
- this.total = res.data.total
- }).catch(res => {});
+ // let data = {
+ // classificationId: this.classificationId,
+ // name: this.keyword,
+ // schoolId: this.schoolId
+ // }
+ // this.$get(`${this.api.queryCourseByCondition}/${this.page}/${this.pageSize}`,data).then(res => {
+ // this.listData = res.data.courseList
+ // this.total = res.data.total
+ // }).catch(res => {})
},
handleDelete(row) {
this.$confirm('确定要删除吗？', '提示', {
diff --git a/src/pages/practice/list/randomPractice.vue b/src/pages/practice/list/randomPractice.vue
index e2a2ace..3b845f9 100644
--- a/src/pages/practice/list/randomPractice.vue
+++ b/src/pages/practice/list/randomPractice.vue
@@ -73,9 +73,9 @@ export default {
},
methods: {
getData() {
- this.$get(this.api.queryAllClassification).then(res => {
- this.listData = res.data.listData
- }).catch(res => {});
+ // this.$get(this.api.queryAllClassification).then(res => {
+ // this.listData = res.data.listData
+ // }).catch(res => {})
},
handleSelectionChange(val) {
this.multipleSelection = val;
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index d8e232c..0b652fb 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -1,6 +1,4 @@
import axios from 'axios';
-import QS from 'qs';
-// import store from '../store/index'
import { Message } from 'element-ui'
import router from '@/router/index'
import Setting from '@/setting'
@@ -39,7 +37,7 @@ service.interceptors.response.use(
} else {
switch (res.code) {
case 201:
- Message.error(res.message)
+ Message.error(res.message ? res.message : '数据请求异常')
break;
default:
Promise.reject(res).catch(e => {})
diff --git a/src/router/modules/exam.js b/src/router/modules/exam.js
index ca50994..7d215e9 100644
--- a/src/router/modules/exam.js
+++ b/src/router/modules/exam.js
@@ -23,6 +23,11 @@ export default {
path: `do`,
component: () => import('@/pages/exam/do'),
meta: { title: '我的考试' }
+ },{
+ name: `${pre}detail`,
+ path: `detail`,
+ component: () => import('@/pages/exam/detail'),
+ meta: { title: '成绩查询' }
},
]
};
diff --git a/src/setting.js b/src/setting.js
index 9ffc623..c41e27c 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -15,7 +15,8 @@ const Setting = {
// 页面切换时，是否显示模拟的进度条
showProgressBar: true,
// 接口请求地址
- apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:8000',
+ // apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:8000',
+ apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
// 接口请求返回错误时，弹窗的持续时间，单位：秒
modalDuration: 3,
// 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
@@ -50,7 +51,7 @@ const Setting = {
menuSideWidth: 256,
layout: {
// 需要隐藏顶栏的页面路径
- hideNavList: ['index-do','setting-person','achievement-detail','exam-do'],
+ hideNavList: ['index-do','setting-person','achievement-detail','exam-do','exam-detail'],
// 侧边栏风格，可选值为 dark 或 light
siderTheme: 'dark',
// 顶栏风格，可选值为 light、dark 或 primary
diff --git a/src/store/modules/exam.js b/src/store/modules/exam.js
index b8249ae..dfd619e 100644
--- a/src/store/modules/exam.js
+++ b/src/store/modules/exam.js
@@ -7,7 +7,7 @@ export default {
typeList: [
{
id: 1,
- name: '期中开始'
+ name: '期中考试'
},{
id: 2,
name: '期末考试'
@@ -18,14 +18,14 @@ export default {
],
stateList: [
{
+ id: 0,
+ name: '未考'
+ },{
id: 1,
- name: '待开始'
+ name: '在考'
},{
id: 2,
- name: '进行中'
- },{
- id: 3,
- name: '已结束'
+ name: '已考'
}
],
degreeList: [
@@ -46,8 +46,10 @@ export default {
assessmentName: '',
testPaperId: '',
assessmentId: '',
+ teacherId: '',
+ classId: '',
paperName: '',
- totalDuration: ''
+ duration: ''
},
getters: {
getDegreeName: state => id => {
@@ -64,9 +66,10 @@ export default {
SET_INFO: (state, info) => {
state.assessmentName = info.assessmentName
state.assessmentId = info.assessmentId
+ state.teacherId = info.teacherId
+ state.classId = info.classId
state.testPaperId = info.testPaperId
- state.paperName = info.paperName
- state.totalDuration = info.totalDuration
+ state.duration = info.duration
},
},
actions: {
diff --git a/vue.config.js b/vue.config.js
index c5d602e..c56ab4b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,5 @@
+const Setting = require('./src/setting.env')
+
// 引入等比适配插件
const px2rem = require('postcss-px2rem')
@@ -19,10 +21,11 @@ module.exports = {
}
}
},
- publicPath: './',
- outputDir: 'dist',
- assetsDir: 'static'
- // devServer: {
+ publicPath: Setting.publicPath,
+ outputDir: Setting.outputDir,
+ assetsDir: Setting.assetsDir,
+ devServer: {
+ port: 8085
// proxy: {
// "/api": {
// target: "http://192.168.0.102:8080",
@@ -33,5 +36,5 @@ module.exports = {
// }
// }
// }
- // }
+ }
}
\ No newline at end of file