Skip to content

E
educationStu
Commit 33416f68 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 53049eb2
Hide whitespace changes
Inline Side-by-side
Showing with 409 additions and 144 deletions
src/components/subject/FillInTheBlanks.vue
View file @ 33416f68
<template> <template>
<!-- 填空题 --> <!-- 填空题 -->
<view> <view>
<view class="item"> <view class="item">
<view class="name" <view class="name">
>{{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }}</view <view>
> {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<view </view>
v-for="(item1, index1) in data.DetailsList" <view>
:key="item1.id" <text class="Single_Before">{{ExamIndex}}</text>/<text
class="item1" class="Exam_Total">{{data.DetailsList.length}}</text>
> </view>
<view class="flex flex_start_center"> </view>
<view>{{ index1 + 1 }}、</view> <swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
<view class="num" v-html="item1.Title"></view> <swiper-item></swiper-item>
</view> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
<view class="item1">
<view <view class="flex flex_start_center">
v-for="(item2, index2) in item1.QuestionContentObj" <view>{{ index1 + 1 }}、</view>
:key="item2.id" <view class="num" v-html="item1.Title"></view>
class="flex item2 flex_start_center" </view>
> <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
<view class="chooseName" @click="change(index1, index2)"> class="flex item2 flex_start_center">
<input type="text" v-model="item1.myAnswer" class="input" /> <view class="chooseName" @click="change(index1, index2)">
</view> <input type="text" v-model="item1.myAnswer" class="input" />
</view> </view>
</view> </view>
</view> </view>
<van-toast id="van-toast" /> </swiper-item>
</view> <swiper-item></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: { paperData: Object }, } from "../../utils/index";
setup(props, context) { export default {
let { ctx } = getCurrentInstance(); props: {
props.paperData.DetailsList.forEach((item, index) => { paperData: Object,
item.myAnswer = ""; isLast: Boolean,
}); sort: Number
let data = reactive({ },
data: props.paperData, setup(props, context) {
}); let {ctx} = getCurrentInstance();
props.paperData.DetailsList.forEach((item, index) => {
item.myAnswer = "";
});
let data = reactive({
data: props.paperData,
sortIndex: props.sort+1,
Score: 0, //总分
current: 1 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题
});
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/exam/examPaper", url: "/pages/exam/examPaper",
}); });
}, },
back() { back() {
uni.navigateBack(); uni.navigateBack();
}, },
//选题 //选题
change(index1, index2) { change(index1, index2) {
data.data.DetailsList[index1].choose = data.data.DetailsList[index1].choose =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
}; onchange(e){
return { data.ExamIndex = e.detail.current;
...toRefs(data), if(data.ExamIndex===data.data.DetailsList.length+1){
...methods, console.log('进入')
}; this.$emit('getAfterTopic');
}, }
}; if(e.detail.current==0){
this.$emit('getBeforeTopic');
}
}
};
return {
...toRefs(data),
...methods,
};
},
};
</script> </script>
<style scoped> <style scoped>
.name { .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;
} color: #111111;
.num { display: flex;
font-size: 26rpx; align-items: center;
font-family: PingFang SC; justify-content: space-between;
font-weight: bold; }
color: #111111;
} .Single_Before {
.item { font-size: 28rpx;
margin-bottom: 40rpx; font-weight: bold;
} color: #DA7878;
.item1 { }
margin: 25rpx 0; .swiper-box {
align-items: center; height: calc(100vh - 270rpx);
} box-sizing: border-box;
.item2 { }
/* padding-left: 25rpx; */ .num {
margin: 30rpx 0; font-size: 26rpx;
} font-family: PingFang SC;
.choose { font-weight: bold;
background-color: #00acf9 !important; color: #111111;
color: #ffffff !important; }
}
.chooseNum { .item {
width: 40rpx; margin-bottom: 40rpx;
height: 40rpx; }
text-align: center;
line-height: 40rpx; .item1 {
border-radius: 50%; margin: 25rpx 0;
border: 1px solid #e2e2e2; align-items: center;
margin-right: 30rpx; }
font-size: 26rpx;
font-family: PingFang SC; .item2 {
font-weight: bold; /* padding-left: 25rpx; */
color: #111111; margin: 30rpx 0;
} }
.chooseName {
font-size: 24rpx; .choose {
font-family: PingFang SC; background-color: #00acf9 !important;
font-weight: 500; color: #ffffff !important;
color: #111111; }
}
.input { .chooseNum {
box-sizing: border-box; width: 40rpx;
width: 690rpx; height: 40rpx;
border-bottom: 2rpx solid #000; text-align: center;
} line-height: 40rpx;
</style> border-radius: 50%;
\ No newline at end of file border: 1px solid #e2e2e2;
margin-right: 30rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.chooseName {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
.input {
box-sizing: border-box;
width: 690rpx;
border-bottom: 2rpx solid #000;
}
</style>
src/components/subject/ListenTopic.vue
View file @ 33416f68
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text> <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text>
</view> </view>
<view> <view>
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
} from "../../utils/index"; } from "../../utils/index";
export default { export default {
props: { props: {
paperData: Object paperData: Object,
sort: Number
}, },
setup(props, context) { setup(props, context) {
let { let {
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
}); });
let data = reactive({ let data = reactive({
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1,
autoplay: false, autoplay: false,
Score: 0, //总分 Score: 0, //总分
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
......
src/components/subject/MultipleChoice.vue
View file @ 33416f68
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text> <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text>
</view> </view>
<view> <view>
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
export default { export default {
props: { props: {
paperData: Object, paperData: Object,
isLast: Boolean isLast: Boolean,
sort:Number
}, },
setup(props, context) { setup(props, context) {
props.paperData.DetailsList.forEach((item, index) => { props.paperData.DetailsList.forEach((item, index) => {
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
}); });
let data = reactive({ let data = reactive({
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1,
autoplay: false, autoplay: false,
Score: 0, //总分 Score: 0, //总分
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
...@@ -97,7 +99,6 @@ ...@@ -97,7 +99,6 @@
onchange(e) { onchange(e) {
data.ExamIndex = e.detail.current; data.ExamIndex = e.detail.current;
if (data.ExamIndex === data.data.DetailsList.length + 1) { if (data.ExamIndex === data.data.DetailsList.length + 1) {
console.log('进入')
this.$emit('getAfterTopic'); this.$emit('getAfterTopic');
} }
if(e.detail.current==0){ if(e.detail.current==0){
...@@ -107,9 +108,9 @@ ...@@ -107,9 +108,9 @@
}; };
onMounted(() => { onMounted(() => {
that.getScore(); that.getScore();
if(props.isLast){ // if(props.isLast){
data.current = props.paperData.DetailsList.length; // data.current = props.paperData.DetailsList.length;
} // }
}); });
let that = methods; let that = methods;
return { return {
......
src/components/subject/SingleChoice.vue
View file @ 33416f68
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sort + 1) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text> <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text>
</view> </view>
<view> <view>
...@@ -68,10 +68,10 @@ export default { ...@@ -68,10 +68,10 @@ export default {
let data = reactive({ let data = reactive({
autoplay: false, autoplay: false,
sortIndex: props.sort+1,
data: props.paperData, data: props.paperData,
Score: 0, //总分 Score: 0, //总分
current: 1 ,//默认从第几个开始-用于从快捷菜单点入 current: 35 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
......
src/components/subject/SingleChoiceNumber.vue
View file @ 33416f68
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sort + 1) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text> <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text>
</view> </view>
<view> <view>
...@@ -69,6 +69,7 @@ export default { ...@@ -69,6 +69,7 @@ export default {
autoplay: false, autoplay: false,
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1,
Score: 0, //总分 Score: 0, //总分
current: 0 ,//默认从第几个开始-用于从快捷菜单点入 current: 0 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
...@@ -105,10 +106,9 @@ export default { ...@@ -105,10 +106,9 @@ export default {
}; };
onMounted(()=>{ onMounted(()=>{
that.getScore(); that.getScore();
console.log(props.isLast,'props.isLast'); // if(props.isLast){
if(props.isLast){ // data.current = props.paperData.DetailsList.length;
data.current = props.paperData.DetailsList.length; // }
}
}) })
let that = methods; let that = methods;
return { return {
......
src/components/subject/readingCompre.vue 0 → 100644
View file @ 33416f68
<template>
<!-- 单选题 -->
<view>
<view class="item">
<view class="name">
<view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{Score}}分）</text>
</view>
<view>
<text class="Single_Before">{{ExamIndex}}</text>/<text
class="Exam_Total">{{data.DetailsList.length}}</text>
</view>
</view>
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
<swiper-item></swiper-item>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
<view class="item1">
<view class="flex flex_start_center">
<view>{{ index1 + 1 }}、</view>
<view class="num readTitle" v-html="item1.Title"></view>
</view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
class="flex item2 flex_start_center">
<view class="chooseNum" :class="{ myAnswer: item1.myAnswer === item2.Name }"
@click="change(index1, index2)">{{ item2.Name }}
</view>
<view class="chooseName" @click="change(index1, index2)" v-html="item2.Content"></view>
</view>
</view>
</swiper-item>
<swiper-item></swiper-item>
</swiper>
</view>
<van-toast id="van-toast" />
</view>
</template>
<script>
import {
ref,
reactive,
toRefs,
toRef,
getCurrentInstance,
watch,
computed,
onMounted,
} from "vue";
import {
changeNumToHan
} from "../../utils/index";
export default {
props: {
paperData: Object,
sort: Number
},
setup(props, context) {
let {
ctx
} = getCurrentInstance();
let data = reactive({
autoplay: false,
sortIndex: props.sort + 1,
data: props.paperData,
Score: 0, //总分
current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题
});
let methods = {
changeNumToHan,
jumpPage() {
uni.navigateTo({
url: "/pages/exam/examPaper",
});
},
back() {
uni.navigateBack();
},
//选题
change(index1, index2) {
data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name;
},
//获取总分
getScore() {
data.Score = 0;
data.data.DetailsList.forEach(x => {
data.Score += parseFloat(x.Score);
})
},
onchange(e) {
data.ExamIndex = e.detail.current;
if (data.ExamIndex === data.data.DetailsList.length + 1) {
console.log('进入')
this.$emit('getAfterTopic');
}
if (e.detail.current == 0) {
this.$emit('getBeforeTopic');
}
}
};
onMounted(() => {
console.log(props.paperData, 'props.paperData');
that.getScore();
})
let that = methods;
return {
...toRefs(data),
...methods,
};
},
};
</script>
<style scoped>
.name {
height: 90rpx;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 800;
color: #111111;
display: flex;
align-items: center;
justify-content: space-between;
}
.Single_Before {
font-size: 28rpx;
font-weight: bold;
color: #DA7878;
}
.Exam_Total {
font-size: 25rpx;
color: gray;
}
.swiper-box {
height: calc(100vh - 270rpx);
box-sizing: border-box;
}
.num {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.readTitle img{
max-width:100%;
}
.item {
/* margin-bottom: 40rpx; */
position: relative;
}
.item1 {
/* margin: 25rpx 0; */
align-items: center;
}
.item2 {
padding-left: 25rpx;
margin: 30rpx 0;
}
.myAnswer {
background-color: #00acf9 !important;
color: #ffffff !important;
}
.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 {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
</style>
src/pages/exam/examPaper.vue
View file @ 33416f68
...@@ -25,36 +25,56 @@ ...@@ -25,36 +25,56 @@
</van-nav-bar> </van-nav-bar>
<view class="exam-con"> <view class="exam-con">
<view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index"> <view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index">
<!-- 数字单选题 -->
<SingleChoiceNumber <SingleChoiceNumber
:paperData="item" :paperData="item"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
:sort="index" :sort="index"
:isLast="isLast" :isLast="isLast"
v-if="item.QuestionTypeKey === 'single-number'&&index===changeIndex" /> v-if="item.QuestionTypeKey === 'single-number'&&index===changeIndex" />
<!-- 多选题 -->
<MultipleChoice <MultipleChoice
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'multiple'&&index===changeIndex" v-if="item.QuestionTypeKey === 'multiple'&&index===changeIndex"
/> />
<!-- 单选题 -->
<SingleChoice <SingleChoice
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'single'&&index===changeIndex" v-if="item.QuestionTypeKey === 'single'&&index===changeIndex"
/> />
<!-- 听力题 -->
<ListenTopic :paperData="item" <ListenTopic :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'listening'&&index===changeIndex" v-if="item.QuestionTypeKey === 'listening'&&index===changeIndex"
/> />
<!-- 填空题 -->
<FillInTheBlanks <FillInTheBlanks
:paperData="item" :paperData="item"
v-if="item.QuestionTypeKey === 'fill-in'" :isLast="isLast"
:sort="index"
@getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'fill-in'&&index===changeIndex"
/> />
<!-- 阅读理解 -->
<readingCompre
:paperData="item"
:isLast="isLast"
:sort="index"
@getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'reading-comprehensio'&&index===changeIndex"
/>
<!-- <Judge :paperData="item" v-if="item.QuestionTypeKey === 'judge'" /> <!-- <Judge :paperData="item" v-if="item.QuestionTypeKey === 'judge'" />
<Write <Write
:paperData="item" :paperData="item"
...@@ -97,8 +117,9 @@ import SingleChoiceNumber from "../../components/subject/SingleChoiceNumber.vue" ...@@ -97,8 +117,9 @@ import SingleChoiceNumber from "../../components/subject/SingleChoiceNumber.vue"
import SingleChoice from "../../components/subject/SingleChoice.vue" import SingleChoice from "../../components/subject/SingleChoice.vue"
import MultipleChoice from "../../components/subject/MultipleChoice.vue"; import MultipleChoice from "../../components/subject/MultipleChoice.vue";
import ListenTopic from "../../components/subject/ListenTopic.vue" import ListenTopic from "../../components/subject/ListenTopic.vue"
import FillInTheBlanks from "../../components/subject/FillInTheBlanks"; import FillInTheBlanks from "../../components/subject/FillInTheBlanks";
import readingCompre from "../../components/subject/readingCompre";
import Judge from "../../components/subject/judge.vue"; import Judge from "../../components/subject/judge.vue";
import Write from "../../components/subject/write.vue"; import Write from "../../components/subject/write.vue";
import Connect from "../../components/subject/Connect.vue"; //"连线题" import Connect from "../../components/subject/Connect.vue"; //"连线题"
...@@ -110,6 +131,7 @@ export default { ...@@ -110,6 +131,7 @@ export default {
MultipleChoice, MultipleChoice,
ListenTopic, ListenTopic,
FillInTheBlanks, FillInTheBlanks,
readingCompre,
Judge, Judge,
Write, Write,
Connect, Connect,
...@@ -121,8 +143,8 @@ export default { ...@@ -121,8 +143,8 @@ export default {
let data = reactive({ let data = reactive({
time: 2 * 60 * 60 * 1000, time: 2 * 60 * 60 * 1000,
statusBarHeight: 0, statusBarHeight: 0,
msg: { GuestId: Gid, PaperId: 6, Id: 3 }, // msg: { GuestId: Gid, PaperId: 6, Id: 3 },
// msg: { GuestId: Gid, PaperId: 24, Id: 0 }, msg: { GuestId: Gid, PaperId: 23, Id: 22 },
peaperDetail: {}, peaperDetail: {},
changeIndex:0, changeIndex:0,
isLast:false, //用于判断是否从后往前翻 isLast: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