Skip to content

E
educationStu
Commit e293ba30 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master 

# Conflicts:
#	src/components/subject/SingleChoice.vue
parents 25b3c46b 195a7469
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 596 additions and 604 deletions
src/components/subject/Calculation.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -61,7 +61,12 @@
{{ item1.StundetAnswer }}
</view>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/Cloze.vue
View file @ e293ba30
......@@ -18,9 +18,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
style="border-bottom: 1px solid #d1d1d1">
......@@ -42,23 +42,30 @@
</view>
<template v-if="!isOperate">
<view class="AnswerContent" style="margin-bottom:20px;">
<text style="color: #8c8a94">正确答案：</text>
<text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
<text>您的答案：
<template v-if="item1.AnswerList&&item1.AnswerList.length>0&&item1.AnswerList[index2].SubAnswer != ''">
<text v-if="item1.QuestionAnswerList[index2].SubAnswer==item1.AnswerList[index2].SubAnswer" class="isTrueAnswer">
{{ item1.AnswerList[index2].SubAnswer }}，回答正确
</text>
<text v-else class="isNotAnswer">
<template v-if="item1.AnswerList[index2].SubAnswer">
{{ item1.AnswerList[index2].SubAnswer }}，回答错误
</template>
<template v-else>
未作答
</template>
</text>
</template>
</text>
<view>
<text style="color: #8c8a94">正确答案：</text>
<text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
<text>您的答案：
<template v-if="item1.AnswerList&&item1.AnswerList.length>0&&item1.AnswerList[index2].SubAnswer != ''">
<text v-if="item1.QuestionAnswerList[index2].SubAnswer==item1.AnswerList[index2].SubAnswer" class="isTrueAnswer">
{{ item1.AnswerList[index2].SubAnswer }}，回答正确
</text>
<text v-else class="isNotAnswer">
<template v-if="item1.AnswerList[index2].SubAnswer">
{{ item1.AnswerList[index2].SubAnswer }}，回答错误
</template>
<template v-else>
未作答
</template>
</text>
</template>
</text>
</view>
<view style="margin:20rpx 0;" v-if="item1.AnswerList[index2].StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.AnswerList[index2].StudentScore>0">{{item1.AnswerList[index2].StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.AnswerList[index2].StudentScore}}</text>
</view>
</view>
</template>
</view>
......
src/components/subject/Dataquestion.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view
v-for="(item2, index2) in item1.QuestionContentObj"
......@@ -69,7 +69,12 @@
</view>
</template>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/EntryProblem.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view
v-for="(item2, index2) in item1.QuestionContentObj"
......@@ -69,8 +69,13 @@
</view>
</template>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word;" v-if="item1.AnswerParse">
<text style="color: #8c8a94;">解析：</text>
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word;" class="flex" v-if="item1.AnswerParse">
<text style="color: #8c8a94;flex-shrink: 0;">解析：</text>
<view
style="color: #000; display: inline-block"
v-html="item1.AnswerParse"
......
src/components/subject/FillInTheBlanks.vue
View file @ e293ba30
......@@ -21,9 +21,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view
v-for="(item2, index2) in item1.QuestionContentObj"
......@@ -63,7 +63,12 @@
</view>
</template>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:25rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/ListenTopic.vue
View file @ e293ba30
......@@ -115,6 +115,11 @@
</template>
</text>
</view>
<view style="margin:20rpx 0;" v-if="item1.AnswerList[index2].StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.AnswerList[index2].StudentScore>0">{{item1.AnswerList[index2].StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.AnswerList[index2].StudentScore}}</text>
</view>
</view>
</template>
</view>
......
src/components/subject/MultipleChoice.vue
View file @ e293ba30
......@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view>
<view class="flex">
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="item2 flex flex_start_center">
......@@ -55,7 +55,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view>
......
src/components/subject/Other.vue
View file @ e293ba30
......@@ -18,9 +18,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -49,7 +49,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore!=''">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view>
......
src/components/subject/SharingChoose.vue
View file @ e293ba30
......@@ -18,21 +18,13 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1" style="padding: 0 20px">
<view class="flex flex_start_center">
<template v-if="
item1.QuestionContentObj[1] &&
item1.QuestionContentObj[1].length > 0
">
<view class="flex">
<template v-if="item1.QuestionContentObj[1] && item1.QuestionContentObj[1].length > 0">
<view class="num">(1)</view>
<view class="num">-({{
item1.QuestionContentObj[1].length
}})题共用备选答案：</view>
<view class="num">-({{item1.QuestionContentObj[1].length}})题共用备选答案：</view>（{{item1.Score}}）
</template>
</view>
<template v-if="
item1.QuestionContentObj[0] &&
item1.QuestionContentObj[0].length > 0
">
<template v-if="item1.QuestionContentObj[0] && item1.QuestionContentObj[0].length > 0">
<view v-for="(item2, index2) in item1.QuestionContentObj[0]" :key="index2">
<view class="flex item2 flex_start_center">
<view class="chooseNum">{{ item2.Name }}</view>
......@@ -74,7 +66,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore!=''">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view>
......
src/components/subject/SingleChoiceNumber.vue
View file @ e293ba30
......@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view>
<view class="flex">
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="flex item2 flex_start_center">
......@@ -55,7 +55,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<text style="color: #000">{{ item1.AnswerParse }}</text>
</view>
......@@ -264,6 +269,7 @@
font-family: PingFang SC;
font-weight: bold;
color: #111111;
flex-shrink: 0;
}
.chooseName {
......
src/components/subject/SortingProblem.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template
v-if="
......@@ -103,7 +103,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/Spoken.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -55,6 +55,11 @@
{{ item1.StundetAnswer }}
</view>
</view>
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
......
src/components/subject/easyQuestion.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -61,7 +61,12 @@
{{ item1.StundetAnswer }}
</view>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/judge.vue
View file @ e293ba30
......@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view>
<view class="flex">
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="flex item2 flex_start_center">
......@@ -54,7 +54,12 @@
</template>
</text>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view>
......
src/components/subject/nounExplanation.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -59,7 +59,12 @@
{{ item1.StundetAnswer }}
</view>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/components/subject/readingCompre.vue
View file @ e293ba30
This diff is collapsed.
src/components/subject/shortAnswer.vue
View file @ e293ba30
......@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1">
<view class="flex flex_start_center">
<view class="flex">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
<view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view>
<template v-if="isOperate">
<view class="chooseName">
......@@ -58,7 +58,12 @@
{{ item1.StundetAnswer }}
</view>
</view>
<view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<view style="margin:20rpx 0;" v-if="item1.StudentScore">
<text style="color:#8c8a94">您的得分：</text>
<text class="isTrueAnswer" v-if="item1.StudentScore>0">{{item1.StudentScore}}</text>
<text class="isNotAnswer" v-else>{{item1.StudentScore}}</text>
</view>
<view style="word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text>
<view
style="color: #000; display: inline-block"
......
src/pages/exam/examPaper.vue
View file @ e293ba30
......@@ -381,6 +381,7 @@ export default {
time: 999,
statusBarHeight: 0,
msg: { GuestId: 0, PaperId: 0, PublishId: 0},
peaperDetail: {},
changeIndex: 0, //大题序号
isLast: false, //用于判断是否从后往前翻
......@@ -473,7 +474,7 @@ export default {
if (options.Exam_Student_Id) {
this.Exam_Student_Id = options.Exam_Student_Id;
}
if (options.ExamStatus && options.ExamStatus == 1) {
if (options.ExamStatus && (options.ExamStatus == 1||options.ExamStatus == 2)) {
this.isOperate = false;
this.msg.isShowAnswer = true;
this.isAutoTime = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment