Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-07-29 2ff59bd14d4b8f2ec46a80190ef540e6d88f3766

 src/views/startexam/index.vue

@@ -240,19 +240,18 @@
        },
        startExam () {
            // 获取题目ID列表
            getSubjectIds({ id: this.query.examinationId }).then(subjectResponse => {
                const subjectData = subjectResponse.data.data.examExaminationSubjects
            getSubjectIds().then(subjectResponse => {
                const subjectData = subjectResponse.data.data
                if (subjectData.length > 0) {
                    for (let i = 0; i < subjectData.length; i++) {
                        const { examSubjectChoices } = subjectData[i]
                        this.subjectIds.push({
                            subjectId: subjectResponse.data.data.id,
                            everyID: examSubjectChoices.id,
                            type: examSubjectChoices.choicesType,
                            subjectId: 1,
                            everyID: subjectData[i].id,
                            type: subjectData[i].choicesType,
                            index: i + 1,
                            answered: false,
                            answer: examSubjectChoices.answer,
                            score: examSubjectChoices.score
                            answer: subjectData[i].answer,
                            score: subjectData[i].score
                        })
                    }

@@ -444,7 +443,6 @@
            })
        },
        doSubmitExam () {

            var obj = {
                examName: this.$route.query.examName,
                securityName: this.userInfo.user_name,