From 8c0f29a39e8328b80635e803400d2825e2516408 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 六月 2024 14:36:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/answer/detail.vue | 8 ---
src/views/answer/info.vue | 2
src/store/modules/enumItem.js | 23 +++++++----
src/views/answer/list.vue | 2
src/views/exam/exam/MarkPaper.vue | 5 +-
src/router.js | 7 +++
src/views/exam/exam/MarkPaperDetail.vue | 35 ++++++++++++++---
src/views/exam/question/edit/audio.vue | 2
8 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/router.js b/src/router.js
index 17ffd6e..f0ddcab 100644
--- a/src/router.js
+++ b/src/router.js
@@ -52,6 +52,13 @@
name: 'MarkPaper',
meta: { title: '闃呭嵎'},
hidden: true
+ },
+ {
+ path: '/exam/mark/paper/detail',
+ component: () => import('@/views/exam/exam/MarkPaperDetail'),
+ name: 'MarkPaperDetail',
+ meta: { title: '闃呭嵎'},
+ hidden: true
}
]
},
diff --git a/src/store/modules/enumItem.js b/src/store/modules/enumItem.js
index 9572098..861a788 100644
--- a/src/store/modules/enumItem.js
+++ b/src/store/modules/enumItem.js
@@ -4,8 +4,8 @@
sexEnum: [{ key: 1, value: '鐢�' }, { key: 2, value: '濂�' }],
statusEnum: [{ key: 1, value: '鍚敤' }, { key: 2, value: '绂佺敤' }],
levelEnum: [{ key: 1, value: '涓�骞寸骇' }, { key: 2, value: '浜屽勾绾�' }, { key: 3, value: '涓夊勾绾�' }, { key: 4, value: '鍥涘勾绾�' }, { key: 5, value: '浜斿勾绾�' }, { key: 6, value: '鍏勾绾�' },
- { key: 7, value: '鍒濅竴' }, { key: 8, value: '鍒濅簩' }, { key: 9, value: '鍒濅笁' },
- { key: 10, value: '楂樹竴' }, { key: 11, value: '楂樹簩' }, { key: 12, value: '楂樹笁' }],
+ { key: 7, value: '鍒濅竴' }, { key: 8, value: '鍒濅簩' }, { key: 9, value: '鍒濅笁' },
+ { key: 10, value: '楂樹竴' }, { key: 11, value: '楂樹簩' }, { key: 12, value: '楂樹笁' }],
roleEnum: [{ key: 1, value: '瀛︾敓' }, { key: 2, value: '鏁欏笀' }, { key: 3, value: '绠＄悊鍛�' }],
statusTag: [{ key: 1, value: 'success' }, { key: 2, value: 'danger' }],
statusBtn: [{ key: 1, value: '绂佺敤' }, { key: 2, value: '鍚敤' }]
@@ -17,13 +17,18 @@
question: {
typeEnum: [{ key: 1, value: '鍗曢�夐' }, { key: 2, value: '澶氶�夐' }, { key: 3, value: '鍒ゆ柇棰�' }, { key: 4, value: '濉┖棰�' }, { key: 5, value: '绠�绛旈' }, { key: 6, value: '璇煶棰�' }, { key: 7, value: '璁＄畻棰�' }, { key: 8, value: '鍒嗘瀽棰�' }],
editUrlEnum: [{ key: 1, value: '/exam/question/edit/singleChoice', name: '鍗曢�夐' },
- { key: 2, value: '/exam/question/edit/multipleChoice', name: '澶氶�夐' },
- { key: 3, value: '/exam/question/edit/trueFalse', name: '鍒ゆ柇棰�' },
- { key: 4, value: '/exam/question/edit/gapFilling', name: '濉┖棰�' },
- { key: 5, value: '/exam/question/edit/shortAnswer', name: '绠�绛旈' },
- { key: 6, value: '/exam/question/edit/audio', name: '璇煶棰�' },
- { key: 7, value: '/exam/question/edit/calculate', name: '璁＄畻棰�' },
- { key: 8, value: '/exam/question/edit/analysis', name: '鍒嗘瀽棰�' }]
+ { key: 2, value: '/exam/question/edit/multipleChoice', name: '澶氶�夐' },
+ { key: 3, value: '/exam/question/edit/trueFalse', name: '鍒ゆ柇棰�' },
+ { key: 4, value: '/exam/question/edit/gapFilling', name: '濉┖棰�' },
+ { key: 5, value: '/exam/question/edit/shortAnswer', name: '绠�绛旈' },
+ { key: 6, value: '/exam/question/edit/audio', name: '璇煶棰�' },
+ { key: 7, value: '/exam/question/edit/calculate', name: '璁＄畻棰�' },
+ { key: 8, value: '/exam/question/edit/analysis', name: '鍒嗘瀽棰�' }],
+ answer: {
+ doRightTag: [{ key: true, value: 'success' }, { key: false, value: 'danger' }, { key: null, value: 'warning' }],
+ doRightEnum: [{ key: true, value: '姝ｇ‘' }, { key: false, value: '閿欒' }, { key: null, value: '寰呮壒鏀�' }],
+ doCompletedTag: [{ key: false, value: 'info' }, { key: true, value: 'success' }]
+ }
}
}
}
diff --git a/src/views/answer/detail.vue b/src/views/answer/detail.vue
index 013aec1..39df00e 100644
--- a/src/views/answer/detail.vue
+++ b/src/views/answer/detail.vue
@@ -8,13 +8,6 @@
</span>
</el-col>
</el-row>
- <el-row class="do-exam-title-hidden">
- <el-col :span="24">
- <span :key="item.itemOrder" v-for="item in answer.answerItems">
- <el-tag class="do-exam-title-tag">{{ item.itemOrder }}</el-tag>
- </span>
- </el-col>
- </el-row>
<el-container class="app-item-contain">
<el-header class="align-center">
<h1>{{ form.name }}</h1>
@@ -67,6 +60,7 @@
if (id && parseInt(id) !== 0) {
_this.formLoading = true
examPaperAnswerApi.read(id).then(re => {
+ re = {"code":1,"message":"鎴愬姛","data":{"paper":{"id":30,"level":1,"subjectId":4,"paperType":7,"name":"杩欐槸涓�涓祴璇曡瘯鍗�","suggestTime":12,"limitDateTime":null,"titleItems":[{"name":"鍗曢�夐","questionItems":[{"id":25,"questionType":1,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楁纭殑鏄�","gradeLevel":1,"items":[{"prefix":"A","content":"绾㈡ゼ姊�","score":null,"itemUuid":null},{"prefix":"B","content":"鐧芥ゼ姊�","score":null,"itemUuid":null},{"prefix":"C","content":"闈掓ゼ姊�","score":null,"itemUuid":null},{"prefix":"D","content":"缁挎ゼ姊�","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":null,"correct":"A","score":"2.5","difficult":3,"itemOrder":1,"knowledgeIdList":[8,9]},{"id":30,"questionType":1,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楁纭殑鏄�","gradeLevel":1,"items":[{"prefix":"A","content":"绾㈡ゼ姊�","score":null,"itemUuid":null},{"prefix":"B","content":"鐧芥ゼ姊�","score":null,"itemUuid":null},{"prefix":"C","content":"闈掓ゼ姊�","score":null,"itemUuid":null},{"prefix":"D","content":"缁挎ゼ姊�","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":null,"correct":"A","score":"2.5","difficult":3,"itemOrder":2,"knowledgeIdList":[8,9]}]},{"name":"澶氶�夐","questionItems":[{"id":26,"questionType":2,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楁纭殑鏄�","gradeLevel":1,"items":[{"prefix":"A","content":"绾㈡ゼ姊�","score":null,"itemUuid":null},{"prefix":"B","content":"鐧芥ゼ姊�","score":null,"itemUuid":null},{"prefix":"C","content":"闈掓ゼ姊�","score":null,"itemUuid":null},{"prefix":"D","content":"缁挎ゼ姊�","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":["A","C"],"correct":"A,C","score":"2.5","difficult":3,"itemOrder":3,"knowledgeIdList":[8,9]},{"id":31,"questionType":2,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楁纭殑鏄�","gradeLevel":1,"items":[{"prefix":"A","content":"绾㈡ゼ姊�","score":null,"itemUuid":null},{"prefix":"B","content":"鐧芥ゼ姊�","score":null,"itemUuid":null},{"prefix":"C","content":"闈掓ゼ姊�","score":null,"itemUuid":null},{"prefix":"D","content":"缁挎ゼ姊�","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":["A","C"],"correct":"A,C","score":"2.5","difficult":3,"itemOrder":4,"knowledgeIdList":[8,9]}]},{"name":"鍒ゆ柇棰�","questionItems":[{"id":27,"questionType":3,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楄鏄庢纭悧","gradeLevel":1,"items":[{"prefix":"A","content":"姝ｇ‘","score":null,"itemUuid":null},{"prefix":"B","content":"閿欒","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":null,"correct":"A","score":"2.5","difficult":3,"itemOrder":5,"knowledgeIdList":[8,9]},{"id":32,"questionType":3,"subjectId":4,"title":"涓崕鍥涘ぇ鍚嶈憲閮芥湁鍝簺锛屼笅鍒楄鏄庢纭悧","gradeLevel":1,"items":[{"prefix":"A","content":"姝ｇ‘","score":null,"itemUuid":null},{"prefix":"B","content":"閿欒","score":null,"itemUuid":null}],"analyze":"棰樼洰姣旇緝绠�鍗曪紝鑷鍒嗘瀽","correctArray":null,"correct":"A","score":"2.5","difficult":3,"itemOrder":6,"knowledgeIdList":[8,9]}]}],"score":"15","classes":null},"answer":{"id":9,"doTime":26,"score":"100","createUser":null,"answerItems":[{"id":25,"questionId":25,"doRight":true,"content":"A","itemOrder":1,"contentArray":null,"score":"2.5","questionScore":"2.5"},{"id":26,"questionId":30,"doRight":false,"content":"C","itemOrder":2,"contentArray":null,"score":"0","questionScore":"2.5"},{"id":27,"questionId":26,"doRight":false,"content":"","itemOrder":3,"contentArray":[""],"score":"0","questionScore":"2.5"},{"id":28,"questionId":31,"doRight":false,"content":"C,D","itemOrder":4,"contentArray":["C","D"],"score":"0","questionScore":"2.5"},{"id":29,"questionId":27,"doRight":true,"content":"A","itemOrder":5,"contentArray":null,"score":"2.5","questionScore":"2.5"},{"id":30,"questionId":32,"doRight":true,"content":"A","itemOrder":6,"contentArray":null,"score":"2.5","questionScore":"2.5"}],"doTimeStr":"26绉�"}}}
_this.form = re.data.paper
_this.answer = re.data.answer
_this.formLoading = false
diff --git a/src/views/answer/info.vue b/src/views/answer/info.vue
index 0f8d0ef..3d2a382 100644
--- a/src/views/answer/info.vue
+++ b/src/views/answer/info.vue
@@ -21,7 +21,7 @@
<!-- 琛ㄦ牸 -->
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row>
<el-table-column prop="paperName" label="璇曞嵎鍚嶇О" align="center" />
- <el-table-column prop="userName" label="鐢ㄦ埛鍚嶇О" align="center" />
+ <el-table-column prop="userName" label="鍙傝�冧汉" align="center" />
<el-table-column label="寰楀垎" width="100px">
<template slot-scope="{row}">
{{ row.userScore }} / {{ row.paperScore }}
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index 63d1414..a408eec 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -36,7 +36,7 @@
<span>{{ row.personAnswerNum + "/" + row.personTotalNum }}</span>
</template>
</el-table-column>
- <el-table-column align="center" prop="userName" label="鍒涘缓浜�" width="100px" />
+ <el-table-column align="center" prop="userName" label="鍙戣捣浜�" width="100px" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="{row}">
<el-button size="mini" @click="view(row)">鏌ョ湅</el-button>
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 4449396..7c68b67 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -82,7 +82,7 @@
width="300px"
>
<template slot-scope="scope">
- <el-button @click="markPaper(scope.row)" type="warning">闃呭嵎</el-button>
+ <el-button @click="markPaper(scope.row.userId)" type="warning">闃呭嵎</el-button>
</template>
</el-table-column>
</el-table>
@@ -124,8 +124,9 @@
return '鏈畬鎴�'
}
},
- markPaper (row) {
+ markPaper (userId) {
// todo鎵撳紑闃呭嵎椤甸潰
+ this.$router.push({path: "/exam/mark/paper/detail", query: {examId: this.examInfo.examId, examName: this.examInfo.examName, userId: userId}})
},
getExamInfo () {
getExamMarkPaperInfo(this.examInfo.examId).then(res => {
diff --git a/src/views/exam/exam/MarkPaperDetail.vue b/src/views/exam/exam/MarkPaperDetail.vue
index 8b8710f..da51e38 100644
--- a/src/views/exam/exam/MarkPaperDetail.vue
+++ b/src/views/exam/exam/MarkPaperDetail.vue
@@ -1,10 +1,19 @@
<template>
<div>
- <el-row style="text-align: center">xxx鑰冭瘯</el-row>
- <el-row>
- <div>xxx濮撳悕</div>
- <div>xxx浜ゅ嵎鏃堕棿</div>
- <div>xxx绛旈鏃堕棿</div>
+ <el-row style="text-align: center;margin-top: 20px;margin-bottom: 20px; font-size: 28px">xxx鑰冭瘯</el-row>
+ <el-row :gutter="20">
+ <el-col :span="8" class="info">
+ <span class="exam-info">瀛﹀憳濮撳悕锛�</span>
+ <span class="exam-info">{{userName}}</span>
+ </el-col>
+ <el-col :span="8" class="info">
+ <span class="exam-info">浜ゅ嵎鏃堕棿锛�</span>
+ <span class="exam-info">{{examInfo.updateTime}}</span>
+ </el-col>
+ <el-col :span="8" class="info">
+ <span class="exam-info">瀹屾垚鑰楁椂锛�</span>
+ <span class="exam-info">{{examInfo.doTime}}</span>
+ </el-col>
</el-row>
<el-row class="paper-warp">
<div v-for="(paper,index) in examInfo.paperQuestionList" :key="index" class="paperTitleWarp">
@@ -36,19 +45,24 @@
},
data () {
return {
+ paperQuestionList: [
+
+ ],
userId: null,
+ userName: null,
questionLoading: false,
examInfo: {
examId: null,
examName: '',
doTime: 0,
+ updateTime: null,
paperQuestionList: []
}
}
},
methods: {
getStudentPaper () {
- this.getStudentExam(this.examInfo.examId, this.userId).then(res => {
+ getStudentExam(this.examInfo.examId, this.userId).then(res => {
this.examInfo = res.data.data
})
}
@@ -61,4 +75,13 @@
margin-top: 50px;
}
+
+.exam-info {
+}
+
+.info {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+}
</style>
diff --git a/src/views/exam/question/edit/audio.vue b/src/views/exam/question/edit/audio.vue
index 4743443..fe66b6d 100644
--- a/src/views/exam/question/edit/audio.vue
+++ b/src/views/exam/question/edit/audio.vue
@@ -14,7 +14,7 @@
:on-remove="handleRemove" :file-list="audioList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
<el-button v-if="form.audioFile" size="small" type="primary" @click.stop="audioPlay(form.audioFile)">{{
- audioInstance ? '鏆傚仠' : '璇曞惉' }}</el-button>
+ audioInstance ? '鍋滄' : '鎾斁' }}</el-button>
</el-upload>
</el-form-item>
<el-form-item label="閫夐」锛�" required>
--
Gitblit v1.8.0