Skip to content

T
thinkApp
Commit 28290ae8 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp 

# Conflicts:
#	src/pages/index/index.vue
parents 1d4e3b68 00b9ffd2
Hide whitespace changes
Inline Side-by-side
Showing with 605 additions and 22 deletions
src/components/index/JobComponents.vue
View file @ 28290ae8
......@@ -146,12 +146,11 @@
}
.operation-name{
font-size: 26rpx;
height: 75rpx;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
-webkit-line-clamp: 2;
overflow: hidden;
margin-top: 9rpx;
letter-spacing: 1px;
......
src/components/index/examComponents.vue
View file @ 28290ae8
......@@ -13,7 +13,7 @@
</view>
</view>
</view>
<view class="examComponents-center-box">
<view class="examComponents-center-box" @click="scoreDetails">
<view class="examComponents-center-line"></view>
<view class="examComponents-center flex">
<view class="examComponents-left">
......@@ -67,15 +67,19 @@
setup() {
let data = reactive({
obj: {
Name: '',
Photo: '',
},
showPhone: false,
showLogin: true, //多次点击
});
let methods={
scoreDetails(){
uni.reLaunch({
url: '/pages/index/scoreDetails'
});
}
}
return {
...toRefs(data),
...methods
};
},
};
......@@ -216,5 +220,6 @@
}
.examComponents-box{
background: #FFFFFF;
margin-top: 30rpx;
}
</style>
src/components/index/scoreDetails/analysisTest.vue 0 → 100644
View file @ 28290ae8
<template>
<view class="analysisTest-box">
<view class="analysisTest-table-box flex">
<table
class="analysisTest-content flex"
cellspacing="0"
cellpadding="0"
>
<tr class="analysisTest-content-left">
<th
v-for="(item, index) in TitleList"
:key="index"
width="200">{{item}}</th>
</tr>
<tr class="analysisTest-content-right flex">
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 3" />
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
<view class="analysisTest-ScoreTwo">2</view>
<view class="analysisTest-scoringRate">75%</view>
<view class="analysisTest-TheAverageAcore">1.7555555555555555555555</view>
<view class="analysisTest-averageScoringRate">88%</view>
</td>
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 1" />
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
<view class="analysisTest-ScoreTwo">2</view>
<view class="analysisTest-scoringRate">75%</view>
<view class="analysisTest-TheAverageAcore">1.7555555555555555555555</view>
<view class="analysisTest-averageScoringRate">88%</view>
</td>
<td class="analysisTest-td">
<view class="analysisTest-number">1</view>
<view class="analysisTest-difficulty">
<van-icon name="star" v-for="(s,index) in 1" />
</view>
<view class="analysisTest-KnowledgePoint">化学与生活</view>
<view class="analysisTest-ScoreOne">1</view>
<view class="analysisTest-ScoreTwo">2</view>
<view class="analysisTest-scoringRate">75%</view>
<view class="analysisTest-TheAverageAcore">1.7555555555555555555555</view>
<view class="analysisTest-averageScoringRate">88%</view>
</td>
</tr>
</table>
</view>
<view class="analysisTest-hint">
向<br/>右<br/>滑<br/>动<br/>查<br/>看<br/>更<br/>多
</view>
</view>
</template>
<script>
import {
reactive,
toRefs,
onMounted,
getCurrentInstance,
inject
} from "vue";
export default {
props: {
},
components: {},
setup() {
let data = reactive({
obj: {
Name: '',
Photo: '',
},
showPhone: false,
showLogin: true, //多次点击
TitleList:['题号','难度','知识点','分值','得分','得分率','平均分','平均得分率']
});
return {
...toRefs(data),
};
},
};
</script>
<style scoped>
.analysisTest-difficulty van-icon {
color: #F39801;
font-size: 24rpx;
}
.analysisTest-td view:nth-child(2n){
background: #FCEEEF;
}
.analysisTest-td view:last-child{
height: 17.4%;
}
.analysisTest-td view{
background: #F7D8DA;
border-right: 1px solid #F6DDDF;
height: 11.8%;
line-height: 11.8%;
font-size: 20rpx;
color: #E0A9AC;
display: flex;
align-items: center;
justify-content: center;
}
.analysisTest-td view.analysisTest-number{
color: #282828;
}
.analysisTest-td{
width: 100%;
height: 100%;
}
.analysisTest-content-right{
background: red;
overflow-x: auto;
}
.analysisTest-content-left th:nth-child(2n){
background: #363636;
}
.analysisTest-content-left th{
background: #282828;
padding: 18rpx 24rpx;
}
.analysisTest-content-left{
width: 120rpx;
border-radius: 35rpx 0 0 35rpx;
flex-shrink: 0;
color: #FFFFFF;
font-size: 22rpx;
text-align: center;
overflow: hidden;
letter-spacing: 1rpx;
}
.analysisTest-content tr:first-child th{
position: sticky;
left: 0px;
}
.analysisTest-content{
width: 100%;
border-collapse: collapse;
box-sizing: border-box;
}
.analysisTest-table-box{
width: 100%;
}
.analysisTest-hint{
position: absolute;
right: 0;
top: 10%;
width: 77rpx;
height: 363rpx;
background: #FFFFFF;
opacity: 0.33;
text-align: center;
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653551643000_608.png')no-repeat center;
background-size: auto 100%;
padding: 80rpx 0 0 22rpx;
font-size: 26rpx;
}
.analysisTest-box{
position: relative;
}
</style>
src/pages.json
View file @ 28290ae8
......@@ -9,6 +9,16 @@
"style": {
"navigationStyle": "custom"
}
},{
"path": "pages/index/scoreDetails",
"style": {
"navigationStyle": "custom"
}
},{
"path": "pages/index/workSituation",
"style": {
"navigationStyle": "custom"
}
},{
"path": "pages/login/login",
"style": {
......
src/pages/index/index.vue
View file @ 28290ae8
......@@ -21,14 +21,9 @@
</view>
</view>
<course-card></course-card>
<view style="margin: 10rpx;">
<line></line>
</view>
<view style="margin: 10rpx;">
<penta></penta>
</view>
<view style="margin: 10rpx;">
<triangle></triangle>
<view class="index-student-title flex">
<text>考情详情</text>
<view>(共53条)</view>
</view>
<view class="index-student-information">
<JobComponents></JobComponents>
......@@ -68,9 +63,6 @@
import indexassembly from './components/indexassembly.vue'
import navbar from '../../components/navbar.vue'
import bottom from '../../components/bottom.vue'
import penta from '../../components/charts/penta.vue'
import triangle from '../../components/charts/triangle.vue'
import line from '../../components/charts/line.vue'
export default {
// data(){
// return{
......@@ -84,10 +76,7 @@
courseCard,
JobComponents,
examComponents,
commentsComponents,
penta,
triangle,
line
commentsComponents
},
setup(props) {
let {
......@@ -321,6 +310,20 @@
</script>
<style scoped>
.index-student-title view{
font-size: 25rpx;
color: #ABABAB;
margin-left: 20rpx;
padding: 13rpx 0 0 0;
}
.index-student-title text{
font-size: 36rpx;
font-weight: 800;
color: #282828;
}
.index-student-title{
padding: 0 50rpx 45rpx;
}
.index-student-information{
background: rgba(255,255,255,.7);
border-radius: 50rpx 50rpx 0 0;
......
src/pages/index/scoreDetails.vue 0 → 100644
View file @ 28290ae8
<template>
<view class="scoreDetailspage">
<navbar class="navbarSticky" bg="#F6F6F6">
<view class="scoreDetails-header-box">
<van-icon class="scoreDetails-header-left" name="arrow-left" @click="back"/>
</view>
</navbar>
<view class="scoreDetails-header flex">
<view class="scoreDetails-header-img">
<van-image width="100%" height="100%" fit="cover" class="img"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653464014000_713.png" />
</view>
<view class="scoreDetails-header-tetx">
<view class="scoreDetails-header-name">
周一围
</view>
<view class="scoreDetails-header-title">化学成绩详情</view>
</view>
<view class="scoreDetails-header-num flex">
<view>总分</view>
<text>92</text>
</view>
</view>
<view class="scoreDetails-Fraction flex">
<view class="scoreDetails-Fraction-content flex">
<view class="scoreDetails-Fraction-img activeOne"></view>
<view class="scoreDetails-Fraction-num">
<view>
<text>45</text>
名
</view>
<view>排名</view>
</view>
</view>
<view class="scoreDetails-Fraction-content flex">
<view class="scoreDetails-Fraction-img activeTwo"></view>
<view class="scoreDetails-Fraction-num">
<view>
<text>45</text>
%
</view>
<view>得分率</view>
</view>
</view>
<view class="scoreDetails-Fraction-content flex">
<view class="scoreDetails-Fraction-img activeThree"></view>
<view class="scoreDetails-Fraction-num">
<view>
<text>45</text>
</view>
<view>领先度</view>
</view>
</view>
</view>
<view class="scoreDetails-title flex">
<text>各小题得分分析考</text>
<view>(共53条)</view>
</view>
<analysisTest></analysisTest>
<view class="scoreDetails-title flex">
<text>各板块掌握情况</text>
</view>
</view>
</template>
<script>
import analysisTest from '@/components/index/scoreDetails/analysisTest'
import vue, {
ref,
reactive,
toRefs,
toRef,
getCurrentInstance,
watch,
computed,
onMounted,
provide,
nextTick,
} from "vue";
import {
getSweepCode
} from '../../api/index.js'
import {
getImageColor
} from '../../utils/index.js'
import indexassembly from './components/indexassembly.vue'
import navbar from '../../components/navbar.vue'
import bottom from '../../components/bottom.vue'
export default {
components: {
navbar,
analysisTest
},
setup(props) {
let {
proxy
} = getCurrentInstance();
let data = reactive({
ActiveMsg: {
pageIndex: 1,
pageSize: 10,
ActivityType: 0,
SelectIsEnd: 0,
},
ActivityList: [],
pageData: {
LearningGardenList: []
},
SurveyObj:{
ActivitySurveyId:0,
ActivitySurveyGuestId:0,
},
userData: {}
});
let methods = {
back() {
uni.navigateTo({
url: '/pages/index/index'
});
},
};
onMounted(() => {
});
return {
...toRefs(data),
...methods,
};
},
onShow() {
this.userData = uni.getStorageSync('userInfo');
},
onShareAppMessage() {
return {
title: "甲小鹤",
query: "/pages/index/index",
imageUrl: "",
};
},
onShareTimeline() {
return {
title: "甲小鹤",
query: "/pages/index/index",
imageUrl: "",
};
},
};
</script>
<style scoped>
.scoreDetails-title view{
font-size: 25rpx;
color: #ABABAB;
margin-left: 20rpx;
padding: 13rpx 0 0 0;
}
.scoreDetails-title text{
font-size: 36rpx;
font-weight: 800;
color: #282828;
}
.scoreDetails-title{
margin: 70rpx 50rpx 45rpx 50rpx;
}
.scoreDetails-Fraction-num view:last-child{
font-size: 20rpx;
color: #EDCFD1;
margin-top: 5rpx;
letter-spacing: 1rpx;
}
.scoreDetails-Fraction-num view text{
font-size: 40rpx;
font-weight: 800;
font-family: Source Han Sans CN;
font-style: italic;
color: #282828;
margin-right: 10rpx;
}
.scoreDetails-Fraction-num view:first-child{
color: #747474;
font-size: 20rpx;
}
.scoreDetails-Fraction-img.activeThree{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653531754000_932.png')no-repeat center #FFF0F1;
background-size: 36rpx 36rpx;
}
.scoreDetails-Fraction-img.activeTwo{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653531758000_626.png')no-repeat center #FFF0F1;
background-size: 36rpx 36rpx;
}
.scoreDetails-Fraction-img.activeOne{
background: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653531750000_401.png')no-repeat center #FFF0F1;
background-size: 36rpx 36rpx;
}
.scoreDetails-Fraction-img{
width: 62rpx;
height: 62rpx;
border-radius: 50%;
overflow: hidden;
margin-right: 19rpx;
flex-shrink: 0;
}
.scoreDetails-Fraction-content{
align-items: center;
}
.scoreDetails-Fraction{
border-radius: 50rpx;
background: #FFFFFF;
padding: 52rpx 48rpx 38rpx 60rpx;
justify-content: space-between;
margin: 56rpx 50rpx 0 50rpx;
}
.scoreDetails-header-num text{
font-size: 60rpx;
font-weight: 800;
}
.scoreDetails-header-num view{
font-size: 26rpx;
font-weight: 400;
margin-top: 10rpx;
}
.scoreDetails-header-num{
width: 122rpx;
height: 122rpx;
background: #DA2F3E;
border-radius: 30rpx;
flex-direction: column;
color: #FFFFFF;
flex-shrink: 0;
text-align: center;
}
.scoreDetails-header-title{
font-size: 50rpx;
font-weight: 800;
color: #282828;
}
.scoreDetails-header-name{
font-size: 30rpx;
font-weight: 400;
color: #505050;
letter-spacing: 1rpx;
margin-bottom: 18rpx;
}
.scoreDetails-header-tetx{
flex-grow: 1;
}
.scoreDetails-header-img .img{
display: block;
border: 2rpx solid rgba(164, 164, 164, 0.32);
border-radius: 50%;
width: 115rpx;
height: 115rpx;
box-sizing: border-box;
margin: 4rpx;
}
.scoreDetails-header-img{
width: 122rpx;
height: 122rpx;
border-radius: 50%;
overflow: hidden;
flex-shrink: 0;
background: #FFFFFF;
margin-right: 30rpx;
}
.scoreDetails-header{
margin: 50rpx 50rpx 0 50rpx;
align-items: center;
}
.scoreDetails-header-left{
font-size: 40rpx;
}
.scoreDetails-header-box{
padding: 37rpx 31rpx;
}
.scoreDetailspage{
min-height: 100vh;
background-color: #f6f6f6;
box-sizing: border-box;
background-image: url('https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1653530983000_409.png');
background-position: 0 300rpx;
background-repeat: no-repeat;
background-size: 100% auto;
}
.navbarSticky {
display: sticky;
top: 0;
z-index: 9;
}
</style>
src/pages/index/workSituation.vue 0 → 100644
View file @ 28290ae8
<template>
<view class="workSituationpage">
</view>
</template>
<script>
// import analysisTest from '@/components/index/scoreDetails/analysisTest'
import vue, {
ref,
reactive,
toRefs,
toRef,
getCurrentInstance,
watch,
computed,
onMounted,
provide,
nextTick,
} from "vue";
import {
getSweepCode
} from '../../api/index.js'
import {
getImageColor
} from '../../utils/index.js'
import indexassembly from './components/indexassembly.vue'
import navbar from '../../components/navbar.vue'
import bottom from '../../components/bottom.vue'
export default {
components: {
navbar,
// analysisTest
},
setup(props) {
let {
proxy
} = getCurrentInstance();
let data = reactive({
ActiveMsg: {
pageIndex: 1,
pageSize: 10,
ActivityType: 0,
SelectIsEnd: 0,
},
ActivityList: [],
pageData: {
LearningGardenList: []
},
SurveyObj:{
ActivitySurveyId:0,
ActivitySurveyGuestId:0,
},
userData: {}
});
let methods = {
back() {
uni.navigateTo({
url: '/pages/index/index'
});
},
};
onMounted(() => {
});
return {
...toRefs(data),
...methods,
};
},
onShow() {
this.userData = uni.getStorageSync('userInfo');
},
onShareAppMessage() {
return {
title: "甲小鹤",
query: "/pages/index/index",
imageUrl: "",
};
},
onShareTimeline() {
return {
title: "甲小鹤",
query: "/pages/index/index",
imageUrl: "",
};
},
};
</script>
<style scoped>
.navbarSticky {
display: sticky;
top: 0;
z-index: 9;
}
</style>
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