提交 a62ebfd3 authored 作者: lihuihui's avatar lihuihui

修改样式

上级 85dab117
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
background: #fff; background: #fff;
} }
.head{ .head{
border-bottom: 1px solid #ccc;
color: #222; color: #222;
display: flex; display: flex;
padding: .4rem 0; padding: .4rem 0;
......
...@@ -291,6 +291,7 @@ export default { ...@@ -291,6 +291,7 @@ export default {
background: #fff; background: #fff;
} }
.head{ .head{
border-bottom: 1px solid #ccc;
color: #222; color: #222;
display: flex; display: flex;
padding: .4rem 0; padding: .4rem 0;
......
...@@ -901,6 +901,7 @@ export default { ...@@ -901,6 +901,7 @@ export default {
} }
} }
.head{ .head{
border-bottom: 1px solid #ccc;
color: #222; color: #222;
display: flex; display: flex;
padding: .4rem 0; padding: .4rem 0;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</li> </li>
</ul> </ul>
<ul class="tips-box" v-else> <ul class="tips-box" v-else>
<li v-if="this.$route.query.id !== 'err'"> <li>
<div class="circle1"></div> <div class="circle1"></div>
<div class="txt">答对</div> <div class="txt">答对</div>
</li> </li>
...@@ -178,6 +178,7 @@ export default { ...@@ -178,6 +178,7 @@ export default {
} }
} }
.order-num{ .order-num{
padding-top: 20px;
padding-bottom: 90px; padding-bottom: 90px;
.tit{ .tit{
font-size: 12px; font-size: 12px;
......
...@@ -166,11 +166,15 @@ export default { ...@@ -166,11 +166,15 @@ export default {
this.questionParams.answerRecord[pId] this.questionParams.answerRecord[pId]
? this.questionParams.answerRecord[pId][cId] ? this.questionParams.answerRecord[pId][cId]
? (() => { ? (() => {
const optChack = this.questionParams.answerRecord[pId][cId].answer.findIndex(item => { return item === optId }) if (this.questionParams.answerRecord[pId][cId].answer) {
if (optChack === -1) { const optChack = this.questionParams.answerRecord[pId][cId].answer.findIndex(item => { return item === optId })
this.questionParams.answerRecord[pId][cId].answer.push(optId) if (optChack === -1) {
this.questionParams.answerRecord[pId][cId].answer.push(optId)
} else {
this.questionParams.answerRecord[pId][cId].answer.splice(optChack, 1)
}
} else { } else {
this.questionParams.answerRecord[pId][cId].answer.splice(optChack, 1) this.questionParams.answerRecord[pId][cId].answer = [optId]
} }
})() })()
: this.questionParams.answerRecord[pId][cId] = { : this.questionParams.answerRecord[pId][cId] = {
...@@ -247,7 +251,7 @@ export default { ...@@ -247,7 +251,7 @@ export default {
.title-type{ .title-type{
width: 100%; width: 100%;
height: 45px; height: 45px;
border-bottom:1px solid #ccc; // border-bottom:1px solid #ccc;
display: flex; display: flex;
align-items: center; align-items: center;
.type{ .type{
......
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
<div :class="questionParams.question.isCollection ? 'icon active' : 'icon'"></div> <div :class="questionParams.question.isCollection ? 'icon active' : 'icon'"></div>
<div class="txt">{{ questionParams.question.isCollection ? '已收藏' : '收藏' }}</div> <div class="txt">{{ questionParams.question.isCollection ? '已收藏' : '收藏' }}</div>
</div> </div>
<div class="end-exam-btn" v-if="!$route.query.id"> <div class="end-exam-btn">
<div class="btn" @click="endExam">交卷</div> <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -340,6 +340,7 @@ export default { ...@@ -340,6 +340,7 @@ export default {
height: 100%; height: 100%;
// background: #f9f9f9; // background: #f9f9f9;
.head{ .head{
border-bottom: 1px solid #ccc;
width: 100%; width: 100%;
height: 80px; height: 80px;
background: #FFFFFF; background: #FFFFFF;
...@@ -383,6 +384,7 @@ export default { ...@@ -383,6 +384,7 @@ export default {
.exam-main{ .exam-main{
display: flex; display: flex;
.left{ .left{
background: #fff;
flex: 1; flex: 1;
padding: 10px 20px 0 53px; padding: 10px 20px 0 53px;
overflow-y: scroll; overflow-y: scroll;
...@@ -392,6 +394,7 @@ export default { ...@@ -392,6 +394,7 @@ export default {
} }
} }
.right{ .right{
border-left: 1px solid #ccc;
position: relative; position: relative;
width: 220px; width: 220px;
background: #fff; background: #fff;
...@@ -404,6 +407,7 @@ export default { ...@@ -404,6 +407,7 @@ export default {
} }
} }
.foot{ .foot{
border-top: 1px solid #ccc;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -449,6 +453,10 @@ export default { ...@@ -449,6 +453,10 @@ export default {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
.end-exam-btn{ .end-exam-btn{
background: #fff;
height: 62px;
margin-top: -2px;
border-left: 1px solid #ccc;
width: 260px; width: 260px;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -468,6 +476,7 @@ export default { ...@@ -468,6 +476,7 @@ export default {
} }
.sign{ .sign{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
......
...@@ -234,7 +234,7 @@ export default { ...@@ -234,7 +234,7 @@ export default {
.title-type{ .title-type{
width: 100%; width: 100%;
height: 45px; height: 45px;
border-bottom:1px solid #ccc; // border-bottom:1px solid #ccc;
display: flex; display: flex;
align-items: center; align-items: center;
.type{ .type{
......
...@@ -221,6 +221,7 @@ export default { ...@@ -221,6 +221,7 @@ export default {
height: 100%; height: 100%;
// background: #f9f9f9; // background: #f9f9f9;
.head{ .head{
border-bottom: 1px solid #ccc;
width: 100%; width: 100%;
height: 80px; height: 80px;
background: #FFFFFF; background: #FFFFFF;
...@@ -264,6 +265,7 @@ export default { ...@@ -264,6 +265,7 @@ export default {
.exam-main{ .exam-main{
display: flex; display: flex;
.left{ .left{
background: #fff;
flex: 1; flex: 1;
padding: 10px 20px 0 53px; padding: 10px 20px 0 53px;
overflow-y: scroll; overflow-y: scroll;
...@@ -273,6 +275,7 @@ export default { ...@@ -273,6 +275,7 @@ export default {
} }
} }
.right{ .right{
border-left: 1px solid #ccc;
position: relative; position: relative;
width: 220px; width: 220px;
background: #fff; background: #fff;
...@@ -285,6 +288,7 @@ export default { ...@@ -285,6 +288,7 @@ export default {
} }
} }
.foot{ .foot{
border-top: 1px solid #ccc;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -330,6 +334,7 @@ export default { ...@@ -330,6 +334,7 @@ export default {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
.del-btn{ .del-btn{
margin-top: 10px;
width: 100px; width: 100px;
height: 40px; height: 40px;
border-radius: 4px; border-radius: 4px;
...@@ -342,6 +347,10 @@ export default { ...@@ -342,6 +347,10 @@ export default {
margin-right: 30px; margin-right: 30px;
} }
.end-exam-btn{ .end-exam-btn{
background: #fff;
height: 62px;
margin-top: -2px;
border-left: 1px solid #ccc;
width: 260px; width: 260px;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -361,6 +370,7 @@ export default { ...@@ -361,6 +370,7 @@ export default {
} }
.sign{ .sign{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div> <div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div>
<div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div> <div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div>
</div> </div>
<div class="end-exam-btn" v-if="!$route.query.id"> <div class="end-exam-btn">
<div class="btn" @click="endExam">交卷</div> <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
// 获取考卷 // 获取考卷
getTopic() { getTopic() {
const param = { const param = {
type: 1, type: 2,
is_create: this.$route.query.id || this.$route.query.is_create === undefined ? 0 : this.$route.query.is_create is_create: this.$route.query.id || this.$route.query.is_create === undefined ? 0 : this.$route.query.is_create
} }
api api
...@@ -389,6 +389,7 @@ export default { ...@@ -389,6 +389,7 @@ export default {
height: 100%; height: 100%;
// background: #f9f9f9; // background: #f9f9f9;
.head{ .head{
border-bottom: 1px solid #ccc;
width: 100%; width: 100%;
height: 80px; height: 80px;
background: #FFFFFF; background: #FFFFFF;
...@@ -432,6 +433,7 @@ export default { ...@@ -432,6 +433,7 @@ export default {
.exam-main{ .exam-main{
display: flex; display: flex;
.left{ .left{
background: #fff;
flex: 1; flex: 1;
padding: 10px 20px 0 53px; padding: 10px 20px 0 53px;
overflow-y: scroll; overflow-y: scroll;
...@@ -441,6 +443,7 @@ export default { ...@@ -441,6 +443,7 @@ export default {
} }
} }
.right{ .right{
border-left: 1px solid #ccc;
position: relative; position: relative;
width: 220px; width: 220px;
background: #fff; background: #fff;
...@@ -453,6 +456,7 @@ export default { ...@@ -453,6 +456,7 @@ export default {
} }
} }
.foot{ .foot{
border-top: 1px solid #ccc;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -487,6 +491,10 @@ export default { ...@@ -487,6 +491,10 @@ export default {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
.end-exam-btn{ .end-exam-btn{
background: #fff;
height: 62px;
margin-top: -2px;
border-left: 1px solid #ccc;
width: 260px; width: 260px;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -506,6 +514,7 @@ export default { ...@@ -506,6 +514,7 @@ export default {
} }
.sign2{ .sign2{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
...@@ -526,6 +535,7 @@ export default { ...@@ -526,6 +535,7 @@ export default {
} }
.sign{ .sign{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
......
<template> <template>
<div class="result-box"> <div class="result-box">
<div class="card-left"> <div class="card-left">
<div class="title">成绩报告</div> <div class="title">
<span>成绩报告</span>
<span class="time" v-if="data.sheet">
{{ data.sheet.created_time }}
</span>
</div>
<div class="chart-box"> <div class="chart-box">
<chart :accuracy="accuracy" :accuracScore="accuracScore" v-if="data.sheet"> <chart :accuracy="accuracy" :accuracScore="accuracScore" v-if="data.sheet">
<template v-slot:tips> <template v-slot:tips>
...@@ -10,17 +15,6 @@ ...@@ -10,17 +15,6 @@
</template> </template>
</chart> </chart>
</div> </div>
<!-- <div class="assess">测试评估</div>
<div class="assess-box">
<div class="prog">
<div class="line-box">
<div class="line" :style="setStyle"></div>
</div>
<div class="icon"></div>
</div>
<div class="text">{{ accuracy !== 100 ? '您离成功还有一段距离,继续努力!' : '成功近在眼前,再接再厉!' }}</div>
<div class="btn">全部考试服务</div>
</div> -->
</div> </div>
<div class="card-right"> <div class="card-right">
<card v-if="data.sheet" :data="data.sheet" @goQuestion="goPage"> <card v-if="data.sheet" :data="data.sheet" @goQuestion="goPage">
...@@ -104,6 +98,13 @@ export default { ...@@ -104,6 +98,13 @@ export default {
color: #222222; color: #222222;
line-height: 45px; line-height: 45px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
display: flex;
}
.time{
font-size: 14px;
color: #222222;
line-height: 45px;
margin-left: auto;
} }
.chart-box{ .chart-box{
position: absolute; position: absolute;
......
...@@ -78,6 +78,7 @@ export default { ...@@ -78,6 +78,7 @@ export default {
this.$confirm('您上次未做完试题', '', { this.$confirm('您上次未做完试题', '', {
confirmButtonText: '重新答题', confirmButtonText: '重新答题',
cancelButtonText: '继续答题', cancelButtonText: '继续答题',
distinguishCancelAndClose: true,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.$router.push({
...@@ -87,13 +88,15 @@ export default { ...@@ -87,13 +88,15 @@ export default {
} }
}) })
}).catch((e) => { }).catch((e) => {
console.log(e) if (e === 'cancel') {
this.$router.push({ console.log(e)
path: '/mock/exam', this.$router.push({
query: { path: '/mock/exam',
is_create: 0 query: {
} is_create: 0
}) }
})
}
}) })
} }
} }
......
...@@ -101,6 +101,7 @@ export default { ...@@ -101,6 +101,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.order-num{ .order-num{
padding-top: 20px;
padding-bottom: 90px; padding-bottom: 90px;
ul{ ul{
display: flex; display: flex;
......
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
.title-type{ .title-type{
width: 100%; width: 100%;
height: 45px; height: 45px;
border-bottom:1px solid #ccc; // border-bottom:1px solid #ccc;
display: flex; display: flex;
align-items: center; align-items: center;
.type{ .type{
......
...@@ -378,6 +378,7 @@ export default { ...@@ -378,6 +378,7 @@ export default {
height: 100%; height: 100%;
// background: #f9f9f9; // background: #f9f9f9;
.head{ .head{
border-bottom: 1px solid #ccc;
width: 100%; width: 100%;
height: 80px; height: 80px;
background: #FFFFFF; background: #FFFFFF;
...@@ -421,6 +422,7 @@ export default { ...@@ -421,6 +422,7 @@ export default {
.exam-main{ .exam-main{
display: flex; display: flex;
.left{ .left{
background: #fff;
flex: 1; flex: 1;
padding: 10px 20px 0 53px; padding: 10px 20px 0 53px;
overflow-y: scroll; overflow-y: scroll;
...@@ -430,6 +432,7 @@ export default { ...@@ -430,6 +432,7 @@ export default {
} }
} }
.right{ .right{
border-left: 1px solid #ccc;
position: relative; position: relative;
width: 220px; width: 220px;
background: #fff; background: #fff;
...@@ -442,6 +445,7 @@ export default { ...@@ -442,6 +445,7 @@ export default {
} }
} }
.foot{ .foot{
border-top: 1px solid #ccc;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -487,6 +491,7 @@ export default { ...@@ -487,6 +491,7 @@ export default {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
.del-btn{ .del-btn{
margin-top: 10px;
width: 100px; width: 100px;
height: 40px; height: 40px;
border-radius: 4px; border-radius: 4px;
...@@ -499,6 +504,10 @@ export default { ...@@ -499,6 +504,10 @@ export default {
margin-right: 30px; margin-right: 30px;
} }
.end-exam-btn{ .end-exam-btn{
background: #fff;
height: 62px;
margin-top: -2px;
border-left: 1px solid #ccc;
width: 260px; width: 260px;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -518,6 +527,7 @@ export default { ...@@ -518,6 +527,7 @@ export default {
} }
.sign{ .sign{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div> <div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div>
<div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div> <div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div>
</div> </div>
<div class="end-exam-btn" v-if="!$route.query.id"> <div class="end-exam-btn">
<div class="btn" @click="endExam">交卷</div> <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -218,7 +218,6 @@ export default { ...@@ -218,7 +218,6 @@ export default {
}) })
}) })
} }
console.log(countData)
this.afterChangeData = countData this.afterChangeData = countData
this.questionParams.card = countData this.questionParams.card = countData
data.sheet.answers !== null && (this.questionParams.answerRecord = data.sheet.answers) data.sheet.answers !== null && (this.questionParams.answerRecord = data.sheet.answers)
...@@ -391,6 +390,7 @@ export default { ...@@ -391,6 +390,7 @@ export default {
height: 100%; height: 100%;
// background: #f9f9f9; // background: #f9f9f9;
.head{ .head{
border-bottom: 1px solid #ccc;
width: 100%; width: 100%;
height: 80px; height: 80px;
background: #FFFFFF; background: #FFFFFF;
...@@ -434,6 +434,7 @@ export default { ...@@ -434,6 +434,7 @@ export default {
.exam-main{ .exam-main{
display: flex; display: flex;
.left{ .left{
background: #fff;
flex: 1; flex: 1;
padding: 10px 20px 0 53px; padding: 10px 20px 0 53px;
overflow-y: scroll; overflow-y: scroll;
...@@ -443,6 +444,7 @@ export default { ...@@ -443,6 +444,7 @@ export default {
} }
} }
.right{ .right{
border-left: 1px solid #ccc;
position: relative; position: relative;
width: 220px; width: 220px;
background: #fff; background: #fff;
...@@ -455,6 +457,7 @@ export default { ...@@ -455,6 +457,7 @@ export default {
} }
} }
.foot{ .foot{
border-top: 1px solid #ccc;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -489,6 +492,10 @@ export default { ...@@ -489,6 +492,10 @@ export default {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
.end-exam-btn{ .end-exam-btn{
background: #fff;
height: 62px;
margin-top: -2px;
border-left: 1px solid #ccc;
width: 260px; width: 260px;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -506,10 +513,9 @@ export default { ...@@ -506,10 +513,9 @@ export default {
text-align: center; text-align: center;
} }
} }
.sign-box{
}
.sign{ .sign{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
...@@ -530,6 +536,7 @@ export default { ...@@ -530,6 +536,7 @@ export default {
} }
.sign2{ .sign2{
margin-right: 20px; margin-right: 20px;
margin-top: 8px;
.icon{ .icon{
margin: 0 auto; margin: 0 auto;
width: 24px; width: 24px;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论