Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

parents 13f26b85 376589b3
Hide whitespace changes
Inline Side-by-side
Showing with 1002 additions and 814 deletions
src/components/subject/Calculation.vue
View file @ e9a49d89
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,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();
...@@ -82,7 +83,10 @@ export default { ...@@ -82,7 +83,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/Cloze.vue
View file @ e9a49d89
<template> <template>
<!-- 计算题 --> <!-- 计算题 -->
<view> <view>
<view class="item" style="padding:0 20px;"> <view class="item" style="padding: 0 20px">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text> <text style="color: #999999"
</view> >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
<view> >
<text class="Single_Before">{{ExamIndex}}</text>/ </view>
<text class="Exam_Total">{{data.DetailsList.length}}</text> <view>
</view> <text class="Single_Before">{{ ExamIndex }}</text
</view> >/
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"> <text class="Exam_Total">{{ data.DetailsList.length }}</text>
<swiper-item v-if="sortIndex != 1"></swiper-item> </view>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1"> </view>
<view class="item1"> <swiper
<view class="flex flex_start_center"> class="swiper-box"
<view>{{ index1 + 1 }}、</view> :autoplay="autoplay"
<view class="num" v-html="item1.Title"></view> :current="current"
</view> @change="onchange"
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" style="border-bottom:1px solid #d1d1d1;"> >
<view v-for="(item3,index3) in item2.OptionList" :key="index3" class="flex item2 flex_start_center" @click="getAnswer(item2.OptionList,item3)"> <swiper-item v-if="sortIndex != 1"></swiper-item>
<view class="chooseNum" :class="{'myAnswer':item3.IsAnswer}">{{ item3.Name }} <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
</view> <view class="item1">
<view class="chooseName" v-html="item3.Content"></view> <view class="flex flex_start_center">
</view> <view>{{ index1 + 1 }}、</view>
</view> <view class="num" v-html="item1.Title"></view>
</view> </view>
</swiper-item> <view
<swiper-item v-if="sortIndex != sortTotal"></swiper-item> v-for="(item2, index2) in item1.QuestionContentObj"
</swiper> :key="index2"
</view> style="border-bottom: 1px solid #d1d1d1"
<van-toast id="van-toast" /> >
</view> <view
v-for="(item3, index3) in item2.OptionList"
:key="index3"
class="flex item2 flex_start_center"
@click="getAnswer(item2.OptionList, item3)"
>
<view class="chooseNum" :class="{ myAnswer: item3.IsAnswer }"
>{{ item3.Name }}
</view>
<view class="chooseName" v-html="item3.Content"></view>
</view>
</view>
</view>
</swiper-item>
<swiper-item v-if="sortIndex != sortTotal"></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 { import { changeNumToHan } from "../../utils/index";
changeNumToHan export default {
} from "../../utils/index"; props: {
export default { paperData: Object,
props: { sort: Number,
paperData: Object, sortTotal: Number,
sort: Number, isLast: Boolean,
sortTotal: Number, startIndex: Number,
isLast: Boolean },
}, setup(props, context) {
setup(props, context) { let { ctx } = getCurrentInstance();
let {ctx} = getCurrentInstance(); let data = reactive({
let data = reactive({ data: props.paperData,
data: props.paperData, autoplay: false,
autoplay: false, sortIndex: props.sort + 1,
sortIndex: props.sort + 1, sortTotal: props.sortTotal,
sortTotal: props.sortTotal, current: 1, //默认从第几个开始-用于从快捷菜单点入
current: 1, //默认从第几个开始-用于从快捷菜单点入 ExamIndex: 1, //第几题
ExamIndex: 1, //第几题 });
}); if (props.startIndex) {
let methods = { data.current = props.startIndex;
changeNumToHan, data.ExamIndex = props.startIndex;
jumpPage() { }
uni.navigateTo({ let methods = {
url: "/pages/exam/examPaper", changeNumToHan,
}); jumpPage() {
}, uni.navigateTo({
back() { url: "/pages/exam/examPaper",
uni.navigateBack(); });
}, },
onchange(e) { back() {
data.ExamIndex = e.detail.current; uni.navigateBack();
if (data.ExamIndex === data.data.DetailsList.length + 1) { },
console.log('进入') onchange(e) {
this.$emit('getAfterTopic'); data.ExamIndex = e.detail.current;
} if (data.ExamIndex === data.data.DetailsList.length + 1) {
if (e.detail.current == 0) { console.log("进入");
this.$emit('getBeforeTopic'); this.$emit("getAfterTopic");
} }
}, if (e.detail.current == 0) {
//点击 this.$emit("getBeforeTopic");
getAnswer(allItem,item){ }
allItem.forEach(x=>{ },
x.IsAnswer=false; //点击
}) getAnswer(allItem, item) {
item.IsAnswer = !item.IsAnswer; allItem.forEach((x) => {
this.$forceUpdate(); x.IsAnswer = false;
} });
}; item.IsAnswer = !item.IsAnswer;
onMounted(() => { this.$forceUpdate();
if (props.isLast) { },
data.current = props.paperData.DetailsList.length; };
} onMounted(() => {
}) if (props.isLast) {
let that = methods; data.current = props.paperData.DetailsList.length;
return { }
...toRefs(data), });
...methods, let that = methods;
}; return {
}, ...toRefs(data),
}; ...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;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Exam_Total { .Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
} }
.myAnswer { .myAnswer {
background-color: #00acf9 !important; background-color: #00acf9 !important;
color: #ffffff !important; color: #ffffff !important;
} }
.Single_Before { .Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #DA7878; color: #da7878;
} }
.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;
} }
.item1 { .item1 {
align-items: center; align-items: center;
} }
.item2 { .item2 {
/* padding-left: 25rpx; */ /* padding-left: 25rpx; */
margin: 30rpx 0; margin: 30rpx 0;
} }
.choose { .choose {
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;
line-height: 40rpx; line-height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 26rpx; font-size: 26rpx;
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;
} }
.input { .input {
box-sizing: border-box; box-sizing: border-box;
width: 690rpx; width: 690rpx;
border-bottom: 2rpx solid #000; border-bottom: 2rpx solid #000;
color: #000; color: #000;
font-size: 22rpx; font-size: 22rpx;
} }
.textarea { .textarea {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
} }
/deep/.textarea-placeholder { /deep/.textarea-placeholder {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #cccccc; color: #cccccc;
} }
</style> </style>
src/components/subject/Connect.vue
View file @ e9a49d89
<template> <template>
<!-- 填空题 --> <!-- 填空题 -->
<view> <view>
<view class="item" style="padding: 0 20px"> <view class="item" style="padding: 0 20px">
<view class="name"> <view class="name">
<view> {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} </view> <view> {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} </view>
<view> <view>
<text class="Single_Before">{{ ExamIndex }}</text>/<text <text class="Single_Before">{{ ExamIndex }}</text
class="Exam_Total">{{ data.DetailsList.length }}</text> >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
</view> </view>
</view> </view>
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"> <swiper
<swiper-item v-if="sortIndex != 1"></swiper-item> class="swiper-box"
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id"> :autoplay="autoplay"
<view class="item1"> :current="current"
<view class="flex flex_start_center"> @change="onchange"
<view>{{ index1 + 1 }}、</view> >
<view class="num" v-html="item1.Title"></view> <swiper-item v-if="sortIndex != 1"></swiper-item>
</view> <swiper-item
<!-- <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id" 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" v-html="item1.Title"></view>
</view>
<!-- <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
class="flex item2 flex_start_center"> class="flex item2 flex_start_center">
<view class="chooseName" @click="change(index1, index2)"> <view class="chooseName" @click="change(index1, index2)">
<input type="text" v-model="item1.myAnswer" class="input" /> <input type="text" v-model="item1.myAnswer" class="input" />
</view> </view>
</view> --> </view> -->
</view> </view>
</swiper-item> </swiper-item>
<swiper-item v-if="sortIndex != sortTotal"></swiper-item> <swiper-item v-if="sortIndex != sortTotal"></swiper-item>
</swiper> </swiper>
</view> </view>
<van-toast id="van-toast" /> <van-toast id="van-toast" />
</view> </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 { import { changeNumToHan } from "../../utils/index";
changeNumToHan export default {
} from "../../utils/index"; props: {
export default { paperData: Object,
props: { isLast: Boolean,
paperData: Object, sort: Number,
isLast: Boolean, sortTotal: Number,
sort: Number, startIndex: Number,
sortTotal: Number, },
}, setup(props, context) {
setup(props, context) { let { ctx } = getCurrentInstance();
let { props.paperData.DetailsList.forEach((item, index) => {
ctx item.myAnswer = "";
} = getCurrentInstance(); });
props.paperData.DetailsList.forEach((item, index) => { let data = reactive({
item.myAnswer = ""; data: props.paperData,
}); sortIndex: props.sort + 1,
let data = reactive({ sortTotal: props.sortTotal,
data: props.paperData, current: 1, //默认从第几个开始-用于从快捷菜单点入
sortIndex: props.sort + 1, ExamIndex: 1, //第几题
sortTotal: props.sortTotal, });
current: 1, //默认从第几个开始-用于从快捷菜单点入 if (props.startIndex) {
ExamIndex: 1, //第几题 data.current = props.startIndex;
}); data.ExamIndex = props.startIndex;
console.log(77, data.sortTotal, data.sortIndex); }
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) { 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("进入"); console.log("进入");
this.$emit("getAfterTopic"); this.$emit("getAfterTopic");
} }
if (e.detail.current == 0) { if (e.detail.current == 0) {
this.$emit("getBeforeTopic"); this.$emit("getBeforeTopic");
} }
}, },
}; };
return { return {
...toRefs(data), ...toRefs(data),
...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;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before { .Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #da7878; color: #da7878;
} }
.Exam_Total { .Exam_Total {
font-size: 25rpx; font-size: 25rpx;
color: gray; color: gray;
} }
.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;
} }
.item1 { .item1 {
align-items: center; align-items: center;
} }
.item2 { .item2 {
/* padding-left: 25rpx; */ /* padding-left: 25rpx; */
margin: 30rpx 0; margin: 30rpx 0;
} }
.choose { .choose {
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;
line-height: 40rpx; line-height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 26rpx; font-size: 26rpx;
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;
} }
.input { .input {
box-sizing: border-box; box-sizing: border-box;
width: 690rpx; width: 690rpx;
border-bottom: 2rpx solid #000; border-bottom: 2rpx solid #000;
} }
</style> </style>
src/components/subject/Dataquestion.vue
View file @ e9a49d89
...@@ -38,7 +38,12 @@ ...@@ -38,7 +38,12 @@
> >
<view class="chooseNum">{{index2+1}}</view> <view class="chooseNum">{{index2+1}}</view>
<view class="chooseName"> <view class="chooseName">
<input type="text" v-model="item2.Content" :placeholder="'请填写第 '+(index2+1)+' 空答案'" class="input" /> <input
type="text"
v-model="item2.Content"
:placeholder="'请填写第 ' + (index2 + 1) + ' 空答案'"
class="input"
/>
</view> </view>
</view> </view>
</view> </view>
...@@ -68,6 +73,7 @@ export default { ...@@ -68,6 +73,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/components/subject/EntryProblem.vue
View file @ e9a49d89
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
type="text" type="text"
v-model="item2.Content" v-model="item2.Content"
class="input" class="input"
:placeholder="'请填写第 '+(index2+1)+' 空答案'" :placeholder="'请填写第 ' + (index2 + 1) + ' 空答案'"
@input="input($event, item2)" @input="input($event, item2)"
/> />
</view> </view>
...@@ -71,6 +71,7 @@ export default { ...@@ -71,6 +71,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();
...@@ -85,7 +86,10 @@ export default { ...@@ -85,7 +86,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/FillInTheBlanks.vue
View file @ e9a49d89
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,7 @@ export default {
isLast: Boolean, isLast: Boolean,
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
startIndex: Number,
}, },
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let { ctx } = getCurrentInstance();
...@@ -72,7 +73,10 @@ export default { ...@@ -72,7 +73,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
console.log(77, data.sortTotal, data.sortIndex); if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/ListenTopic.vue
View file @ e9a49d89
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
style="width: 26rpx; height: 22rpx" style="width: 26rpx; height: 22rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/horn.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/horn.png"
/> />
<van-count-down <van-count-down
:time="audioTime" :time="audioTime"
:auto-start="false" :auto-start="false"
class="flex flex_center_center" class="flex flex_center_center"
style="color:#00acf9;" style="color: #00acf9"
ref="listenCountdown" ref="listenCountdown"
format="mm:ss" format="mm:ss"
/> />
</view> </view>
</view> </view>
<view class="questionView"> <view class="questionView">
...@@ -149,17 +149,18 @@ import { ...@@ -149,17 +149,18 @@ import {
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import { changeNumToHan } from "../../utils/index";
const innerAudioContext = uni.createInnerAudioContext(); const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.autoplay = true innerAudioContext.autoplay = true;
export default { export default {
props: { props: {
paperData: Object, paperData: Object,
sort: Number, sort: Number,
sortTotal: Number, sortTotal: Number,
isLast: Boolean, isLast: Boolean,
startIndex: Number,
}, },
setup(props, context) { setup(props, context) {
let {refs} = getCurrentInstance(); let { refs } = getCurrentInstance();
let data = reactive({ let data = reactive({
autoplay: false, autoplay: false,
sortIndex: props.sort + 1, //大题序号 sortIndex: props.sort + 1, //大题序号
...@@ -167,8 +168,8 @@ export default { ...@@ -167,8 +168,8 @@ export default {
data: props.paperData, data: props.paperData,
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
audioTime:60*60*1000, audioTime: 60 * 60 * 1000,
isPlay:true, isPlay: true,
}); });
data.data.DetailsList.map((item) => { data.data.DetailsList.map((item) => {
let arr = item.Title.split(" "); //按空格分段 let arr = item.Title.split(" "); //按空格分段
...@@ -185,7 +186,10 @@ export default { ...@@ -185,7 +186,10 @@ export default {
} }
}); });
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
...@@ -199,31 +203,30 @@ export default { ...@@ -199,31 +203,30 @@ export default {
audioManage(url) { audioManage(url) {
innerAudioContext.src = url; innerAudioContext.src = url;
console.log(188, innerAudioContext); console.log(188, innerAudioContext);
innerAudioContext.onCanplay(()=> { innerAudioContext.onCanplay(() => {
// 必须。可以当做是初始化时长 // 必须。可以当做是初始化时长
innerAudioContext.duration; innerAudioContext.duration;
// 必须。不然也获取不到时长 // 必须。不然也获取不到时长
setTimeout(() => { setTimeout(() => {
let t= innerAudioContext.duration let t = innerAudioContext.duration;
// let m=parseInt(t/60)<10?'0'+parseInt(t/60):parseInt(t/60) // let m=parseInt(t/60)<10?'0'+parseInt(t/60):parseInt(t/60)
// let s=parseInt(t%60)<10?'0'+parseInt(t%60):parseInt(t%60) // let s=parseInt(t%60)<10?'0'+parseInt(t%60):parseInt(t%60)
data.audioTime= t*1000 data.audioTime = t * 1000;
console.log( 207,t, data.audioTime); // 401.475918 console.log(207, t, data.audioTime); // 401.475918
}, 100);
}, 100) });
}) if (data.isPlay) {
if(data.isPlay) { innerAudioContext.play();
innerAudioContext.play(); // refs.listenCountdown.start();
// refs.listenCountdown.start(); console.log("开始播放");
console.log("开始播放"); data.isPlay = false;
data.isPlay=false } else {
}else{ innerAudioContext.stop();
innerAudioContext.stop(); console.log("停了");
console.log("停了"); data.isPlay = true;
data.isPlay=true }
}
// console.log(189, innerAudioContext.duration);
// console.log(189, innerAudioContext.duration);
innerAudioContext.onError((res) => { innerAudioContext.onError((res) => {
console.log(res.errMsg); console.log(res.errMsg);
console.log(res.errCode); console.log(res.errCode);
...@@ -255,8 +258,8 @@ export default { ...@@ -255,8 +258,8 @@ export default {
} }
}, },
onchange(e) { onchange(e) {
data.audioTime="00:00" data.audioTime = "00:00";
innerAudioContext.stop(); innerAudioContext.stop();
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("听力", e.detail); console.log("听力", e.detail);
...@@ -268,15 +271,15 @@ export default { ...@@ -268,15 +271,15 @@ export default {
}, },
}; };
onMounted(() => { onMounted(() => {
console.log('refs',refs) console.log("refs", refs);
if (props.isLast) { if (props.isLast) {
data.current = props.paperData.DetailsList.length; data.current = props.paperData.DetailsList.length;
} }
}); });
onUnmounted(()=>{ onUnmounted(() => {
innerAudioContext.stop(); innerAudioContext.stop();
data.isPlay=true data.isPlay = true;
}); });
let that = methods; let that = methods;
return { return {
...toRefs(data), ...toRefs(data),
...@@ -386,8 +389,8 @@ export default { ...@@ -386,8 +389,8 @@ export default {
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
.listen .van-count-down{ .listen .van-count-down {
font-size: 22rpx !important; font-size: 22rpx !important;
color: #00acf9 !important; color: #00acf9 !important;
} }
</style> </style>
src/components/subject/MultipleChoice.vue
View file @ e9a49d89
...@@ -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/Other.vue
View file @ e9a49d89
<template> <template>
<!-- 计算题 --> <!-- 计算题 -->
<view> <view>
<view class="item" style="padding:0 20px;"> <view class="item" style="padding: 0 20px">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text> <text style="color: #999999"
</view> >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
<view> >
<text class="Single_Before">{{ExamIndex}}</text>/ </view>
<text class="Exam_Total">{{data.DetailsList.length}}</text> <view>
</view> <text class="Single_Before">{{ ExamIndex }}</text
</view> >/
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"> <text class="Exam_Total">{{ data.DetailsList.length }}</text>
<swiper-item v-if="sortIndex != 1"></swiper-item> </view>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id"> </view>
<view class="item1"> <swiper
<view class="flex flex_start_center"> class="swiper-box"
<view>{{ index1 + 1 }}、</view> :autoplay="autoplay"
<view class="num" v-html="item1.Title"></view> :current="current"
</view> @change="onchange"
<view class="chooseName"> >
<textarea type="text" v-model="item1.myAnswer" class="input textarea" placeholder="请填写答案" <swiper-item v-if="sortIndex != 1"></swiper-item>
placeholder-style="textarea-placeholder" :maxlength="-1" /> <swiper-item
</view> v-for="(item1, index1) in data.DetailsList"
</view> :key="item1.id"
</swiper-item> >
<swiper-item v-if="sortIndex != sortTotal"></swiper-item> <view class="item1">
</swiper> <view class="flex flex_start_center">
</view> <view>{{ index1 + 1 }}、</view>
<van-toast id="van-toast" /> <view class="num" v-html="item1.Title"></view>
</view> </view>
<view class="chooseName">
<textarea
type="text"
v-model="item1.myAnswer"
class="input textarea"
placeholder="请填写答案"
placeholder-style="textarea-placeholder"
:maxlength="-1"
/>
</view>
</view>
</swiper-item>
<swiper-item v-if="sortIndex != sortTotal"></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 { import { changeNumToHan } from "../../utils/index";
changeNumToHan export default {
} from "../../utils/index"; props: {
export default { paperData: Object,
props: { sort: Number,
paperData: Object, sortTotal: Number,
sort: Number, isLast: Boolean,
sortTotal: Number, startIndex: Number,
isLast: Boolean },
}, setup(props, context) {
setup(props, context) { let { ctx } = getCurrentInstance();
let { props.paperData.DetailsList.forEach((item, index) => {
ctx item.myAnswer = "";
} = getCurrentInstance(); });
props.paperData.DetailsList.forEach((item, index) => { let data = reactive({
item.myAnswer = ""; data: props.paperData,
}); autoplay: false,
let data = reactive({ sortIndex: props.sort + 1,
data: props.paperData, sortTotal: props.sortTotal,
autoplay: false, current: 1, //默认从第几个开始-用于从快捷菜单点入
sortIndex: props.sort + 1, ExamIndex: 1, //第几题
sortTotal: props.sortTotal, });
current: 1, //默认从第几个开始-用于从快捷菜单点入 if (props.startIndex) {
ExamIndex: 1, //第几题 data.current = props.startIndex;
}); data.ExamIndex = props.startIndex;
}
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();
}, },
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('进入') console.log("进入");
this.$emit('getAfterTopic'); this.$emit("getAfterTopic");
} }
if (e.detail.current == 0) { if (e.detail.current == 0) {
this.$emit('getBeforeTopic'); this.$emit("getBeforeTopic");
} }
} },
}; };
onMounted(() => { onMounted(() => {
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 {
...toRefs(data), ...toRefs(data),
...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;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before { .Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #DA7878; color: #da7878;
} }
.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;
} }
.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;
} }
.choose { .choose {
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;
line-height: 40rpx; line-height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 26rpx; font-size: 26rpx;
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;
} }
.input { .input {
box-sizing: border-box; box-sizing: border-box;
width: 690rpx; width: 690rpx;
border-bottom: 2rpx solid #000; border-bottom: 2rpx solid #000;
color: #000; color: #000;
font-size: 22rpx; font-size: 22rpx;
} }
.textarea { .textarea {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
} }
/deep/.textarea-placeholder { /deep/.textarea-placeholder {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #cccccc; color: #cccccc;
} }
</style> </style>
src/components/subject/SingleChoice.vue
View file @ e9a49d89
...@@ -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,11 @@ export default { ...@@ -91,6 +92,11 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
console.log(86, data.data);
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 @ e9a49d89
...@@ -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();
...@@ -87,7 +88,10 @@ export default { ...@@ -87,7 +88,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
console.log(77, data.sortIndex != 1, data.sortIndex != data.sortTotal); if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/Spoken.vue
View file @ e9a49d89
<template> <template>
<!-- 计算题 --> <!-- 计算题 -->
<view> <view>
<view class="item" style="padding:0 20px;"> <view class="item" style="padding: 0 20px">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text> <text style="color: #999999"
</view> >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
<view> >
<text class="Single_Before">{{ExamIndex}}</text>/ </view>
<text class="Exam_Total">{{data.DetailsList.length}}</text> <view>
</view> <text class="Single_Before">{{ ExamIndex }}</text
</view> >/
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"> <text class="Exam_Total">{{ data.DetailsList.length }}</text>
<swiper-item v-if="sortIndex != 1"></swiper-item> </view>
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id"> </view>
<view class="item1"> <swiper
<view class="flex flex_start_center"> class="swiper-box"
<view>{{ index1 + 1 }}、</view> :autoplay="autoplay"
<view class="num" v-html="item1.Title"></view> :current="current"
</view> @change="onchange"
<view class="chooseName"> >
<textarea type="text" v-model="item1.myAnswer" class="input textarea" placeholder="请填写答案" <swiper-item v-if="sortIndex != 1"></swiper-item>
placeholder-style="textarea-placeholder" :maxlength="-1" /> <swiper-item
</view> v-for="(item1, index1) in data.DetailsList"
</view> :key="item1.id"
</swiper-item> >
<swiper-item v-if="sortIndex != sortTotal"></swiper-item> <view class="item1">
</swiper> <view class="flex flex_start_center">
</view> <view>{{ index1 + 1 }}、</view>
<van-toast id="van-toast" /> <view class="num" v-html="item1.Title"></view>
</view> </view>
<view class="chooseName">
<textarea
type="text"
v-model="item1.myAnswer"
class="input textarea"
placeholder="请填写答案"
placeholder-style="textarea-placeholder"
:maxlength="-1"
/>
</view>
</view>
</swiper-item>
<swiper-item v-if="sortIndex != sortTotal"></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 { import { changeNumToHan } from "../../utils/index";
changeNumToHan export default {
} from "../../utils/index"; props: {
export default { paperData: Object,
props: { sort: Number,
paperData: Object, sortTotal: Number,
sort: Number, isLast: Boolean,
sortTotal: Number, startIndex: Number,
isLast: Boolean },
}, setup(props, context) {
setup(props, context) { let { ctx } = getCurrentInstance();
let { props.paperData.DetailsList.forEach((item, index) => {
ctx item.myAnswer = "";
} = getCurrentInstance(); });
props.paperData.DetailsList.forEach((item, index) => { let data = reactive({
item.myAnswer = ""; data: props.paperData,
}); autoplay: false,
let data = reactive({ sortIndex: props.sort + 1,
data: props.paperData, sortTotal: props.sortTotal,
autoplay: false, current: 1, //默认从第几个开始-用于从快捷菜单点入
sortIndex: props.sort + 1, ExamIndex: 1, //第几题
sortTotal: props.sortTotal, });
current: 1, //默认从第几个开始-用于从快捷菜单点入 if (props.startIndex) {
ExamIndex: 1, //第几题 data.current = props.startIndex;
}); data.ExamIndex = props.startIndex;
}
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();
}, },
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('进入') console.log("进入");
this.$emit('getAfterTopic'); this.$emit("getAfterTopic");
} }
if (e.detail.current == 0) { if (e.detail.current == 0) {
this.$emit('getBeforeTopic'); this.$emit("getBeforeTopic");
} }
} },
}; };
onMounted(() => { onMounted(() => {
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 {
...toRefs(data), ...toRefs(data),
...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;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before { .Single_Before {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #DA7878; color: #da7878;
} }
.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;
} }
.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;
} }
.choose { .choose {
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;
line-height: 40rpx; line-height: 40rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
margin-right: 30rpx; margin-right: 30rpx;
font-size: 26rpx; font-size: 26rpx;
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;
} }
.input { .input {
box-sizing: border-box; box-sizing: border-box;
width: 690rpx; width: 690rpx;
border-bottom: 2rpx solid #000; border-bottom: 2rpx solid #000;
color: #000; color: #000;
font-size: 22rpx; font-size: 22rpx;
} }
.textarea { .textarea {
box-sizing: border-box; box-sizing: border-box;
padding: 20rpx 0; padding: 20rpx 0;
} }
/deep/.textarea-placeholder { /deep/.textarea-placeholder {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #cccccc; color: #cccccc;
} }
</style> </style>
src/components/subject/easyQuestion.vue
View file @ e9a49d89
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,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();
...@@ -82,7 +83,10 @@ export default { ...@@ -82,7 +83,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/judge.vue
View file @ e9a49d89
...@@ -71,6 +71,7 @@ export default { ...@@ -71,6 +71,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();
...@@ -82,7 +83,10 @@ export default { ...@@ -82,7 +83,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/nounExplanation.vue
View file @ e9a49d89
...@@ -65,6 +65,7 @@ export default { ...@@ -65,6 +65,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();
...@@ -79,7 +80,10 @@ export default { ...@@ -79,7 +80,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/readingCompre.vue
View file @ e9a49d89
...@@ -149,6 +149,7 @@ export default { ...@@ -149,6 +149,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();
...@@ -164,6 +165,10 @@ export default { ...@@ -164,6 +165,10 @@ export default {
timer: null, timer: null,
timeOutEvent: false, timeOutEvent: false,
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/components/subject/shortAnswer.vue
View file @ e9a49d89
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,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();
...@@ -82,7 +83,10 @@ export default { ...@@ -82,7 +83,10 @@ export default {
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
if (props.startIndex) {
data.current = props.startIndex;
data.ExamIndex = props.startIndex;
}
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
......
src/pages/exam/answerSheet.vue
View file @ e9a49d89
...@@ -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 @ e9a49d89
...@@ -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="item.startIndex"
:paperData="item" :paperData="item"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
/> />
<!-- 多选题 --> <!-- 多选题 -->
<MultipleChoice <MultipleChoice
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -49,6 +51,7 @@ ...@@ -49,6 +51,7 @@
/> />
<!-- 单选题 --> <!-- 单选题 -->
<SingleChoice <SingleChoice
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -59,6 +62,7 @@ ...@@ -59,6 +62,7 @@
/> />
<!-- 听力题 --> <!-- 听力题 -->
<ListenTopic <ListenTopic
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -69,6 +73,7 @@ ...@@ -69,6 +73,7 @@
/> />
<!-- 填空题 --> <!-- 填空题 -->
<FillInTheBlanks <FillInTheBlanks
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -80,6 +85,7 @@ ...@@ -80,6 +85,7 @@
<!-- 阅读理解 --> <!-- 阅读理解 -->
<readingCompre <readingCompre
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -93,6 +99,7 @@ ...@@ -93,6 +99,7 @@
/> />
<!-- 判断题 --> <!-- 判断题 -->
<Judge <Judge
:startIndex="item.startIndex"
:paperData="item" :paperData="item"
:isLast="isLast" :isLast="isLast"
:sort="index" :sort="index"
...@@ -103,10 +110,11 @@ ...@@ -103,10 +110,11 @@
/> />
<!-- 简答题 --> <!-- 简答题 -->
<shortAnswer <shortAnswer
:startIndex="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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="item.startIndex"
: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 = {
...@@ -317,11 +339,12 @@ export default { ...@@ -317,11 +339,12 @@ export default {
back() { back() {
uni.navigateBack(); uni.navigateBack();
}, },
async getPaperDetail() { async getPaperDetail(callback) {
let res = await getPaperDetail(data.msg); let res = await getPaperDetail(data.msg);
if (res) { if (res) {
callback(res);
data.peaperDetail = res.Data; data.peaperDetail = res.Data;
console.log(90, res.Data.Paper.GroupList); // console.log(90, res.Data.Paper.GroupList);
} }
}, },
//往后翻 //往后翻
...@@ -345,8 +368,18 @@ export default { ...@@ -345,8 +368,18 @@ export default {
...methods, ...methods,
}; };
}, },
onLoad() { onLoad(options) {
this.getPaperDetail(); this.getPaperDetail((res) => {
if (options.index) {
this.changeIndex = parseInt(options.index);
if (options.index1) {
res.Data.Paper.GroupList[this.changeIndex].startIndex = parseInt(
options.index1
);
}
}
});
console.log(340, options, this.changeIndex);
}, },
}; };
</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