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
Show 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,6 +42,7 @@ ...@@ -42,6 +42,7 @@
</view> </view>
<template v-if="!isOperate"> <template v-if="!isOperate">
<view class="AnswerContent" style="margin-bottom:20px;"> <view class="AnswerContent" style="margin-bottom:20px;">
<view>
<text style="color: #8c8a94">正确答案：</text> <text style="color: #8c8a94">正确答案：</text>
<text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>， <text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
<text>您的答案： <text>您的答案：
...@@ -60,6 +61,12 @@ ...@@ -60,6 +61,12 @@
</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>
</template> </template>
</view> </view>
</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
...@@ -5,124 +5,71 @@ ...@@ -5,124 +5,71 @@
<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>
<view class="ExamIndex_Box"> <view class="ExamIndex_Box">
<text class="Single_Before">{{ ExamIndex }}</text <text class="Single_Before">{{ ExamIndex }}</text>/<text
>/<text class="Exam_Total">{{ data.DetailsList.length }}</text> class="Exam_Total">{{ data.DetailsList.length }}</text>
</view> </view>
</view> </view>
<swiper <swiper class="swiper-box" :style="{
class="swiper-box"
:style="{
height: `calc(100vh - 200rpx - ${statusBarHeight}px)`, height: `calc(100vh - 200rpx - ${statusBarHeight}px)`,
}" }" :autoplay="autoplay" :current="current" @change="onchange">
:autoplay="autoplay"
:current="current"
@change="onchange"
>
<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 <view class="num readTitle" :style="{ paddingBottom: `${questionH}rpx` }"
class="num readTitle" v-html="item1.Title"></view>（{{item1.Score}}）
:style="{ paddingBottom: `${questionH}rpx` }"
v-html="item1.Title"
></view>
</view> </view>
<view class="questionBox" :style="{ height: `${questionH}rpx` }"> <view class="questionBox" :style="{ height: `${questionH}rpx` }">
<view <view class="questionTotal" @touchstart="touchstart" @touchmove="touchmove"
class="questionTotal" @touchend="touchend">本阅读理解共5小题</view>
@touchstart="touchstart"
@touchmove="touchmove"
@touchend="touchend"
>本阅读理解共5小题</view
>
<template v-if="isOperate"> <template v-if="isOperate">
<view class="questionView"> <view class="questionView">
<view <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
v-for="(item2, index2) in item1.QuestionContentObj" class="item2">
:key="index2"
class="item2"
>
<view class="flex questionTitle"> <view class="flex questionTitle">
<view style="white-space: nowrap" <view style="white-space: nowrap">{{ index2 + 1 }}、({{
>{{ 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 <view v-for="(item3, index3) in item2.SubAnwser" :key="index3">
v-for="(item3, index3) in item2.SubAnwser"
:key="index3"
>
<!-- 单选 、判断--> <!-- 单选 、判断-->
<view <view class="flex flex_start_center item3" v-if="
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
class="chooseName"
@click="singerChange(item2, item3)"
v-html="item3.Content"
></view>
</view> </view>
<!-- 多选 --> <!-- 多选 -->
<view <view class="flex flex_start_center item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'multiple'">
v-if="item2.QuestionKey === 'multiple'" <view class="chooseNum" :class="{ myAnswer: item3.IsAnswer }"
> @click="multipleChange(item2, item3)">{{ item3.Name }}
<view </view>
class="chooseNum" <view class="chooseName" @click="multipleChange(item2, item3)"
:class="{ myAnswer: item3.IsAnswer }" v-html="item3.Content"></view>
@click="multipleChange(item2, item3)"
>{{ item3.Name }}
</view>
<view
class="chooseName"
@click="multipleChange(item2, item3)"
v-html="item3.Content"
></view>
</view> </view>
<!-- 填空 --> <!-- 填空 -->
<view <view class="flex flex_start_center item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'fill-in'">
v-if="item2.QuestionKey === 'fill-in'"
>
<view class="chooseNum">{{ index3 + 1 }} </view> <view class="chooseNum">{{ index3 + 1 }} </view>
<input <input type="text" v-model="item3.Content"
type="text" class="chooseName chooseName2" placeholder="请填写答案"
v-model="item3.Content" @input="AnswerChange(item2)" />
class="chooseName chooseName2"
placeholder="请填写答案"
@input="AnswerChange(item2)"
/>
</view> </view>
<!-- 简答 --> <!-- 简答 -->
<view <view class="flex flex_start_center item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'short-answer'">
v-if="item2.QuestionKey === 'short-answer'" <textarea type="text" v-model="item3.Content"
> class="chooseName chooseName2" placeholder="请填写答案"
<textarea @input="AnswerChange(item2)" />
type="text"
v-model="item3.Content"
class="chooseName chooseName2"
placeholder="请填写答案"
@input="AnswerChange(item2)"
/>
</view> </view>
</view> </view>
</view> </view>
...@@ -130,125 +77,68 @@ ...@@ -130,125 +77,68 @@
</template> </template>
<template v-else> <template v-else>
<view class="questionView"> <view class="questionView">
<view <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
v-for="(item2, index2) in item1.QuestionContentObj" class="item2">
:key="index2"
class="item2"
>
<view class="flex questionTitle"> <view class="flex questionTitle">
<view style="white-space: nowrap" <view style="white-space: nowrap">{{ index2 + 1 }}、({{item2.QuestionName.slice(0, 2)}})</view>
>{{ index2 + 1 }}、({{ <view v-html="item2.SubTitle"></view>（{{item2.SubScore}}）
item2.QuestionName.slice(0, 2) </view>
}})</view <view v-for="(item3, index3) in item2.SubAnwser" :key="index3">
>
<view v-html="item2.SubTitle"></view>
</view>
<view
v-for="(item3, index3) in item2.SubAnwser"
:key="index3"
>
<!-- 单选 、判断--> <!-- 单选 、判断-->
<view <view class="flex item3" v-if="item2.QuestionKey === 'single' || item2.QuestionKey === 'judge'">
class="flex flex_start_center item3" <view class="chooseNum" :class="{ isTrueAnswer: item3.IsAnswer }">
v-if=" {{ item3.Name }}
item2.QuestionKey === 'single' || </view>
item2.QuestionKey === 'judge' <view class="chooseName" :class="{ isTrueAnswer: item3.IsAnswer }"
" v-html="item3.Content"></view>
>
<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 <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
class="chooseName"
:class="{ myAnswerText: item3.IsAnswer }"
v-html="item3.Content"
></view>
</view> </view>
<!-- 填空 --> <!-- 填空 -->
<view <view class="flex item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'fill-in'">
v-if="item2.QuestionKey === 'fill-in'"
>
<view class="chooseNum">{{ index3 + 1 }} </view> <view class="chooseNum">{{ index3 + 1 }} </view>
<!-- <input
type="text"
v-model="item3.Content"
class="chooseName chooseName2"
placeholder="请填写答案"
disabled
/> -->
<view v-html="item3.Content" class="chooseName"></view> <view v-html="item3.Content" class="chooseName"></view>
</view> </view>
<!-- 简答 --> <!-- 简答 -->
<view <view class="flex item3"
class="flex flex_start_center item3" v-if="item2.QuestionKey === 'short-answer'">
v-if="item2.QuestionKey === 'short-answer'"
>
<!-- <textarea
type="text"
v-model="item3.Content"
class="chooseName chooseName2"
placeholder="请填写答案"
disabled
/> -->
<view v-html="item3.Content" class="chooseName"></view> <view v-html="item3.Content" class="chooseName"></view>
</view> </view>
</view> </view>
<view class="AnswerContent"> <view class="AnswerContent">
<view> <view>
<text style="color: #8c8a94">正确答案：</text> <text style="color: #8c8a94">正确答案：</text>
<text class="isTrueAnswer">{{ <text class="isTrueAnswer">{{item1.QuestionAnswerList[index2].SubAnswer}}</text>，
item1.QuestionAnswerList[index2].SubAnswer <text>您的答案：
}}</text
>，
<text
>您的答案：
<template v-if="item2.StundetAnswer != ''"> <template v-if="item2.StundetAnswer != ''">
<text <text v-if="item1.QuestionAnswerList[index2].SubAnswer == item1.AnswerList[index2].SubAnswer" class="isTrueAnswer">
v-if="
item1.QuestionAnswerList[index2].SubAnswer ==
item1.AnswerList[index2].SubAnswer
"
class="isTrueAnswer"
>
{{ item1.AnswerList[index2].SubAnswer }} {{ item1.AnswerList[index2].SubAnswer }}
</text> </text>
<text v-else class="isNotAnswer" <text v-else class="isNotAnswer">{{item1.AnswerList[index2].SubAnswer}}，回答错误</text>
>{{
item1.AnswerList[index2].SubAnswer
}}，回答错误</text
>
</template> </template>
<template v-else> <template v-else>
<text>未作答</text> <text>未作答</text>
</template> </template>
</text> </text>
</view> </view>
<view style="margin-top:20rpx;">
<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> </view>
<view </view>
style="word-wrap: break-word; margin: 0 30rpx 30rpx 30rpx" <view style="word-wrap: break-word; margin: 0 30rpx 30rpx 30rpx"
class="AnswerContent" class="AnswerContent" 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>
...@@ -265,7 +155,7 @@ ...@@ -265,7 +155,7 @@
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
...@@ -274,9 +164,11 @@ import { ...@@ -274,9 +164,11 @@ import {
watch, watch,
computed, computed,
onMounted, onMounted,
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import {
export default { changeNumToHan
} from "../../utils/index";
export default {
props: { props: {
paperData: Object, paperData: Object,
sort: Number, sort: Number,
...@@ -286,7 +178,9 @@ export default { ...@@ -286,7 +178,9 @@ export default {
isOperate: Boolean, isOperate: Boolean,
}, },
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let {
ctx
} = getCurrentInstance();
let data = reactive({ let data = reactive({
autoplay: false, autoplay: false,
sortIndex: props.sort + 1, sortIndex: props.sort + 1,
...@@ -403,14 +297,15 @@ export default { ...@@ -403,14 +297,15 @@ export default {
...methods, ...methods,
}; };
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.item { .item {
/* margin-bottom: 40rpx; */ /* margin-bottom: 40rpx; */
position: relative; position: relative;
} }
.name {
.name {
height: 90rpx; height: 90rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -421,47 +316,58 @@ export default { ...@@ -421,47 +316,58 @@ export default {
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
} }
.ExamIndex_Box { .isTrueAnswer {
color: green !important;
}
.isNotAnswer {
color: red !important;
}
.ExamIndex_Box {
margin-right: 20px; margin-right: 20px;
} }
.Single_Before {
.Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #da7878; color: #da7878;
} }
.Exam_Total { .Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
} }
.swiper-box { .swiper-box {
height: calc(100vh - 230rpx); height: calc(100vh - 230rpx);
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
} }
.num { .num {
font-size: 26rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
box-sizing: border-box; box-sizing: border-box;
} }
.readTitle img {
.readTitle img {
max-width: 100%; max-width: 100%;
} }
.item1 { .item1 {
height: 100%; height: 100%;
/* margin: 25rpx 0; */ /* margin: 25rpx 0; */
align-items: center; align-items: center;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
} }
.questionBox {
.questionBox {
width: 100%; width: 100%;
min-height: 500rpx !important; min-height: 500rpx !important;
max-height: 800rpx !important; max-height: 800rpx !important;
...@@ -473,45 +379,52 @@ export default { ...@@ -473,45 +379,52 @@ export default {
color: #000000; color: #000000;
transition: all 0.5; transition: all 0.5;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2); box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
} }
.questionView {
.questionView {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 80rpx; padding-bottom: 80rpx;
} }
.questionTotal {
.questionTotal {
text-align: center; text-align: center;
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #888888; color: #888888;
padding: 30rpx 0; padding: 30rpx 0;
} }
.questionTitle {
.questionTitle {
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
.item2 {
.item2 {
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 60rpx; margin-bottom: 60rpx;
padding: 0 30rpx; padding: 0 30rpx;
} }
.myAnswer { .myAnswer {
background-color: #00acf9 !important; background-color: #00acf9 !important;
color: #ffffff !important; color: #ffffff !important;
} }
.myAnswerText {
.myAnswerText {
color: #00acf9 !important; color: #00acf9 !important;
} }
.item3 {
.item3 {
padding-left: 25rpx; padding-left: 25rpx;
margin: 20rpx 0; margin: 20rpx 0;
} }
.chooseNum {
.chooseNum {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
text-align: center; text-align: center;
...@@ -519,34 +432,37 @@ export default { ...@@ -519,34 +432,37 @@ export default {
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 26rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
.chooseName { .chooseName {
font-size: 24rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
} }
.chooseName2 {
.chooseName2 {
flex-grow: 1; flex-grow: 1;
border-bottom: 1px solid #111; border-bottom: 1px solid #111;
color: #111111; color: #111111;
} }
.isTrueAnswer {
.isTrueAnswer {
color: green !important; 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