Skip to content

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

修改

parent 7ce8d06d
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 57 deletions
src/components/question/listen.vue
View file @ 548f7fa2
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<i class="icon_audio_default" v-if="!isPlay"></i> <i class="icon_audio_default" v-if="!isPlay"></i>
<i class="icon_audio_playing" v-else></i> <i class="icon_audio_playing" v-else></i>
</view> </view>
<view class="item1" :style="{ height: `calc(100vh - 460rpx)` }"> <view class="item1" :style="{ height: `calc(100vh - 560rpx)` }">
<template v-if="item1.StudentAnswer.length<item1.QuestionContentObj.length"> <template v-if="item1.StudentAnswer.length<item1.QuestionContentObj.length">
<view class="questionView"> <view class="questionView">
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" class="item2"> <view v-for="(item2, index2) in item1.QuestionContentObj" :key="index2" class="item2">
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
<view class="flex flex_start_center item3" <view class="flex flex_start_center item3"
v-if="item2.QuestionKey === 'single'"> v-if="item2.QuestionKey === 'single'">
<view class="chooseNum" <view class="chooseNum"
:class="{ 'isTrueAnswer': item3.IsAnswer,'isNotAnswer':getErrorAnswer(item1,index2,item3.Name)}"> :class="{ 'isRightAnswer': item3.IsAnswer,'isNotRightAnswer':getErrorAnswer(item1,index2,item3.Name)}">
{{ item3.Name }} {{ item3.Name }}
</view> </view>
<view class="chooseName" <view class="chooseName"
:class="{ 'isTrueAnswer': item3.IsAnswer,'isNotAnswer':getErrorAnswer(item1,index2,item3.Name)}" :class="{ 'isRightText': item3.IsAnswer,'isNotAnswer':getErrorAnswer(item1,index2,item3.Name)}"
v-html="item3.Content"></view> v-html="item3.Content"></view>
</view> </view>
</view> </view>
...@@ -302,16 +302,24 @@ ...@@ -302,16 +302,24 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.isRightAnswer{
.isNotAnswer { background-color: green!important;
color: red !important; color:#fff!important;
}
.isRightText{
color:green!important;
} }
.isTrueAnswer { .isTrueAnswer {
color: green !important; color: green !important;
} }
.isNotRightAnswer{
background-color: red;
color:#fff!important;
}
.isNotAnswer {
color: red ;
}
.AnswerContent { .AnswerContent {
font-size: 30rpx; font-size: 30rpx;
padding: 25rpx; padding: 25rpx;
......
src/components/question/readingCompre.vue
View file @ 548f7fa2
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
<!-- 单选--> <!-- 单选-->
<view class="flex item3" <view class="flex item3"
v-if="item2.QuestionKey === 'single' || item2.QuestionKey === 'single-number'"> v-if="item2.QuestionKey === 'single' || item2.QuestionKey === 'single-number'">
<view class="chooseNum" :class="{ 'isTrueAnswer': item3.IsAnswer,'isNotAnswer':getErrorAnswer(item1,index2,item3.Name)}"> <view class="chooseNum" :class="{ 'isRightAnswer': item3.IsAnswer,'isNotRightAnswer':getErrorAnswer(item1,index2,item3.Name)}">
{{ item3.Name }} {{ item3.Name }}
</view> </view>
<view class="chooseName" :class="{ isTrueAnswer: item3.IsAnswer }" <view class="chooseName" :class="{ 'isRightText': item3.IsAnswer }"
v-html="item3.Content"></view> v-html="item3.Content"></view>
</view> </view>
</view> </view>
...@@ -245,7 +245,6 @@ ...@@ -245,7 +245,6 @@
</script> </script>
<style scoped> <style scoped>
.AnswerBtn { .AnswerBtn {
margin-top: 30rpx;
padding: 0 40rpx; padding: 0 40rpx;
} }
...@@ -292,15 +291,26 @@ ...@@ -292,15 +291,26 @@
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
} }
.isRightAnswer{
background-color: green!important;
color:#fff!important;
}
.isRightText{
color:green!important;
}
.isNotAnswer {
color: red !important;
}
.isTrueAnswer { .isTrueAnswer {
color: green !important; color: green !important;
} }
.isNotRightAnswer{
.isNotAnswer { background-color: red;
color: red !important; color:#fff!important;
} }
.ExamIndex_Box { .ExamIndex_Box {
margin-right: 48rpx; margin-right: 48rpx;
} }
...@@ -426,13 +436,13 @@ ...@@ -426,13 +436,13 @@
color: #111111; color: #111111;
} }
.isTrueAnswer {
color: green !important;
}
.isNotAnswer { .isNotAnswer {
color: red !important; color: red !important;
} }
.isTrueAnswer {
color: green !important;
}
.AnswerContent { .AnswerContent {
font-size: 30rpx; font-size: 30rpx;
......
src/components/question/subject/listen.vue
View file @ 548f7fa2
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
export default { export default {
props: { props: {
paperData: Object, paperData: Object,
isShowJx: Boolean isShowJx: Boolean,
CurIndex: Number
}, },
setup(props, context) { setup(props, context) {
let { let {
...@@ -114,6 +115,10 @@ ...@@ -114,6 +115,10 @@
}, },
isPlay:false isPlay:false
}); });
watch(()=>props.CurIndex, (newVal, oldValue) => {
innerAudioContext.stop();
data.isPlay=false;
},{deep:true});
let methods = { let methods = {
// 单选 // 单选
singerChange(item1, index, item3) { singerChange(item1, index, item3) {
...@@ -150,10 +155,6 @@ ...@@ -150,10 +155,6 @@
}) })
} }
}, },
//父组件切换调用
clickParent(){
innerAudioContext.stop();
}
}; };
onMounted(() => { onMounted(() => {
data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight; data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
...@@ -247,7 +248,7 @@ ...@@ -247,7 +248,7 @@
.item { .item {
position: relative; position: relative;
margin-top: 180rpx; margin-top: 210rpx;
} }
.item1 { .item1 {
......
src/components/question/subject/readingCompre.vue
View file @ 548f7fa2
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
.item { .item {
position: relative; position: relative;
margin-top:180rpx; margin-top:210rpx;
} }
.name { .name {
......
src/components/question/subject/singlenumber.vue
View file @ 548f7fa2
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
} }
.item { .item {
margin-top: 180rpx; margin-top: 210rpx;
} }
.item1 { .item1 {
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
} }
.isMyChoose { .isMyChoose {
background-color: #4C50E7; background-color: #00acf9 !important;
color: #fff; color: #fff;
} }
......
src/components/question/word.vue
View file @ 548f7fa2
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<swiper class="swiper-box" :style="{height: `calc(100vh - 300rpx - ${statusBarHeight}px)`,}" <swiper class="swiper-box" :style="{height: `calc(100vh - 300rpx - ${statusBarHeight}px)`,}"
:current="current" @change="onchange"> :current="current" @change="onchange">
<swiper-item v-for="(item1, index1) in dataList" :key="index1"> <swiper-item v-for="(item1, index1) in dataList" :key="index1">
<view class="item1" :style="{height: `calc(100vh - 390rpx - ${statusBarHeight}px)`}"> <view class="item1" :style="{height: `calc(100vh - 390rpx)`}">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>
</view> </view>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</template> </template>
<template v-else> <template v-else>
<view class="chooseNum" <view class="chooseNum"
:class="{ 'isTrueAnswer': item2.IsAnswer,'isNotAnswer':getErrorAnswer(item1,item2.Name) }"> :class="{ 'isRightAnswer': item2.IsAnswer,'isNotRightAnswer':getErrorAnswer(item1,item2.Name) }">
{{ item2.Name }} {{ item2.Name }}
</view> </view>
<view class="chooseName" <view class="chooseName"
:class="{ 'isTrueAnswer': item2.IsAnswer,'isNotAnswer':getErrorAnswer(item1,item2.Name) }" :class="{ 'isRightText': item2.IsAnswer,'isNotAnswer':getErrorAnswer(item1,item2.Name) }"
v-html="item2.Content"> v-html="item2.Content">
</view> </view>
</template> </template>
...@@ -176,14 +176,24 @@ ...@@ -176,14 +176,24 @@
</script> </script>
<style scoped> <style scoped>
.isRightAnswer{
background-color: green!important;
color:#fff!important;
}
.isRightText{
color:green!important;
}
.isTrueAnswer { .isTrueAnswer {
color: green !important; color: green !important;
} }
.isNotRightAnswer{
background-color: red!important;
color:#fff!important;
}
.isNotAnswer { .isNotAnswer {
color: red !important; color: red!important ;
} }
.AnswerContent { .AnswerContent {
font-size: 28rpx; font-size: 28rpx;
padding: 25rpx; padding: 25rpx;
......
src/pages.json
View file @ 548f7fa2
...@@ -181,8 +181,8 @@ ...@@ -181,8 +181,8 @@
"text": "课表" "text": "课表"
}, { }, {
"pagePath": "pages/activity/MyExam", "pagePath": "pages/activity/MyExam",
"iconPath": "static/image/active.png", "iconPath": "static/image/question.png",
"selectedIconPath": "static/image/active_a.png", "selectedIconPath": "static/image/question_a.png",
"text": "日语题库" "text": "日语题库"
}, { }, {
"pagePath": "pages/person/person", "pagePath": "pages/person/person",
......
src/pages/activity/MyExam.vue
View file @ 548f7fa2
<style scoped> <style scoped>
.Question_Bank { .Question_Bank {
padding: 0 25rpx; padding: 0 25rpx;
height: 100vh; /* height: 100vh; */
background-color: #F5F5F5; background-color: #F5F5F5;
} }
...@@ -133,8 +133,8 @@ ...@@ -133,8 +133,8 @@
color: #333E52; color: #333E52;
font-size: 28rpx; font-size: 28rpx;
position: absolute; position: absolute;
left: 55rpx; left: 68rpx;
bottom: 100rpx; bottom: 90rpx;
} }
.Join_Linian { .Join_Linian {
...@@ -234,19 +234,16 @@ ...@@ -234,19 +234,16 @@
</view> </view>
<view class="Janpa_Level" style="margin-top:20rpx;"> <view class="Janpa_Level" style="margin-top:20rpx;">
<view class="Ques_Title">日语真题演练</view> <view class="Ques_Title">日语真题演练</view>
<view class="JanpaTrueTi" style="margin:26rpx 0 20rpx 0" @click="goWrong()">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/true2.png" alt="" />
<view class="Join_Content">
<view class="Join_Linian">我的错题</view>
</view>
</view>
<view class="JanpaTrueTi" style="margin:26rpx 0 20rpx 0" @click="goJpGrade(6)"> <view class="JanpaTrueTi" style="margin:26rpx 0 20rpx 0" @click="goJpGrade(6)">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/true2.png" alt="" /> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/trueTi.png" alt="" />
<view class="Join_Content"> <view class="Join_Content">
<view class="Join_Linian">高考真题</view>
<view v-if="JoinArr&&JoinArr.length>0">{{JoinArr[5].JoinNum}}人参与</view> <view v-if="JoinArr&&JoinArr.length>0">{{JoinArr[5].JoinNum}}人参与</view>
</view> </view>
</view> </view>
<view class="Ques_Title">日语错题</view>
<view class="JanpaTrueTi" style="margin:26rpx 0 20rpx 0" @click="goWrong()">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/wrong.png" alt="" />
</view>
</view> </view>
<van-popup :show="showPop" @close="showPop=false" round> <van-popup :show="showPop" @close="showPop=false" round>
<view style=" <view style="
......
src/pages/exam/examGongu.vue
View file @ 548f7fa2
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
z-index: 999; z-index: 999;
" :style="{ top: `calc(${statusBarHeight}px + 105rpx)` }" @click="showAnswerSheet"></i> " :style="{ top: `calc(${statusBarHeight}px + 105rpx)` }" @click="showAnswerSheet"></i>
<swiper class="swiper-box" style="height:100vh" :current="current" @change="onchange"> <swiper class="swiper-box" style="height:100vh" :current="current" @change="onchange">
<swiper-item v-for="(item, index) in dataList" :key="index"> <swiper-item v-for="(item, index) in dataList" :key="index" :data-index="index">
<singlenumber v-if="item.QuestionTypeKey=='single-number'||item.QuestionTypeKey=='single'" <singlenumber v-if="item.QuestionTypeKey=='single-number'||item.QuestionTypeKey=='single'"
@answerChange="getAnswerChange($event, index)" :paperData="item" :isShowJx="isShowJx" /> @answerChange="getAnswerChange($event, index)" :paperData="item" :isShowJx="isShowJx" />
<readingCompre v-if="item.QuestionTypeKey=='reading-comprehensio'" <readingCompre v-if="item.QuestionTypeKey=='reading-comprehensio'"
@answerChange="getAnswerChange($event, index)" :paperData="item" :isShowJx="isShowJx" /> @answerChange="getAnswerChange($event, index)" :paperData="item" :isShowJx="isShowJx" />
<listen v-if="item.QuestionTypeKey=='listening'" ref="myRef" @answerChange="getAnswerChange($event, index)" <listen v-if="item.QuestionTypeKey=='listening'" :CurIndex='current' @answerChange="getAnswerChange($event, index)"
:paperData="item" :isShowJx="isShowJx" /> :paperData="item" :isShowJx="isShowJx" />
</swiper-item> </swiper-item>
</swiper> </swiper>
...@@ -105,9 +105,6 @@ ...@@ -105,9 +105,6 @@
onchange(e) { onchange(e) {
if(e&&e.detail){ if(e&&e.detail){
data.current = e.detail.current; data.current = e.detail.current;
if(ctx.$refs.myRef&&ctx.$refs.myRef.length>0){
ctx.$refs.myRef[0].clickParent();
}
if(data.CommonType==3||data.CommonType==4||data.CommonType==5||data.CommonType==6){ if(data.CommonType==3||data.CommonType==4||data.CommonType==5||data.CommonType==6){
var Id=0; var Id=0;
if(data.current>=1){ if(data.current>=1){
......
src/pages/exam/examStart.vue
View file @ 548f7fa2
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
<style scoped> <style scoped>
.exam-con { .exam-con {
box-sizing: border-box; box-sizing: border-box;
margin-top:20rpx;
} }
.answerSheet { .answerSheet {
......
src/pages/exam/wrong.vue
View file @ 548f7fa2
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<view class="Wr_Fuxi"> <view class="Wr_Fuxi">
<text v-if="dataObj.wordsWrongFinishCount==0">未复习</text> <text v-if="dataObj.wordsWrongFinishCount==0">未复习</text>
<text v-if="dataObj.wordsWrongFinishCount>0&&dataObj.wordsWrongFinishCount<dataObj.wordsWrongTotalCount">复习中</text> <text v-if="dataObj.wordsWrongFinishCount>0&&dataObj.wordsWrongFinishCount<dataObj.wordsWrongTotalCount">复习中</text>
<text v-if="dataObj.wordsWrongFinishCount==dataObj.wordsWrongTotalCount">复习完毕</text> <text v-if="dataObj.wordsWrongFinishCount>0&&dataObj.wordsWrongFinishCount==dataObj.wordsWrongTotalCount">复习完毕</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<view class="Wr_Fuxi"> <view class="Wr_Fuxi">
<text v-if="dataObj.grammarWrongFinishCount==0">未复习</text> <text v-if="dataObj.grammarWrongFinishCount==0">未复习</text>
<text v-if="dataObj.grammarWrongFinishCount>0&&dataObj.grammarWrongFinishCount<dataObj.grammarWrongTotalCount">复习中</text> <text v-if="dataObj.grammarWrongFinishCount>0&&dataObj.grammarWrongFinishCount<dataObj.grammarWrongTotalCount">复习中</text>
<text v-if="dataObj.grammarWrongFinishCount==dataObj.grammarWrongTotalCount">复习完毕</text> <text v-if="dataObj.grammarWrongFinishCount>0&&dataObj.grammarWrongFinishCount==dataObj.grammarWrongTotalCount">复习完毕</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<view class="Wr_Fuxi"> <view class="Wr_Fuxi">
<text v-if="dataObj.readingWrongFinishCount==0">未复习</text> <text v-if="dataObj.readingWrongFinishCount==0">未复习</text>
<text v-if="dataObj.readingWrongFinishCount>0&&dataObj.readingWrongFinishCount<dataObj.readingWrongTotalCount">复习中</text> <text v-if="dataObj.readingWrongFinishCount>0&&dataObj.readingWrongFinishCount<dataObj.readingWrongTotalCount">复习中</text>
<text v-if="dataObj.readingWrongFinishCount==dataObj.readingWrongTotalCount">复习完毕</text> <text v-if="dataObj.readingWrongFinishCount>0&&dataObj.readingWrongFinishCount==dataObj.readingWrongTotalCount">复习完毕</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<view class="Wr_Fuxi"> <view class="Wr_Fuxi">
<text v-if="dataObj.listeningWrongFinishCount==0">未复习</text> <text v-if="dataObj.listeningWrongFinishCount==0">未复习</text>
<text v-if="dataObj.listeningWrongFinishCount>0&&dataObj.listeningWrongFinishCount<dataObj.listeningWrongTotalCount">复习中</text> <text v-if="dataObj.listeningWrongFinishCount>0&&dataObj.listeningWrongFinishCount<dataObj.listeningWrongTotalCount">复习中</text>
<text v-if="dataObj.listeningWrongFinishCount==dataObj.listeningWrongTotalCount">复习完毕</text> <text v-if="dataObj.listeningWrongFinishCount>0&&dataObj.listeningWrongFinishCount==dataObj.listeningWrongTotalCount">复习完毕</text>
</view> </view>
</view> </view>
</view> </view>
......
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