Skip to content

E
educationStu
Commit 2b97d7aa authored by 罗超's avatar 罗超
Browse files
Options

1

parent d4b1a1b7
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 49 deletions
src/components/subject/MultipleChoice.vue
View file @ 2b97d7aa
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
isLast: Boolean, isLast: Boolean,
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
startIndex: Number,
}, },
setup(props, context) { setup(props, context) {
let data = reactive({ let data = reactive({
...@@ -82,7 +83,10 @@ export default { ...@@ -82,7 +83,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
console.log(91, data.sortIndex); if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/SingleChoice.vue
View file @ 2b97d7aa
...@@ -80,6 +80,7 @@ export default { ...@@ -80,6 +80,7 @@ export default {
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
isLast: Boolean, isLast: Boolean,
startIndex: Number,
}, },
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let { ctx } = getCurrentInstance();
...@@ -91,6 +92,10 @@ export default { ...@@ -91,6 +92,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
console.log(77, data.sortIndex != 1, data.sortIndex != data.sortTotal); console.log(77, data.sortIndex != 1, data.sortIndex != data.sortTotal);
let methods = { let methods = {
changeNumToHan, changeNumToHan,
......
src/components/subject/SingleChoiceNumber.vue
View file @ 2b97d7aa
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
isLast: Boolean, isLast: Boolean,
startIndex: Number,
}, },
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let { ctx } = getCurrentInstance();
......
src/pages/exam/answerSheet.vue
View file @ 2b97d7aa
...@@ -8,9 +8,34 @@ ...@@ -8,9 +8,34 @@
<view <view
v-for="(item1, index1) in item.DetailsList" v-for="(item1, index1) in item.DetailsList"
:key="index1" :key="index1"
class="flex item1" class="flex flex_wrap"
> >
{{ index1 + 1 }} <view
class="item1-1"
v-if="
item1.QuestionTypeKey === 'reading-comprehensio' ||
item1.QuestionTypeKey === 'listening'
"
>{{ index1 + 1 }}.</view
>
<view class="item1" v-else @click="jumpPage(index, index1)">{{
index1 + 1
}}</view>
<view
v-if="
item1.QuestionTypeKey === 'reading-comprehensio' ||
item1.QuestionTypeKey === 'listening'
"
class="flex flex_wrap"
>
<view
v-for="(item2, index2) in item1.QuestionContentObj"
:key="index2"
>
<view class="item1">{{ index2 + 1 }}</view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -40,9 +65,10 @@ export default { ...@@ -40,9 +65,10 @@ export default {
}); });
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage(index, index1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/exam/examPaper", url:
"/pages/exam/examPaper?index=" + index + "&&index1=" + (index1 + 1),
}); });
}, },
//选题 //选题
...@@ -86,20 +112,30 @@ export default { ...@@ -86,20 +112,30 @@ export default {
text-align: center; text-align: center;
} }
.item { .item {
margin-bottom: 40rpx; margin-bottom: 20rpx;
}
.item1-1 {
width: 690rpx;
margin: 22rpx 0 0 0;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 600;
color: #111111;
} }
.item1 { .item1 {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
background-color: #00acf9; border: 1px solid #e2e2e2;
border-radius: 50%; border-radius: 50%;
margin: 22rpx; margin: 22rpx;
text-align: center;
line-height: 44rpx;
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: 600;
color: #111111; color: #111111;
display: flex;
justify-content: center;
align-items: center;
box-sizing: border-box;
} }
.item2 { .item2 {
width: 44rpx; width: 44rpx;
......
src/pages/exam/examPaper.vue
View file @ 2b97d7aa
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index"> <view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index">
<!-- 数字单选题 --> <!-- 数字单选题 -->
<SingleChoiceNumber <SingleChoiceNumber
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
/> />
<!-- 多选题 --> <!-- 多选题 -->
<MultipleChoice <MultipleChoice
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -53,12 +55,14 @@ ...@@ -53,12 +55,14 @@
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:startIndex="changeIndexSub"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'single' && index === changeIndex" v-if="item.QuestionTypeKey === 'single' && index === changeIndex"
/> />
<!-- 听力题 --> <!-- 听力题 -->
<ListenTopic <ListenTopic
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -69,6 +73,7 @@ ...@@ -69,6 +73,7 @@
/> />
<!-- 填空题 --> <!-- 填空题 -->
<FillInTheBlanks <FillInTheBlanks
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -80,6 +85,7 @@ ...@@ -80,6 +85,7 @@
<!-- 阅读理解 --> <!-- 阅读理解 -->
<readingCompre <readingCompre
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -93,6 +99,7 @@ ...@@ -93,6 +99,7 @@
/> />
<!-- 判断题 --> <!-- 判断题 -->
<Judge <Judge
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -103,10 +110,11 @@ ...@@ -103,10 +110,11 @@
/> />
<!-- 简答题 --> <!-- 简答题 -->
<shortAnswer <shortAnswer
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if=" v-if="
...@@ -115,10 +123,11 @@ ...@@ -115,10 +123,11 @@
/> />
<!-- 名词解释 --> <!-- 名词解释 -->
<nounExplanation <nounExplanation
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if=" v-if="
...@@ -127,10 +136,11 @@ ...@@ -127,10 +136,11 @@
/> />
<!-- 论述题 --> <!-- 论述题 -->
<easyQuestion <easyQuestion
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if=" v-if="
...@@ -139,84 +149,94 @@ ...@@ -139,84 +149,94 @@
/> />
<!-- 计算题 --> <!-- 计算题 -->
<Calculation <Calculation
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'calculation' && index === changeIndex" v-if="item.QuestionTypeKey === 'calculation' && index === changeIndex"
/> />
<!-- 分录题 --> <!-- 分录题 -->
<EntryProblem <EntryProblem
:paperData="item" :startIndex="changeIndexSub"
:isLast="isLast" :paperData="item"
:sort="index" :isLast="isLast"
:sortTotal="peaperDetail.Paper.GroupList.length" :sort="index"
@getAfterTopic="getAfterTopic()" :sortTotal="peaperDetail.Paper.GroupList.length"
@getBeforeTopic="getBeforeTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'entry-problem' && index === changeIndex" @getBeforeTopic="getBeforeTopic()"
/> v-if="
item.QuestionTypeKey === 'entry-problem' && index === changeIndex
"
/>
<!-- 口语题 --> <!-- 口语题 -->
<Spoken <Spoken
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'spoken' && index === changeIndex" v-if="item.QuestionTypeKey === 'spoken' && index === changeIndex"
/> />
<!-- 其他 --> <!-- 其他 -->
<Other <Other
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'other' && index === changeIndex" v-if="item.QuestionTypeKey === 'other' && index === changeIndex"
/> />
<!-- 完型填空 --> <!-- 完型填空 -->
<Cloze <Cloze
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'cloze' && index === changeIndex" v-if="item.QuestionTypeKey === 'cloze' && index === changeIndex"
/> />
<!-- 资料题 --> <!-- 资料题 -->
<Dataquestion <Dataquestion
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if=" v-if="
item.QuestionTypeKey === 'data-question' && index === changeIndex item.QuestionTypeKey === 'data-question' && index === changeIndex
" "
/> />
<!-- 公用选择题 --> <!-- 公用选择题 -->
<SharingChoose <SharingChoose
:paperData="item" :startIndex="changeIndexSub"
:isLast="isLast" :paperData="item"
:sort="index" :isLast="isLast"
:sortTotal="peaperDetail.Paper.GroupList.length" :sort="index"
@getAfterTopic="getAfterTopic()" :sortTotal="peaperDetail.Paper.GroupList.length"
@getBeforeTopic="getBeforeTopic()" @getAfterTopic="getAfterTopic()"
v-if=" @getBeforeTopic="getBeforeTopic()"
item.QuestionTypeKey === 'sharing-choose' && index === changeIndex v-if="
" item.QuestionTypeKey === 'sharing-choose' && index === changeIndex
/> "
/>
<!-- 排序题 --> <!-- 排序题 -->
<SortingProblem <SortingProblem
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if=" v-if="
...@@ -224,11 +244,12 @@ ...@@ -224,11 +244,12 @@
" "
/> />
<!-- 连线题待完善 --> <!-- 连线题待完善 -->
<Connect <Connect
:startIndex="changeIndexSub"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'matching' && index === changeIndex" v-if="item.QuestionTypeKey === 'matching' && index === changeIndex"
...@@ -270,7 +291,7 @@ import Cloze from "../../components/subject/Cloze.vue"; ...@@ -270,7 +291,7 @@ import Cloze from "../../components/subject/Cloze.vue";
import Dataquestion from "../../components/subject/Dataquestion.vue"; import Dataquestion from "../../components/subject/Dataquestion.vue";
import SortingProblem from "../../components/subject/SortingProblem.vue"; import SortingProblem from "../../components/subject/SortingProblem.vue";
import Connect from "../../components/subject/Connect.vue"; //"连线题" import Connect from "../../components/subject/Connect.vue"; //"连线题"
import SharingChoose from "../../components/subject/SharingChoose.vue" import SharingChoose from "../../components/subject/SharingChoose.vue";
export default { export default {
components: { components: {
SingleChoiceNumber, SingleChoiceNumber,
...@@ -289,9 +310,9 @@ export default { ...@@ -289,9 +310,9 @@ export default {
Cloze, Cloze,
Dataquestion, Dataquestion,
SortingProblem, SortingProblem,
EntryProblem, EntryProblem,
SharingChoose, SharingChoose,
Connect Connect,
}, },
setup(props, context) { setup(props, context) {
let Gid = uni.getStorageSync("userInfo").Id; let Gid = uni.getStorageSync("userInfo").Id;
...@@ -302,7 +323,8 @@ export default { ...@@ -302,7 +323,8 @@ export default {
// msg: { GuestId: Gid, PaperId: 6, Id: 3 }, // msg: { GuestId: Gid, PaperId: 6, Id: 3 },
msg: { GuestId: Gid, PaperId: 5, PublishId: 1 }, msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
peaperDetail: {}, peaperDetail: {},
changeIndex: 0, changeIndex: 0, //大题序号
changeIndexSub: 1, //小题序号
isLast: false, //用于判断是否从后往前翻 isLast: false, //用于判断是否从后往前翻
}); });
let methods = { let methods = {
...@@ -345,8 +367,17 @@ export default { ...@@ -345,8 +367,17 @@ export default {
...methods, ...methods,
}; };
}, },
onLoad() { onLoad(options) {
this.getPaperDetail(); this.getPaperDetail();
if (options.index) {
this.changeIndex = parseInt(options.index);
console.log(350, this.changeIndex);
}
if (options.index1) {
this.changeIndexSub = parseInt(options.index1);
console.log(350, this.changeIndexSub);
}
}, },
}; };
</script> </script>
......
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