Commit 30a32cb2 authored by zhengke's avatar zhengke

修改

parent e86dddd6
This diff is collapsed.
...@@ -30,17 +30,19 @@ ...@@ -30,17 +30,19 @@
</view> </view>
</view> </view>
</template> </template>
<template v-if="item1.QuestionContentObj[1]&&item1.QuestionContentObj[1].length>0"> <template v-if="isOperate">
<view v-for="(item3, index3) in item1.QuestionContentObj[1]" :key="index3"> <template v-if="item1.QuestionContentObj[1]&&item1.QuestionContentObj[1].length>0">
<view class="flex item2 flex_start_center"> <view v-for="(item3, index3) in item1.QuestionContentObj[1]" :key="index3">
<view class="num">{{index3+1}}.</view> <view class="flex item2 flex_start_center">
<view class="chooseName" v-html="item3.Content"></view> <view class="num">{{index3+1}}.</view>
<view class="chooseName" v-html="item3.Content"></view>
</view>
<van-button type="primary" size="small" @click="alertMenu(item3)">
{{item3.Name==''?'请选择':item3.Name}}
</van-button>
<van-action-sheet :show="item3.isShow" @click-overlay="hideVan(item3)" :actions="getSelect(item1.QuestionContentObj[0])" @select="onSelect($event,item3,item1)"/>
</view> </view>
<van-button type="primary" size="small" @click="alertMenu(item3)"> </template>
{{item3.Name==''?'请选择':item3.Name}}
</van-button>
<van-action-sheet :show="item3.isShow" @click-overlay="hideVan(item3)" :actions="getSelect(item1.QuestionContentObj[0])" @select="onSelect($event,item3,item1)"/>
</view>
</template> </template>
</view> </view>
</swiper-item> </swiper-item>
...@@ -70,7 +72,8 @@ ...@@ -70,7 +72,8 @@
paperData: Object, paperData: Object,
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
isLast: Boolean isLast: Boolean,
isOperate: Boolean
}, },
setup(props, context) { setup(props, context) {
let {ctx} = getCurrentInstance(); let {ctx} = getCurrentInstance();
...@@ -87,6 +90,7 @@ ...@@ -87,6 +90,7 @@
sortTotal: props.sortTotal, sortTotal: props.sortTotal,
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
isOperate: props.isOperate
}); });
let methods = { let methods = {
...@@ -165,6 +169,26 @@ ...@@ -165,6 +169,26 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.isTrueAnswer {
color: green !important;
}
.isNotAnswer {
color: red !important;
}
.AnswerContent {
font-size: 30rpx;
padding: 25rpx;
background-color: #F4F4F4;
border-radius: 5px;
}
.viewAnswerContent {
width: 100%;
border-bottom: 1px solid #d1d1d1;
padding-bottom: 5px;
}
.Exam_Total { .Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
......
...@@ -28,15 +28,41 @@ ...@@ -28,15 +28,41 @@
</view> </view>
</view> </view>
</template> </template>
<template v-if="item1.QuestionContentObj[1] && item1.QuestionContentObj[1].length > 0"> <template v-if="isOperate">
<view v-for="(item3, index3) in item1.QuestionContentObj[1]" :key="index3" <template v-if="item1.QuestionContentObj[1] && item1.QuestionContentObj[1].length > 0">
style="margin-bottom: 20px"> <view v-for="(item3, index3) in item1.QuestionContentObj[1]" :key="index3"
<van-button type="primary" size="small" @click="alertMenu(item3)"> style="margin-bottom: 20px">
{{ item3.Name == "" ? "请选择" : item3.Name }} <van-button type="primary" size="small" @click="alertMenu(item3)">
</van-button> {{ item3.Name == "" ? "请选择" : item3.Name }}
<van-action-sheet :show="item3.isShow" @click-overlay="hideVan(item3)" </van-button>
:actions="getSelect(item1.QuestionContentObj[0])" <van-action-sheet :show="item3.isShow" @click-overlay="hideVan(item3)"
@select="onSelect($event, item3, item1)" /> :actions="getSelect(item1.QuestionContentObj[0])"
@select="onSelect($event, item3, item1)" />
</view>
</template>
</template>
<template v-else>
<view class="AnswerContent">
<view>
<text style="color:#8c8a94">正确答案:</text>
<text class="isTrueAnswer">{{item1.Answer}}</text>
<text>
您的答案:
<template v-if="item1.StundetAnswer!=''">
<text v-if="item1.Answer==item1.StundetAnswer" class="isTrueAnswer">
{{item1.StundetAnswer}}
</text>
<text v-else class="isNotAnswer">{{item1.StundetAnswer}},回答错误</text>
</template>
<template v-else>
<text>未作答</text>
</template>
</text>
</view>
<view style="margin-top:20rpx;word-wrap:break-word;">
<text style="color:#8c8a94">解析:</text>
<view style="color:#000;display:inline-block;" v-html="item1.AnswerParse"></view>
</view>
</view> </view>
</template> </template>
</view> </view>
...@@ -69,6 +95,7 @@ ...@@ -69,6 +95,7 @@
sortTotal: Number, sortTotal: Number,
isLast: Boolean, isLast: Boolean,
startIndex: Number, startIndex: Number,
isOperate: Boolean
}, },
setup(props, context) { setup(props, context) {
let { let {
...@@ -88,6 +115,7 @@ ...@@ -88,6 +115,7 @@
sortTotal: props.sortTotal, sortTotal: props.sortTotal,
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
isOperate: props.isOperate
}); });
if (props.startIndex) { if (props.startIndex) {
data.current = props.startIndex; data.current = props.startIndex;
...@@ -174,7 +202,26 @@ ...@@ -174,7 +202,26 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.isTrueAnswer {
color: green !important;
}
.isNotAnswer {
color: red !important;
}
.AnswerContent {
font-size: 30rpx;
padding: 25rpx;
background-color: #F4F4F4;
border-radius: 5px;
}
.viewAnswerContent {
width: 100%;
border-bottom: 1px solid #d1d1d1;
padding-bottom: 5px;
}
.Exam_Total { .Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
......
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:isOperate="isOperate"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
...@@ -263,6 +264,7 @@ ...@@ -263,6 +264,7 @@
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:isOperate="isOperate"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
......
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