Skip to content

E
educationStu
Commit 856df887 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 532e5987
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 106 deletions
src/components/question/word.vue
View file @ 856df887
......@@ -2,23 +2,12 @@
<!-- 单选题 -->
<view>
<view class="item" style="padding: 0 20px">
<!-- <view class="name">
<view class="grow">
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text class="Exam_Score">（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text>
</view>
<view class="ExamIndex_Box">
<text class="Single_Before">{{ ExamIndex }}</text
>/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
</view>
</view> -->
<view style="height: 100rpx"></view>
<van-nav-bar fixed>
<template #left>
<van-icon name="cross" size="32rpx" @click="goBack()" />
</template>
<template #title>
{{dataList.length}}
{{current+1}}/{{dataList.length}}
</template>
</van-nav-bar>
<swiper
......@@ -32,10 +21,10 @@
:skip-hidden-item-layout="true"
:disable-programmatic-animation="true"
>
<swiper-item v-for="(item1, index1) in data" :key="index1">
<!-- <view class="item1" :style="{height: `calc(100vh - 390rpx - ${statusBarHeight}px)`}">
<swiper-item v-for="(item1, index1) in dataList" :key="index1">
<view class="item1" :style="{height: `calc(100vh - 390rpx - ${statusBarHeight}px)`}">
<view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view><text class="Exam_Score">（{{item1.Score}}）</text>
<view class="num" v-html="item1.Title"></view>
</view>
<view
v-for="(item2, index2) in item1.QuestionContentObj"
......@@ -92,11 +81,6 @@
</template>
</text>
</view>
<view style="margin:20rpx 0;" v-if="item1.StudentScore!=''||item1.StudentScore===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="margin-top: 20rpx; word-wrap: break-word"
v-if="item1.AnswerParse" class="flex"
......@@ -105,11 +89,7 @@
<view style="color: #000" v-html="item1.AnswerParse"></view>
</view>
</view>
</view> -->
<!-- <view class="AnswerBtn clear">
<view class="AnswerBtnFirst" @click="getBeforeExam()" v-if="ExamIndex!=1||sortIndex!=1">上一题</view>
<view class="AnswerBtnSecond" v-if="sortIndex != sortTotal" @click="getNextExam()">下一题</view>
</view> -->
</view>
</swiper-item>
</swiper>
</view>
......@@ -137,11 +117,9 @@ export default {
let data = reactive({
autoplay: false,
dataList: [],
current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题
isOperate: props.isOperate,
statusBarHeight: 0,
ExamStatus: props.ExamStatus
current: 0, //默认从第几个开始-用于从快捷菜单点入
isOperate: true,
statusBarHeight: 0
});
watch(()=>[...props.paperData],(val)=>{
......@@ -149,14 +127,11 @@ export default {
})
console.log(data,'dataList');
let methods = {
back() {
goBack() {
uni.navigateBack();
},
onchange(e) {
data.ExamIndex = e.detail.current;
// if (data.sortIndex == 1) {
// data.ExamIndex = e.detail.current + 1;
// }
data.current = e.detail.current;
},
jumpAnswerSheet() {
uni.navigateTo({
......@@ -308,9 +283,5 @@ export default {
font-weight: 500;
color: #111111;
}
.Exam_Score{
color:#999999;
font-size:28rpx;
}
</style>
src/pages/exam/examStart.vue
View file @ 856df887
......@@ -8,17 +8,7 @@
<template #title>
</template>
</van-nav-bar>
<view class="exam-con" v-if="!isShowAnswer && !isShowNotice">
<i
class="iconfont icon-caidanzu answerSheet"
style="
position: absolute;
right: 30rpx;
z-index: 999;
margin-top: 26rpx;
"
@click="showAnswerSheet"
></i>
<view class="exam-con">
<!-- <view v-for="(item, index) in dataList" :key="index">
<readingCompre
:startIndex="item.startIndex"
......@@ -33,34 +23,6 @@
<!-- 单词 -->
<word v-if="Type==1" :paperData="dataList" />
</view>
<view v-if="isShowAnswer">
<view class="answer-con" v-if="!isShowAnswerSee">
<answer
:paperData="dataList"
:ExamStuId="Exam_Student_Id"
:StartTime="StartTime"
:ExamStatus="ExamStatus"
:SubmitTimes="SubmitTimes"
@hideAnswer="hideAnswerSheet"
@chooseTopic="jumpTopic"
ref="answer"
/>
</view>
<!-- 答题卡查看对错 -->
<answerSee
:paperData="peaperDetail"
@hideAnswer="hideAnswerSheet"
@chooseTopic="jumpTopic"
v-if="isShowAnswerSee"
/>
</view>
<view class="answer-con" v-if="isShowNotice">
<examNotice
:msg="msg"
:ExamStatus="ExamStatus"
@hideNotice="hideNotice"
/>
</view>
<van-toast id="van-toast" />
</view>
</template>
......@@ -80,14 +42,12 @@ import { GetQuestionReading } from "../../api/exam";
import { changeNumToHan } from "../../utils/index";
import { submitPaper,GetQuestionWords } from "../../api/exam";
import answer from "../../components/question/answer.vue"; //答题卡
import readingCompre from "../../components/question/readingCompre";
import word from "../../components/question/word.vue";
export default {
components: {
word,
readingCompre,
answer
readingCompre
},
setup(props, context) {
let { refs } = getCurrentInstance();
......@@ -100,14 +60,9 @@ export default {
},
dataList: [],
isShowAnswer: false, //是否显示答题卡
Exam_Student_Id: 0,
changeIndex: 0, //大题序号
isOperate: true, //考试状态 判断是考试还是查看答案
isAutoTime: false,
ExamStatus: -1,
SubmitTimes: 0, //后台设置几分钟后可提交
isShowAnswerSee: false,
examMsg:{
PageIndex: 1,
PageSize:20,
......@@ -146,30 +101,10 @@ export default {
}
}
},
//显示答题卡
showAnswerSheet() {
data.isShowAnswer = true;
},
//隐藏答题卡
hideAnswerSheet() {
data.isShowAnswer = false;
},
//隐藏考前提示
hideNotice() {
console.log("进入");
data.isShowNotice = false;
},
//获取答案改变后的数据
getAnswerChange(val, index) {
// data.peaperDetail.Paper.GroupList[index] = val;
},
//跳转到指定题目
jumpTopic(val) {
console.log(val);
this.changeIndex = val.index;
this.dataList[val.index].startIndex = val.index + 1;
data.isShowAnswer = false;
},
//交卷
async savePaper() {
......
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