Commit 97a4fe5b authored by zhengke's avatar zhengke

修改

parent 8e314107
...@@ -5,26 +5,19 @@ ...@@ -5,26 +5,19 @@
<view class="name"> <view class="name">
<view class="grow"> <view class="grow">
{{ 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>
<!-- <i <!-- <i
class="iconfont icon-caidanzu answerSheet" class="iconfont icon-caidanzu answerSheet"
@click="jumpAnswerSheet" @click="jumpAnswerSheet"
></i> --> ></i> -->
</view> </view>
<swiper <swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"
class="swiper-box" :skip-hidden-item-layout="true">
:autoplay="autoplay"
:current="current"
@change="onchange"
:skip-hidden-item-layout="true"
>
<swiper-item> <swiper-item>
<!-- 第一页 --> <!-- 第一页 -->
</swiper-item> </swiper-item>
...@@ -34,22 +27,30 @@ ...@@ -34,22 +27,30 @@
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>
</view> </view>
<view <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2"
v-for="(item2, index2) in item1.QuestionContentObj" class="flex item2 flex_start_center">
:key="index2" <template v-if="isOperate">
class="flex item2 flex_start_center" <view class="chooseNum" :class="{ myAnswer: item2.IsAnswer }"
> @click="change(item1, item2)">{{ item2.ShowName }}
<view
class="chooseNum"
:class="{ myAnswer: item2.IsAnswer }"
@click="change(item1, item2)"
>{{ item2.ShowName }}
</view> </view>
<view <view class="chooseName" @click="change(item1, item2)" v-html="item2.Content"></view>
class="chooseName" </template>
@click="change(item1, item2)" <template v-else>
v-html="item2.Content" <view class="chooseNum" :class="{isTrueAnswer:item2.IsAnswer}">{{ item2.Name }}</view>
></view> <view class="chooseName" :class="{isTrueAnswer:item2.IsAnswer}" v-html="item2.Content">
</view>
</template>
</view>
</view>
<view class="AnswerContent" v-if="!isOperate">
<view>
<text style="color:#8c8a94">正确答案:</text>
<text style="color:green;">{{getTrueAnswer(item1.QuestionContentObj)}}</text>
<text>您的答案:{{item1.StundetAnswer==''?'未作答':item1.StundetAnswer}}</text>
</view>
<view style="margin-top:20rpx;word-wrap:break-word;">
<text style="color:#8c8a94">解析:</text>
<text>{{item1.AnswerParse}}</text>
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
...@@ -72,18 +73,23 @@ import { ...@@ -72,18 +73,23 @@ 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,
sortTotal: Number, sortTotal: Number,
isLast: Boolean, isLast: Boolean,
startIndex: Number, startIndex: Number,
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, //大题序号
...@@ -91,6 +97,8 @@ export default { ...@@ -91,6 +97,8 @@ export default {
data: props.paperData, data: props.paperData,
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
isOperate: props.isOperate,
TrueAnswer:''
}); });
if (props.startIndex) { if (props.startIndex) {
data.current = props.startIndex; data.current = props.startIndex;
...@@ -138,6 +146,18 @@ export default { ...@@ -138,6 +146,18 @@ export default {
url: "/pages/exam/answerSheet", url: "/pages/exam/answerSheet",
}); });
}, },
//获取正确答案
getTrueAnswer(item){
let AnSwer='';
if(item&&item.length>0){
item.forEach(x=>{
if(x.IsAnswer){
AnSwer=x.Name;
}
})
}
return AnSwer;
}
}; };
onMounted(() => { onMounted(() => {
console.log("单选", data.data); console.log("单选", data.data);
...@@ -151,10 +171,10 @@ export default { ...@@ -151,10 +171,10 @@ export default {
...methods, ...methods,
}; };
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.name { .name {
height: 90rpx; height: 90rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -163,60 +183,75 @@ export default { ...@@ -163,60 +183,75 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before { .isTrueAnswer {
color: green !important;
}
.isNotAnswer {
color: green !important;
}
.AnswerContent{
font-size:30rpx;
padding:25rpx;
background-color: #F4F4F4;
border-radius: 5px;
}
.Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #da7878; color: #da7878;
} }
.ExamIndex_Box {
.ExamIndex_Box {
margin-right: 20px; margin-right: 20px;
} }
.Exam_Total {
.Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
} }
.answerSheet { .answerSheet {
font-size: 30rpx; font-size: 30rpx;
margin-left: 20rpx; margin-left: 20rpx;
color: #000; color: #000;
} }
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); height: calc(100vh - 270rpx);
box-sizing: border-box; box-sizing: border-box;
} }
.num { .num {
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
.item { .item {
/* margin-bottom: 40rpx; */ /* margin-bottom: 40rpx; */
position: relative; position: relative;
} }
.item1 { .item1 {
/* margin: 25rpx 0; */ /* margin: 25rpx 0; */
align-items: center; align-items: center;
} }
.item2 { .item2 {
padding-left: 25rpx; padding-left: 25rpx;
margin: 30rpx 0; margin: 30rpx 0;
} }
.myAnswer { .myAnswer {
background-color: #00acf9 !important; background-color: #00acf9 !important;
color: #ffffff !important; color: #ffffff !important;
} }
.chooseNum { .chooseNum {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
text-align: center; text-align: center;
...@@ -228,12 +263,12 @@ export default { ...@@ -228,12 +263,12 @@ export default {
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: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
} }
</style> </style>
...@@ -47,10 +47,7 @@ ...@@ -47,10 +47,7 @@
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:isLast="isLast" :isLast="isLast"
:ExamStatus="ExamStatus" v-if="item.QuestionTypeKey === 'single-number' && index === changeIndex"
v-if="
item.QuestionTypeKey === 'single-number' && index === changeIndex
"
/> />
<!-- 多选题 --> <!-- 多选题 -->
<MultipleChoice <MultipleChoice
...@@ -71,6 +68,7 @@ ...@@ -71,6 +68,7 @@
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:isOperate="isOperate"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
...@@ -364,8 +362,8 @@ export default { ...@@ -364,8 +362,8 @@ export default {
let data = reactive({ let data = reactive({
time: 999, time: 999,
statusBarHeight: 0, statusBarHeight: 0,
msg: { GuestId: 0, PaperId: 0, PublishId: 0}, // msg: { GuestId: 0, PaperId: 0, PublishId: 0},
// msg: { GuestId: 20, PaperId: 9, PublishId: 1,isShowAnswer:true}, msg: { GuestId: 20, PaperId: 9, PublishId: 1 ,isShowAnswer: true},
peaperDetail: {}, peaperDetail: {},
changeIndex: 0, //大题序号 changeIndex: 0, //大题序号
...@@ -373,7 +371,7 @@ export default { ...@@ -373,7 +371,7 @@ export default {
isShowAnswer: false, //是否显示答题卡 isShowAnswer: false, //是否显示答题卡
Exam_Student_Id: 0, Exam_Student_Id: 0,
autoTimeStart: false, autoTimeStart: false,
ExamStatus:-1, //考试状态 判断是考试还是查看答案 isOperate:true, //考试状态 判断是考试还是查看答案
}); });
let methods = { let methods = {
changeNumToHan, changeNumToHan,
...@@ -446,20 +444,21 @@ export default { ...@@ -446,20 +444,21 @@ export default {
}, },
onLoad(options) { onLoad(options) {
console.log(options, "options"); console.log(options, "options");
if(options.GuestId){ // if(options.GuestId){
this.msg.GuestId = options.GuestId; // this.msg.GuestId = options.GuestId;
} // }
if (options.PaperId) { // if (options.PaperId) {
this.msg.PaperId = options.PaperId; // this.msg.PaperId = options.PaperId;
} // }
if (options.Id) { // if (options.Id) {
this.msg.PublishId = options.Id; // this.msg.PublishId = options.Id;
} // }
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){ if (options.ExamStatus&&options.ExamStatus==1){
this.ExamStatus = options.ExamStatus; this.isOperate = false;
this.msg.isShowAnswer=true;
} }
this.getPaperDetail(); this.getPaperDetail();
}, },
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
:style="{ 'background-image': `url(${item.PicList[0]})` }" :style="{ 'background-image': `url(${item.PicList[0]})` }"
@click=" @click="
jumpPage( jumpPage(
`/pages/exam/examPaper?GuestId=${indexData.GuestId}&&PaperId=${item.PaperId}&&Id=${item.Id}&&Exam_Student_Id=${item.Exam_Student_Id}&&ExamStatus=${item.ExamStatus}` `/pages/exam/examPaper?GuestId=${item.GuestId}&&PaperId=${item.PaperId}&&Id=${item.Id}&&Exam_Student_Id=${item.Exam_Student_Id}&&ExamStatus=${item.ExamStatus}`
) )
" "
> >
......
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