提交 70bbbcfb authored 作者: lihuihui's avatar lihuihui

update

上级 75737f22
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<div class="code">{{ info.examinee_number }}</div> <div class="code">{{ info.examinee_number }}</div>
</div> </div>
</div> </div>
<div class="order-scroll">
<div class="order-num"> <div class="order-num">
<template v-for="(item, index) in questionParams.question.question_items"> <template v-for="(item, index) in questionParams.question.question_items">
<div :key="index" v-if="item.question_item_type != 5 && item.question_item_type != 7 && item.question_item_type != 8"> <div :key="index" v-if="item.question_item_type != 5 && item.question_item_type != 7 && item.question_item_type != 8">
...@@ -101,6 +102,7 @@ ...@@ -101,6 +102,7 @@
</template> </template>
</div> </div>
</div> </div>
</div>
<!-- <ul class="flag-tips"> <!-- <ul class="flag-tips">
<li> <li>
<div class="circle1"></div> <div class="circle1"></div>
...@@ -129,14 +131,29 @@ export default { ...@@ -129,14 +131,29 @@ export default {
questionParams: { type: Object, default: () => {} }, questionParams: { type: Object, default: () => {} },
info: { type: Object, default: () => {} } info: { type: Object, default: () => {} }
}, },
data() {
return {
}
},
mounted() { mounted() {
if (!this.isMobile()) {
Bus.$on('monitoringChanges', target => { Bus.$on('monitoringChanges', target => {
this.$forceUpdate() this.$forceUpdate()
}) })
const wrapper = this.$refs.wrapper const wrapper = this.$refs.wrapper
new BScroll(wrapper) new BScroll(wrapper)
}
}, },
methods: { methods: {
isMobile() {
const ua = navigator.userAgent
const isWindowsPhone = /(?:Windows Phone)/.test(ua)
const isSymbian = /(?:SymbianOS)/.test(ua) || isWindowsPhone
const isAndroid = /(?:Android)/.test(ua)
const isPhone = /(?:iPhone)/.test(ua)
const isPc = !isPhone && !isAndroid && !isSymbian
return isPc
},
goQuestion(n) { goQuestion(n) {
this.$emit('switchQuestion') this.$emit('switchQuestion')
this.questionParams.questionIndex = n - 1 this.questionParams.questionIndex = n - 1
...@@ -175,6 +192,10 @@ export default { ...@@ -175,6 +192,10 @@ export default {
} }
} }
} }
.order-scroll{
// max-height: 100px;
// overflow-y: scroll;
}
.order-num { .order-num {
padding-bottom: 90px; padding-bottom: 90px;
.tit { .tit {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- || item.question_item_type == 7 || item.question_item_type == 8 --> <!-- || item.question_item_type == 7 || item.question_item_type == 8 -->
<div class="title-type"> <div class="title-type">
<div class="type">{{ questionData.question_item_title }}</div> <div class="type">{{ questionData.question_item_title }}</div>
<div class="num">{{ questionData.q_order }}/{{ questionParams.question.total_question_count }}</div> <div class="num">{{ questionParams.questionIndex + 1 }}/{{ questionParams.question.total_question_count }}</div>
</div> </div>
<div class="case-que"> <div class="case-que">
<div class="stem" v-html="questionData.common_content"></div> <div class="stem" v-html="questionData.common_content"></div>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
></question> ></question>
</div> </div>
</div> </div>
<div class="right" ref="wrapper"> <div :class="isMobile() ? 'right scroll' : 'right hidden'" ref="wrapper">
<answer-card <answer-card
:questionParams="questionParams" :questionParams="questionParams"
:changeTime="changeTime" :changeTime="changeTime"
...@@ -449,7 +449,16 @@ export default { ...@@ -449,7 +449,16 @@ export default {
width: 220px; width: 220px;
background: #fff; background: #fff;
padding: 0 20px; padding: 0 20px;
overflow-y: hidden; &.hidden{
overflow: hidden;
}
&.scroll{
overflow-y: scroll;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
// scrollbar-width: none; // scrollbar-width: none;
// &::-webkit-scrollbar { // &::-webkit-scrollbar {
// display: none; // display: none;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论