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
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 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -61,7 +61,12 @@ ...@@ -61,7 +61,12 @@
{{ item1.StundetAnswer }} {{ item1.StundetAnswer }}
</view> </view>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/Cloze.vue
View file @ e293ba30
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
style="border-bottom: 1px solid #d1d1d1"> style="border-bottom: 1px solid #d1d1d1">
...@@ -42,23 +42,30 @@ ...@@ -42,23 +42,30 @@
</view> </view>
<template v-if="!isOperate"> <template v-if="!isOperate">
<view class="AnswerContent" style="margin-bottom:20px;"> <view class="AnswerContent" style="margin-bottom:20px;">
<text style="color: #8c8a94">正确答案：</text> <view>
<text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>， <text style="color: #8c8a94">正确答案：</text>
<text>您的答案： <text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
<template v-if="item1.AnswerList&&item1.AnswerList.length>0&&item1.AnswerList[index2].SubAnswer != ''"> <text>您的答案：
<text v-if="item1.QuestionAnswerList[index2].SubAnswer==item1.AnswerList[index2].SubAnswer" class="isTrueAnswer"> <template v-if="item1.AnswerList&&item1.AnswerList.length>0&&item1.AnswerList[index2].SubAnswer != ''">
{{ item1.AnswerList[index2].SubAnswer }}，回答正确 <text v-if="item1.QuestionAnswerList[index2].SubAnswer==item1.AnswerList[index2].SubAnswer" class="isTrueAnswer">
</text> {{ item1.AnswerList[index2].SubAnswer }}，回答正确
<text v-else class="isNotAnswer"> </text>
<template v-if="item1.AnswerList[index2].SubAnswer"> <text v-else class="isNotAnswer">
{{ item1.AnswerList[index2].SubAnswer }}，回答错误 <template v-if="item1.AnswerList[index2].SubAnswer">
</template> {{ item1.AnswerList[index2].SubAnswer }}，回答错误
<template v-else> </template>
未作答 <template v-else>
</template> 未作答
</text> </template>
</template> </text>
</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> </view>
</template> </template>
</view> </view>
......
src/components/subject/Dataquestion.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view <view
v-for="(item2, index2) in item1.QuestionContentObj" v-for="(item2, index2) in item1.QuestionContentObj"
...@@ -69,7 +69,12 @@ ...@@ -69,7 +69,12 @@
</view> </view>
</template> </template>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/EntryProblem.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view <view
v-for="(item2, index2) in item1.QuestionContentObj" v-for="(item2, index2) in item1.QuestionContentObj"
...@@ -69,8 +69,13 @@ ...@@ -69,8 +69,13 @@
</view> </view>
</template> </template>
</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 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 <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
v-html="item1.AnswerParse" v-html="item1.AnswerParse"
......
src/components/subject/FillInTheBlanks.vue
View file @ e293ba30
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view <view
v-for="(item2, index2) in item1.QuestionContentObj" v-for="(item2, index2) in item1.QuestionContentObj"
...@@ -63,7 +63,12 @@ ...@@ -63,7 +63,12 @@
</view> </view>
</template> </template>
</view> </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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/ListenTopic.vue
View file @ e293ba30
...@@ -115,6 +115,11 @@ ...@@ -115,6 +115,11 @@
</template> </template>
</text> </text>
</view> </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> </view>
</template> </template>
</view> </view>
......
src/components/subject/MultipleChoice.vue
View file @ e293ba30
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="item2 flex flex_start_center"> class="item2 flex flex_start_center">
...@@ -55,7 +55,12 @@ ...@@ -55,7 +55,12 @@
</template> </template>
</text> </text>
</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> <text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view> <view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view> </view>
......
src/components/subject/Other.vue
View file @ e293ba30
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -49,7 +49,12 @@ ...@@ -49,7 +49,12 @@
</template> </template>
</text> </text>
</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> <text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view> <view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view> </view>
......
src/components/subject/SharingChoose.vue
View file @ e293ba30
...@@ -18,21 +18,13 @@ ...@@ -18,21 +18,13 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1" style="padding: 0 20px"> <view class="item1" style="padding: 0 20px">
<view class="flex flex_start_center"> <view class="flex">
<template v-if=" <template v-if="item1.QuestionContentObj[1] && item1.QuestionContentObj[1].length > 0">
item1.QuestionContentObj[1] &&
item1.QuestionContentObj[1].length > 0
">
<view class="num">(1)</view> <view class="num">(1)</view>
<view class="num">-({{ <view class="num">-({{item1.QuestionContentObj[1].length}})题共用备选答案：</view>（{{item1.Score}}）
item1.QuestionContentObj[1].length
}})题共用备选答案：</view>
</template> </template>
</view> </view>
<template v-if=" <template v-if="item1.QuestionContentObj[0] && item1.QuestionContentObj[0].length > 0">
item1.QuestionContentObj[0] &&
item1.QuestionContentObj[0].length > 0
">
<view v-for="(item2, index2) in item1.QuestionContentObj[0]" :key="index2"> <view v-for="(item2, index2) in item1.QuestionContentObj[0]" :key="index2">
<view class="flex item2 flex_start_center"> <view class="flex item2 flex_start_center">
<view class="chooseNum">{{ item2.Name }}</view> <view class="chooseNum">{{ item2.Name }}</view>
...@@ -74,7 +66,12 @@ ...@@ -74,7 +66,12 @@
</template> </template>
</text> </text>
</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> <text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view> <view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view> </view>
......
src/components/subject/SingleChoiceNumber.vue
View file @ e293ba30
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="flex item2 flex_start_center"> class="flex item2 flex_start_center">
...@@ -55,7 +55,12 @@ ...@@ -55,7 +55,12 @@
</template> </template>
</text> </text>
</view> </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: #8c8a94">解析：</text>
<text style="color: #000">{{ item1.AnswerParse }}</text> <text style="color: #000">{{ item1.AnswerParse }}</text>
</view> </view>
...@@ -264,6 +269,7 @@ ...@@ -264,6 +269,7 @@
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
flex-shrink: 0;
} }
.chooseName { .chooseName {
......
src/components/subject/SortingProblem.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template <template
v-if=" v-if="
...@@ -103,7 +103,12 @@ ...@@ -103,7 +103,12 @@
</template> </template>
</text> </text>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/Spoken.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -55,6 +55,11 @@ ...@@ -55,6 +55,11 @@
{{ item1.StundetAnswer }} {{ item1.StundetAnswer }}
</view> </view>
</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"> <view style="margin-top: 20rpx; word-wrap: break-word" v-if="item1.AnswerParse">
<text style="color: #8c8a94">解析：</text> <text style="color: #8c8a94">解析：</text>
<view <view
......
src/components/subject/easyQuestion.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -61,7 +61,12 @@ ...@@ -61,7 +61,12 @@
{{ item1.StundetAnswer }} {{ item1.StundetAnswer }}
</view> </view>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/judge.vue
View file @ e293ba30
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
class="flex item2 flex_start_center"> class="flex item2 flex_start_center">
...@@ -54,7 +54,12 @@ ...@@ -54,7 +54,12 @@
</template> </template>
</text> </text>
</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> <text style="color: #8c8a94">解析：</text>
<view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view> <view style="color: #000; display: inline-block" v-html="item1.AnswerParse"></view>
</view> </view>
......
src/components/subject/nounExplanation.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -59,7 +59,12 @@ ...@@ -59,7 +59,12 @@
{{ item1.StundetAnswer }} {{ item1.StundetAnswer }}
</view> </view>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/components/subject/readingCompre.vue
View file @ e293ba30
<template> <template>
<!-- 阅读理解 --> <!-- 阅读理解 -->
<view> <view>
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color: #999999" <text style="color: #999999">（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text>
>（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text </view>
> <view class="ExamIndex_Box">
</view> <text class="Single_Before">{{ ExamIndex }}</text>/<text
<view class="ExamIndex_Box"> class="Exam_Total">{{ data.DetailsList.length }}</text>
<text class="Single_Before">{{ ExamIndex }}</text </view>
>/<text class="Exam_Total">{{ data.DetailsList.length }}</text> </view>
</view> <swiper class="swiper-box" :style="{
</view>
<swiper
class="swiper-box"
:style="{
height: `calc(100vh - 200rpx - ${statusBarHeight}px)`, height: `calc(100vh - 200rpx - ${statusBarHeight}px)`,
}" }" :autoplay="autoplay" :current="current" @change="onchange">
:autoplay="autoplay" <swiper-item v-if="sortIndex != 1"></swiper-item>
:current="current" <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
@change="onchange" <view class="item1">
> <view class="flex">
<swiper-item v-if="sortIndex != 1"></swiper-item> <view class="num readTitle" :style="{ paddingBottom: `${questionH}rpx` }"
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> v-html="item1.Title"></view>（{{item1.Score}}）
<view class="item1"> </view>
<view class="flex flex_start_center"> <view class="questionBox" :style="{ height: `${questionH}rpx` }">
<view <view class="questionTotal" @touchstart="touchstart" @touchmove="touchmove"
class="num readTitle" @touchend="touchend">本阅读理解共5小题</view>
:style="{ paddingBottom: `${questionH}rpx` }" <template v-if="isOperate">
v-html="item1.Title" <view class="questionView">
></view> <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
</view> class="item2">
<view class="questionBox" :style="{ height: `${questionH}rpx` }"> <view class="flex questionTitle">
<view <view style="white-space: nowrap">{{ index2 + 1 }}、({{
class="questionTotal"
@touchstart="touchstart"
@touchmove="touchmove"
@touchend="touchend"
>本阅读理解共5小题</view
>
<template v-if="isOperate">
<view class="questionView">
<view
v-for="(item2, index2) in item1.QuestionContentObj"
:key="index2"
class="item2"
>
<view class="flex questionTitle">
<view style="white-space: nowrap"
>{{ index2 + 1 }}、({{
item2.QuestionName.slice(0, 2) item2.QuestionName.slice(0, 2)
}})</view }})</view>
> <view v-html="item2.SubTitle" class="grow"></view>
<view v-html="item2.SubTitle" class="grow"></view> </view>
</view> <view v-for="(item3, index3) in item2.SubAnwser" :key="index3">
<view <!-- 单选 、判断-->
v-for="(item3, index3) in item2.SubAnwser" <view class="flex flex_start_center item3" v-if="
:key="index3"
>
<!-- 单选 、判断-->
<view
class="flex flex_start_center item3"
v-if="
item2.QuestionKey === 'single' || item2.QuestionKey === 'single' ||
item2.QuestionKey === 'judge' item2.QuestionKey === 'judge'
" ">
> <view class="chooseNum" :class="{ myAnswer: item3.IsAnswer }"
<view @click="singerChange(item2, item3)">{{ item3.Name }}
class="chooseNum" </view>
:class="{ myAnswer: item3.IsAnswer }" <view class="chooseName" @click="singerChange(item2, item3)"
@click="singerChange(item2, item3)" v-html="item3.Content"></view>
>{{ item3.Name }} </view>
</view> <!-- 多选 -->
<view <view class="flex flex_start_center item3"
class="chooseName" v-if="item2.QuestionKey === 'multiple'">
@click="singerChange(item2, item3)" <view class="chooseNum" :class="{ myAnswer: item3.IsAnswer }"
v-html="item3.Content" @click="multipleChange(item2, item3)">{{ item3.Name }}
></view> </view>
</view> <view class="chooseName" @click="multipleChange(item2, item3)"
<!-- 多选 --> v-html="item3.Content"></view>
<view </view>
class="flex flex_start_center item3" <!-- 填空 -->
v-if="item2.QuestionKey === 'multiple'" <view class="flex flex_start_center item3"
> v-if="item2.QuestionKey === 'fill-in'">
<view <view class="chooseNum">{{ index3 + 1 }} </view>
class="chooseNum" <input type="text" v-model="item3.Content"
:class="{ myAnswer: item3.IsAnswer }" class="chooseName chooseName2" placeholder="请填写答案"
@click="multipleChange(item2, item3)" @input="AnswerChange(item2)" />
>{{ item3.Name }} </view>
</view> <!-- 简答 -->
<view <view class="flex flex_start_center item3"
class="chooseName" v-if="item2.QuestionKey === 'short-answer'">
@click="multipleChange(item2, item3)" <textarea type="text" v-model="item3.Content"
v-html="item3.Content" class="chooseName chooseName2" placeholder="请填写答案"
></view> @input="AnswerChange(item2)" />
</view> </view>
<!-- 填空 --> </view>
<view </view>
class="flex flex_start_center item3" </view>
v-if="item2.QuestionKey === 'fill-in'" </template>
> <template v-else>
<view class="chooseNum">{{ index3 + 1 }} </view> <view class="questionView">
<input <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
type="text" class="item2">
v-model="item3.Content" <view class="flex questionTitle">
class="chooseName chooseName2" <view style="white-space: nowrap">{{ index2 + 1 }}、({{item2.QuestionName.slice(0, 2)}})</view>
placeholder="请填写答案" <view v-html="item2.SubTitle"></view>（{{item2.SubScore}}）
@input="AnswerChange(item2)" </view>
/> <view v-for="(item3, index3) in item2.SubAnwser" :key="index3">
</view> <!-- 单选 、判断-->
<!-- 简答 --> <view class="flex item3" v-if="item2.QuestionKey === 'single' || item2.QuestionKey === 'judge'">
<view <view class="chooseNum" :class="{ isTrueAnswer: item3.IsAnswer }">
class="flex flex_start_center item3" {{ item3.Name }}
v-if="item2.QuestionKey === 'short-answer'" </view>
> <view class="chooseName" :class="{ isTrueAnswer: item3.IsAnswer }"
<textarea v-html="item3.Content"></view>
type="text" </view>
v-model="item3.Content"
class="chooseName chooseName2"
placeholder="请填写答案"
@input="AnswerChange(item2)"
/>
</view>
</view>
</view>
</view>
</template>
<template v-else>
<view class="questionView">
<view
v-for="(item2, index2) in item1.QuestionContentObj"
:key="index2"
class="item2"
>
<view class="flex questionTitle">
<view style="white-space: nowrap"
>{{ index2 + 1 }}、({{
item2.QuestionName.slice(0, 2)
}})</view
>
<view v-html="item2.SubTitle"></view>
</view>
<view
v-for="(item3, index3) in item2.SubAnwser"
:key="index3"
>
<!-- 单选 、判断-->
<view
class="flex flex_start_center item3"
v-if="
item2.QuestionKey === 'single' ||
item2.QuestionKey === 'judge'
"
>
<view
class="chooseNum"
:class="{ myAnswer: item3.IsAnswer }"
>{{ item3.Name }}
</view>
<view
class="chooseName"
:class="{ myAnswerText: item3.IsAnswer }"
v-html="item3.Content"
></view>
</view>
<!-- 多选 --> <!-- 多选 -->
<view <view class="flex item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'multiple'">
v-if="item2.QuestionKey === 'multiple'" <view class="chooseNum" :class="{ isTrueAnswer: item3.IsAnswer }">
> {{ item3.Name }}
<view </view>
class="chooseNum" <view class="chooseName" :class="{ isTrueAnswer: item3.IsAnswer }"
:class="{ myAnswer: item3.IsAnswer }" v-html="item3.Content"></view>
>{{ item3.Name }} </view>
</view> <!-- 填空 -->
<view <view class="flex item3"
class="chooseName" v-if="item2.QuestionKey === 'fill-in'">
:class="{ myAnswerText: item3.IsAnswer }" <view class="chooseNum">{{ index3 + 1 }} </view>
v-html="item3.Content" <view v-html="item3.Content" class="chooseName"></view>
></view> </view>
</view> <!-- 简答 -->
<!-- 填空 --> <view class="flex item3"
<view v-if="item2.QuestionKey === 'short-answer'">
class="flex flex_start_center item3" <view v-html="item3.Content" class="chooseName"></view>
v-if="item2.QuestionKey === 'fill-in'" </view>
> </view>
<view class="chooseNum">{{ index3 + 1 }} </view> <view class="AnswerContent">
<!-- <input <view>
type="text" <text style="color: #8c8a94">正确答案：</text>
v-model="item3.Content" <text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
class="chooseName chooseName2" <text>您的答案：
placeholder="请填写答案" <template v-if="item2.StundetAnswer != ''">
disabled <text v-if="item1.QuestionAnswerList[index2].SubAnswer == item1.AnswerList[index2].SubAnswer" class="isTrueAnswer">
/> --> {{ item1.AnswerList[index2].SubAnswer }}
<view v-html="item3.Content" class="chooseName"></view> </text>
</view> <text v-else class="isNotAnswer">{{item1.AnswerList[index2].SubAnswer}}，回答错误</text>
<!-- 简答 --> </template>
<view <template v-else>
class="flex flex_start_center item3" <text>未作答</text>
v-if="item2.QuestionKey === 'short-answer'" </template>
> </text>
<!-- <textarea </view>
type="text" <view style="margin-top:20rpx;">
v-model="item3.Content" <text style="color:#8c8a94">您的得分：</text>
class="chooseName chooseName2" <text class="isTrueAnswer" v-if="item1.AnswerList[index2].StudentScore>0">{{item1.AnswerList[index2].StudentScore}}</text>
placeholder="请填写答案" <text class="isNotAnswer" v-else>{{item1.AnswerList[index2].StudentScore}}</text>
disabled </view>
/> --> </view>
<view v-html="item3.Content" class="chooseName"></view> </view>
</view> <view style="word-wrap: break-word; margin: 0 30rpx 30rpx 30rpx"
</view> class="AnswerContent" v-if="item1.AnswerParse">
<view class="AnswerContent"> <text style="color: #8c8a94">解析：</text>
<view> <text style="color: #000">{{ item1.AnswerParse }}</text>
<text style="color: #8c8a94">正确答案：</text> </view>
<text class="isTrueAnswer">{{ </view>
item1.QuestionAnswerList[index2].SubAnswer </template>
}}</text </view>
>， </view>
<text </swiper-item>
>您的答案： <swiper-item v-if="sortIndex != sortTotal"></swiper-item>
<template v-if="item2.StundetAnswer != ''"> </swiper>
<text </view>
v-if=" <van-toast id="van-toast" />
item1.QuestionAnswerList[index2].SubAnswer == </view>
item1.AnswerList[index2].SubAnswer
"
class="isTrueAnswer"
>
{{ item1.AnswerList[index2].SubAnswer }}
</text>
<text v-else class="isNotAnswer"
>{{
item1.AnswerList[index2].SubAnswer
}}，回答错误</text
>
</template>
<template v-else>
<text>未作答</text>
</template>
</text>
</view>
</view>
</view>
<view
style="word-wrap: break-word; margin: 0 30rpx 30rpx 30rpx"
class="AnswerContent"
>
<text style="color: #8c8a94">解析：</text>
<text style="color: #000">{{ item1.AnswerParse }}</text>
</view>
</view>
</template>
</view>
</view>
</swiper-item>
<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
</swiper>
</view>
<van-toast id="van-toast" />
</view>
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
toRef, toRef,
getCurrentInstance, getCurrentInstance,
watch, watch,
computed, computed,
onMounted, onMounted,
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import {
export default { changeNumToHan
props: { } from "../../utils/index";
paperData: Object, export default {
sort: Number, props: {
sortTotal: Number, paperData: Object,
isLast: Boolean, sort: Number,
startIndex: Number, sortTotal: Number,
isOperate: Boolean, isLast: Boolean,
}, startIndex: Number,
setup(props, context) { isOperate: Boolean,
let { ctx } = getCurrentInstance(); },
let data = reactive({ setup(props, context) {
autoplay: false, let {
sortIndex: props.sort + 1, ctx
sortTotal: props.sortTotal, //总共多少道大题 } = getCurrentInstance();
data: props.paperData, let data = reactive({
Score: 0, //总分 autoplay: false,
current: 1, //默认从第几个开始-用于从快捷菜单点入 sortIndex: props.sort + 1,
ExamIndex: 1, //第几题 sortTotal: props.sortTotal, //总共多少道大题
questionH: 500, //问题区域高度 data: props.paperData,
timer: null, Score: 0, //总分
timeOutEvent: false, current: 1, //默认从第几个开始-用于从快捷菜单点入
statusBarHeight: 0, ExamIndex: 1, //第几题
isOperate: props.isOperate, questionH: 500, //问题区域高度
}); timer: null,
//判断是否是第一大题 timeOutEvent: false,
if (data.sortIndex === 1) { statusBarHeight: 0,
data.current = 0; isOperate: props.isOperate,
//从答题卡进入 });
if (props.startIndex) { //判断是否是第一大题
data.current = props.startIndex - 1; if (data.sortIndex === 1) {
data.ExamIndex = props.startIndex; data.current = 0;
} //从答题卡进入
} else { if (props.startIndex) {
if (props.startIndex) { data.current = props.startIndex - 1;
data.current = props.startIndex; data.ExamIndex = props.startIndex;
data.ExamIndex = props.startIndex; }
} } else {
} if (props.startIndex) {
watch(data.data, (newVal, oldVal) => { data.current = props.startIndex;
if (newVal) { data.ExamIndex = props.startIndex;
context.emit("answerChange", newVal); }
} }
}); watch(data.data, (newVal, oldVal) => {
let methods = { if (newVal) {
changeNumToHan, context.emit("answerChange", newVal);
jumpPage() { }
uni.navigateTo({ });
url: "/pages/exam/examPaper", let methods = {
}); changeNumToHan,
}, jumpPage() {
back() { uni.navigateTo({
uni.navigateBack(); url: "/pages/exam/examPaper",
}, });
//----------------------------------------选题---------------------------------- },
// 单选or判断 back() {
singerChange(item2, item3) { uni.navigateBack();
item2.SubAnwser.map((e) => { },
if (e.Name == item3.Name) { //----------------------------------------选题----------------------------------
e.IsAnswer = true; // 单选or判断
item2.IsRes = true; //答题标记 singerChange(item2, item3) {
} else { item2.SubAnwser.map((e) => {
e.IsAnswer = false; if (e.Name == item3.Name) {
} e.IsAnswer = true;
}); item2.IsRes = true; //答题标记
}, } else {
// 多选 e.IsAnswer = false;
multipleChange(item2, item3) { }
item3.IsAnswer = !item3.IsAnswer; });
//标记已回答 },
item2.IsRes = item2.SubAnwser.some((e) => { // 多选
return e.IsAnswer; multipleChange(item2, item3) {
}); item3.IsAnswer = !item3.IsAnswer;
}, //标记已回答
onchange(e) { item2.IsRes = item2.SubAnwser.some((e) => {
data.ExamIndex = e.detail.current; return e.IsAnswer;
if (data.ExamIndex === data.data.DetailsList.length + 1) { });
this.$emit("getAfterTopic"); },
} onchange(e) {
if (e.detail.current == 0) { data.ExamIndex = e.detail.current;
this.$emit("getBeforeTopic"); if (data.ExamIndex === data.data.DetailsList.length + 1) {
} this.$emit("getAfterTopic");
}, }
AnswerChange(item) { if (e.detail.current == 0) {
item.IsRes = item.SubAnwser.some((e) => { this.$emit("getBeforeTopic");
console.log(217, e.Content && e.Content != ""); }
return e.Content && e.Content != ""; },
}); AnswerChange(item) {
console.log(218, item.IsRes); item.IsRes = item.SubAnwser.some((e) => {
}, console.log(217, e.Content && e.Content != "");
//触摸事件 return e.Content && e.Content != "";
touchstart(e) { });
clearTimeout(data.timer); console.log(218, item.IsRes);
data.timer = setTimeout(() => { },
data.timeOutEvent = true; //触摸事件
}, 100); touchstart(e) {
}, clearTimeout(data.timer);
touchmove(e) { data.timer = setTimeout(() => {
if (data.timeOutEvent) { data.timeOutEvent = true;
let touches = e.touches[0]; }, 100);
let startTy = touches.clientY; },
let screenHeight = uni.getSystemInfoSync().screenHeight; touchmove(e) {
data.questionH = (screenHeight - startTy) * 2; if (data.timeOutEvent) {
} let touches = e.touches[0];
}, let startTy = touches.clientY;
touchend() { let screenHeight = uni.getSystemInfoSync().screenHeight;
data.timeOutEvent = false; data.questionH = (screenHeight - startTy) * 2;
clearTimeout(data.timer); }
}, },
}; touchend() {
onMounted(() => { data.timeOutEvent = false;
console.log(361, data.data); clearTimeout(data.timer);
if (props.isLast) { },
if (data.sortIndex === 1) { };
data.current = props.paperData.DetailsList.length - 1; onMounted(() => {
} else { console.log(361, data.data);
data.current = props.paperData.DetailsList.length; if (props.isLast) {
} if (data.sortIndex === 1) {
} data.current = props.paperData.DetailsList.length - 1;
data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight; } else {
}); data.current = props.paperData.DetailsList.length;
let that = methods; }
return { }
...toRefs(data), data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
...methods, });
}; let that = methods;
}, return {
}; ...toRefs(data),
...methods,
};
},
};
</script> </script>
<style scoped> <style scoped>
.item { .item {
/* margin-bottom: 40rpx; */ /* margin-bottom: 40rpx; */
position: relative; position: relative;
} }
.name {
height: 90rpx; .name {
font-size: 28rpx; height: 90rpx;
font-family: PingFang SC; font-size: 28rpx;
font-weight: 800; font-family: PingFang SC;
color: #111111; font-weight: 800;
display: flex; color: #111111;
align-items: center; display: flex;
justify-content: space-between; align-items: center;
box-sizing: border-box; justify-content: space-between;
padding: 0 30rpx; box-sizing: border-box;
} padding: 0 30rpx;
.ExamIndex_Box { }
margin-right: 20px; .isTrueAnswer {
} color: green !important;
.Single_Before { }
font-size: 28rpx;
font-weight: bold; .isNotAnswer {
color: #da7878; color: red !important;
} }
.ExamIndex_Box {
margin-right: 20px;
}
.Single_Before {
font-size: 28rpx;
font-weight: bold;
color: #da7878;
}
.Exam_Total {
font-size: 25rpx;
color: gray;
}
.swiper-box {
height: calc(100vh - 230rpx);
box-sizing: border-box;
overflow: auto;
}
.num {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
box-sizing: border-box;
}
.readTitle img {
max-width: 100%;
}
.item1 {
height: 100%;
/* margin: 25rpx 0; */
align-items: center;
overflow-y: auto;
box-sizing: border-box;
padding: 0 30rpx;
}
.questionBox {
width: 100%;
min-height: 500rpx !important;
max-height: 800rpx !important;
/* background-color: #eee; */
position: absolute;
left: 0rpx;
bottom: 0rpx;
z-index: 9;
color: #000000;
transition: all 0.5;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
}
.questionView {
height: 100%;
overflow-y: auto;
box-sizing: border-box;
padding-bottom: 80rpx;
}
.questionTotal {
text-align: center;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: bold;
color: #888888;
padding: 30rpx 0;
}
.questionTitle {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.item2 {
box-sizing: border-box;
margin-bottom: 60rpx;
padding: 0 30rpx;
}
.myAnswer {
background-color: #00acf9 !important;
color: #ffffff !important;
}
.Exam_Total { .myAnswerText {
font-size: 25rpx; color: #00acf9 !important;
color: gray; }
}
.swiper-box { .item3 {
height: calc(100vh - 230rpx); padding-left: 25rpx;
box-sizing: border-box; margin: 20rpx 0;
overflow: auto; }
}
.num { .chooseNum {
font-size: 26rpx; width: 40rpx;
font-family: PingFang SC; height: 40rpx;
font-weight: bold; text-align: center;
color: #111111; line-height: 40rpx;
box-sizing: border-box; border-radius: 50%;
} border: 1px solid #e2e2e2;
.readTitle img { margin-right: 30rpx;
max-width: 100%; font-size: 28rpx;
} font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.item1 { .chooseName {
height: 100%; font-size: 28rpx;
/* margin: 25rpx 0; */ font-family: PingFang SC;
align-items: center; font-weight: 500;
overflow-y: auto; }
box-sizing: border-box;
padding: 0 30rpx;
}
.questionBox {
width: 100%;
min-height: 500rpx !important;
max-height: 800rpx !important;
/* background-color: #eee; */
position: absolute;
left: 0rpx;
bottom: 0rpx;
z-index: 9;
color: #000000;
transition: all 0.5;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
}
.questionView {
height: 100%;
overflow-y: auto;
box-sizing: border-box;
padding-bottom: 80rpx;
}
.questionTotal {
text-align: center;
font-size: 22rpx;
font-family: PingFang SC;
font-weight: bold;
color: #888888;
padding: 30rpx 0;
}
.questionTitle {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.item2 {
box-sizing: border-box;
margin-bottom: 60rpx;
padding: 0 30rpx;
}
.myAnswer { .chooseName2 {
background-color: #00acf9 !important; flex-grow: 1;
color: #ffffff !important; border-bottom: 1px solid #111;
} color: #111111;
.myAnswerText { }
color: #00acf9 !important;
}
.item3 {
padding-left: 25rpx;
margin: 20rpx 0;
}
.chooseNum {
width: 40rpx;
height: 40rpx;
text-align: center;
line-height: 40rpx;
border-radius: 50%;
border: 1px solid #e2e2e2;
margin-right: 30rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.chooseName { .isTrueAnswer {
font-size: 24rpx; color: green !important;
font-family: PingFang SC; }
font-weight: 500;
}
.chooseName2 {
flex-grow: 1;
border-bottom: 1px solid #111;
color: #111111;
}
.isTrueAnswer {
color: green !important;
}
.isNotAnswer { .isNotAnswer {
color: red !important; color: red !important;
} }
.AnswerContent { .AnswerContent {
font-size: 30rpx; font-size: 30rpx;
padding: 25rpx; padding: 25rpx;
background-color: #f4f4f4; background-color: #f4f4f4;
border-radius: 10rpx; border-radius: 10rpx;
} font-size: 28rpx;
}
</style> </style>
src/components/subject/shortAnswer.vue
View file @ e293ba30
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<swiper-item v-if="sortIndex != 1"></swiper-item> <swiper-item v-if="sortIndex != 1"></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex">
<view>{{ index1 + 1 }}、</view> <view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>（{{item1.Score}}）
</view> </view>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="chooseName"> <view class="chooseName">
...@@ -58,7 +58,12 @@ ...@@ -58,7 +58,12 @@
{{ item1.StundetAnswer }} {{ item1.StundetAnswer }}
</view> </view>
</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> <text style="color: #8c8a94">解析：</text>
<view <view
style="color: #000; display: inline-block" style="color: #000; display: inline-block"
......
src/pages/exam/examPaper.vue
View file @ e293ba30
...@@ -381,6 +381,7 @@ export default { ...@@ -381,6 +381,7 @@ export default {
time: 999, time: 999,
statusBarHeight: 0, statusBarHeight: 0,
msg: { GuestId: 0, PaperId: 0, PublishId: 0}, msg: { GuestId: 0, PaperId: 0, PublishId: 0},
peaperDetail: {}, peaperDetail: {},
changeIndex: 0, //大题序号 changeIndex: 0, //大题序号
isLast: false, //用于判断是否从后往前翻 isLast: false, //用于判断是否从后往前翻
...@@ -473,7 +474,7 @@ export default { ...@@ -473,7 +474,7 @@ export default {
if (options.Exam_Student_Id) { if (options.Exam_Student_Id) {
this.Exam_Student_Id = 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.isOperate = false;
this.msg.isShowAnswer = true; this.msg.isShowAnswer = true;
this.isAutoTime = false; 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