Merge branch 'master' of http://42.193.1.25:9521/r/jxkg_new_ui_teacher

ZhangXianQiang

2024-06-20 f2b0d5758f6e42826bc54e5c62a8d4afa0a65507

Merge branch 'master' of http://42.193.1.25:9521/r/jxkg_new_ui_teacher

 src/views/answer/components/QuestionAnswerShow.vue

@@ -73,6 +73,10 @@
        <span v-if="qType == 3" v-html="trueFalseFormatter(question)" class="q-item-span-content" />
        <span v-if="qType == 4">{{ question.correctArray }}</span>
      </div>
      <div v-if = "answer.doRight == null">
        <span style="color:#ECAB3C;">{{'批改：'}}</span>
        <el-input-number size="mini" v-model="question.markScore" :precision="1" :min="0" :max="parseInt(question.score)" ></el-input-number>
      </div>
    </div>
    <div v-else>
    </div>

 src/views/answer/detail.vue

@@ -39,6 +39,7 @@
import { mapState, mapGetters } from 'vuex'
import QuestionAnswerShow from './components/QuestionAnswerShow'
import examPaperAnswerApi from '@/api/examPaperAnswer'

export default {
    components: { QuestionAnswerShow },
    data() {
@@ -60,7 +61,227 @@
        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秒"}}}
        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

 src/views/exam/exam/MarkPaperDetail.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <el-row style="text-align: center;margin-top: 20px;margin-bottom: 20px; font-size: 28px">xxx考试</el-row>
    <el-row style="text-align: center;margin-top: 20px;margin-bottom: 20px; font-size: 28px">语文考试</el-row>
    <el-row :gutter="20">
      <el-col :span="8" class="info">
        <span class="exam-info">学员姓名：</span>
@@ -15,47 +15,309 @@
        <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">
        <div class="paperTitle">{{ paper.title }}</div>
        <div class="question-warp">
          <div v-for="(doQuestion, index) in paper.questionList" :key="index">
            <DoQuestion :question="doQuestion" :qType="paper.questionType" :qLoading="questionLoading"></DoQuestion>
          </div>
        </div>
      </div>
    <el-main>
      <el-form :model="form" ref="form" v-loading="formLoading" label-width="100px">
        <el-row :key="index" v-for="(titleItem, index) in form.titleItems">
          <h3>{{ titleItem.name }}</h3>
          <el-card class="exampaper-item-box" v-if="titleItem.questionItems.length !== 0">
            <el-form-item :key="questionItem.itemOrder" :label="questionItem.itemOrder + '.'"
                          v-for="questionItem in titleItem.questionItems" class="exam-question-item"
                          label-width="50px" :id="'question-' + questionItem.itemOrder">
              <QuestionAnswerShow :qType="questionItem.questionType" :question="questionItem"
                                  :answer="answer.answerItems[questionItem.itemOrder - 1]"/>
            </el-form-item>
          </el-card>
    </el-row>
      </el-form>
    </el-main>
  </div>
</template>

<script>
import DoQuestion from '@/components/question/DoQuestion'
import { getStudentExam } from '@/api/exam'
import QuestionAnswerShow from '@/views/answer/components/QuestionAnswerShow'
import examPaperAnswerApi from '@/api/examPaperAnswer'

export default {
  name: 'MarkPaperDetail',
  components: { DoQuestion },
  components: { QuestionAnswerShow },
  mounted () {
    this.examInfo.examId = this.$route.query.examId
    this.examInfo.examName = this.$route.query.examName
    this.userId = this.$route.query.userId
    if (this.examInfo.examId && this.userId) {
      this.getStudentPaper()
    examPaperAnswerApi.read(1).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]
              }]
            }, {
              'name': '简答题',
              'questionItems': [{
                'id': 1,
                'questionType': 5,
                'subjectId': 4,
                'title': '中华四大名著都有哪些',
                'gradeLevel': 1,
                'analyze': '题目比较简单，自行分析',
                'correct': '红楼梦、西游记、水浒传、三国演义',
                'score': '10',
                'difficult': 3,
                'itemOrder': 7,
                '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'
            }, {
              'id': 31,
              'questionId': 1,
              'doRight': null,
              'content': '红楼梦.......',
              'itemOrder': 6,
              'questionScore': '10'
            }],
            'doTimeStr': '26秒'
          }
        }
      }
      this.form = re.data.paper
      this.answer = re.data.answer
      this.formLoading = false
    })
    // if (this.examInfo.examId && this.userId) {
    //   this.getStudentPaper()
    // }
  },
  data () {
    return {
      paperQuestionList: [

      ],
      paperQuestionList: [],
      form: {},
      formLoading: false,
      answer: {
        id: null,
        score: 0,
        doTime: 0,
        answerItems: [],
        doRight: false
      },
      userId: null,
      userName: null,
      userName: '张三',
      questionLoading: false,
      examInfo: {
        examId: null,
        examName: '',
        doTime: 0,
        updateTime: null,
        doTime: '119分40秒',
        updateTime: '2024-06-20 15:59:40',
        paperQuestionList: []
      }
    }