Skip to content

T
thinkApp
Commit 8f6e670f authored by zhengke's avatar zhengke
Browse files
Options

no message

parent 24b90cb5
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 119 deletions
src/components/index/scoreDetails/allGraspTheSituation.vue
View file @ 8f6e670f
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<view v-for="(T,index) in TitleList" :key="index">{{T}}</view> <view v-for="(T,index) in TitleList" :key="index">{{T}}</view>
</view> </view>
<view class="allGraspTheSituation-content flex"> <view class="allGraspTheSituation-content flex">
<view class="allGraspTheSituation-right flex"> <view class="allGraspTheSituation-num flex" v-for="(item,index) in ModuleList" :key="index">
<view class="allGraspTheSituation-num flex" v-for="(item,index) in ModuleList" :key="index"> <text class="name">{{item.Module}}</text>
<text>{{item.Module}}</text> <text class="Score">{{item.Score}}</text>
<text>{{item.Score}}</text> <text class="ScoreRate"
<text class="fullScore">{{item.ScoreRate * 100}}<text>%</text></text> :class="item.ScoreRate<0.5?'failed':
<text class="fullScore">{{item.AvgScoreRate * 100}}<text>%</text></text> (item.ScoreRate==1?'fullScore':'')">{{item.ScoreRate * 100}}<text>%</text></text>
</view> <text class="AvgScoreRate">{{item.AvgScoreRate * 100}}<text>%</text></text>
</view> </view>
</view> </view>
...@@ -49,61 +49,52 @@ ...@@ -49,61 +49,52 @@
}; };
</script> </script>
<style scoped> <style scoped>
.allGraspTheSituation-num text.failed{ .allGraspTheSituation-num .ScoreRate.failed{
color: #EE8790; color: #EE8790;
} }
.allGraspTheSituation-num text.failed text{ .allGraspTheSituation-num .ScoreRate.failed text{
color: #EE8790; color: #EE8790;
} }
.allGraspTheSituation-num text.fullScore{ .allGraspTheSituation-num .ScoreRate.fullScore{
color: #4AC698; color: #4AC698;
} }
.allGraspTheSituation-num text.fullScore text{ .allGraspTheSituation-num .ScoreRate.fullScore text{
color: #4AC698; color: #4AC698;
} }
.allGraspTheSituation-num text text{ .allGraspTheSituation-num text text{
font-size: 28rpx; font-size: 20rpx;
margin-top: 10rpx; margin-top: 10rpx;
margin-left: 5rpx;
} }
.allGraspTheSituation-num text{ .allGraspTheSituation-num text{
flex: 0 0 33.33%; flex: 0 0 25%;
font-size: 36px; font-size: 36rpx;
font-weight: 800; font-weight: 800;
font-style: italic; font-style: italic;
color: #282828;
} }
.allGraspTheSituation-num:first-child{ .allGraspTheSituation-num .name{
margin-top: 0rpx;
}
.allGraspTheSituation-num{
flex: 0 0 33.33%;
font-size: 20rpx; font-size: 20rpx;
color: #282828; font-style: inherit;
font-weight: 400; font-weight: 400;
flex-direction: row; color: #282828;
margin-bottom: 0rpx;
}
.allGraspTheSituation-right{
flex: 0 0 75%;
flex-direction: column;
justify-content: space-between;
}
.allGraspTheSituation-left view:first-child{
margin-top: 50rpx;
} }
.allGraspTheSituation-left view{ .allGraspTheSituation-num:last-child{
margin-bottom: 50rpx; margin-bottom: 44rpx;
} }
.allGraspTheSituation-left{ .allGraspTheSituation-num{
flex: 0 0 25%; flex: 1;
flex-direction: column;
font-size: 20rpx;
color: #282828; color: #282828;
font-weight: 400; font-weight: 400;
flex-direction: row;
align-items: center;
margin-top: 41rpx;
} }
.allGraspTheSituation-content{ .allGraspTheSituation-content{
flex-direction: column;
text-align: center; text-align: center;
align-items: center; font-size: 20px;
font-weight: 400;
color: #282828;
} }
.allGraspTheSituation-title view:first-child{ .allGraspTheSituation-title view:first-child{
font-weight: bold; font-weight: bold;
......
src/components/index/scoreDetails/dfficultyAnalysis.vue
View file @ 8f6e670f
...@@ -4,12 +4,10 @@ ...@@ -4,12 +4,10 @@
<view v-for="(T,index) in TitleList" :key="index">{{T}}</view> <view v-for="(T,index) in TitleList" :key="index">{{T}}</view>
</view> </view>
<view class="dfficultyAnalysis-content flex"> <view class="dfficultyAnalysis-content flex">
<view class="dfficultyAnalysis-right flex"> <view class="dfficultyAnalysis-num flex" v-for="(item,index) in DifficultyList" :key="index">
<view class="dfficultyAnalysis-num flex" v-for="(item,index) in DifficultyList" :key="index"> <text>{{item.Difficulty}}</text>
<text>{{item.Difficulty}}</text> <text>{{item.Count}}</text>
<text>{{item.Count}}</text> <text>{{item.Score}}</text>
<text>{{item.Score}}</text>
</view>
</view> </view>
</view> </view>
...@@ -48,49 +46,30 @@ ...@@ -48,49 +46,30 @@
}; };
</script> </script>
<style scoped> <style scoped>
.dfficultyAnalysis-num text text{ .dfficultyAnalysis-num text:first-child{
font-size: 28rpx;
margin-top: 10rpx;
}
.dfficultyAnalysis-num text{
flex: 0 0 50%;
font-size: 36px;
font-weight: 800;
font-style: italic;
color: #282828;
}
.dfficultyAnalysis-num:first-child{
margin-top: 0rpx;
}
.dfficultyAnalysis-num{
flex: 0 0 50%;
font-size: 20rpx; font-size: 20rpx;
color: #282828;
font-weight: 400; font-weight: 400;
flex-direction: row; font-style: initial;
margin-bottom: 0rpx;
}
.dfficultyAnalysis-right{
flex: 0 0 66.67%;
flex-direction: column;
justify-content: space-between;
} }
.dfficultyAnalysis-left view:first-child{ .dfficultyAnalysis-num text{
margin-top: 50rpx; flex: 0 0 33.33%;
text-align: center;
} }
.dfficultyAnalysis-left view{ .dfficultyAnalysis-num:last-child{
margin-bottom: 50rpx; margin-bottom: 47rpx;
} }
.dfficultyAnalysis-left{ .dfficultyAnalysis-num{
flex: 0 0 33.33%; flex: 1;
flex-direction: column; font-size: 36rpx;
font-size: 20rpx; font-weight: 800;
font-style: italic;
color: #282828; color: #282828;
font-weight: 400; align-items: center;
margin-top: 40rpx;
} }
.dfficultyAnalysis-content{ .dfficultyAnalysis-content{
text-align: center; flex-direction: column;
align-items: center;
} }
.dfficultyAnalysis-title view:first-child{ .dfficultyAnalysis-title view:first-child{
font-weight: bold; font-weight: bold;
......
src/components/index/scoreDetails/graspTheSituation.vue
View file @ 8f6e670f
...@@ -4,14 +4,11 @@ ...@@ -4,14 +4,11 @@
<view v-for="(T,index) in TitleList" :key="index">{{T}}</view> <view v-for="(T,index) in TitleList" :key="index">{{T}}</view>
</view> </view>
<view class="graspTheSituation-content flex"> <view class="graspTheSituation-content flex">
<view class="graspTheSituation-right flex"> <view class="graspTheSituation-num flex" v-for="(item,index) in DifficultyRateList" :key="index">
<view class="graspTheSituation-num flex" v-for="(item,index) in DifficultyRateList" :key="index"> <text>{{item.Difficulty}}</text>
<text>{{item.Difficulty}}</text> <text>{{item.ScoreRate}}<text>%</text></text>
<text>{{item.ScoreRate}}<text>%</text></text> <text>{{item.AvgScoreRate}}<text>%</text></text>
<text>{{item.AvgScoreRate}}<text>%</text></text>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -50,48 +47,31 @@ ...@@ -50,48 +47,31 @@
</script> </script>
<style scoped> <style scoped>
.graspTheSituation-num text text{ .graspTheSituation-num text text{
font-size: 28rpx; margin-left: 10rpx;
margin-top: 10rpx;
} }
.graspTheSituation-num text{ .graspTheSituation-num text:first-child{
flex: 0 0 50%;
font-size: 36px;
font-weight: 800;
font-style: italic;
color: #282828;
}
.graspTheSituation-num:first-child{
margin-top: 0rpx;
}
.graspTheSituation-num{
flex: 0 0 50%;
font-size: 20rpx; font-size: 20rpx;
color: #282828;
font-weight: 400; font-weight: 400;
flex-direction: row; font-style: initial;
margin-bottom: 0rpx;
}
.graspTheSituation-right{
flex: 0 0 66.67%;
flex-direction: column;
justify-content: space-between;
} }
.graspTheSituation-left view:first-child{ .graspTheSituation-num text{
margin-top: 50rpx; flex: 0 0 33.33%;
text-align: center;
} }
.graspTheSituation-left view{ .graspTheSituation-num:last-child{
margin-bottom: 50rpx; margin-bottom: 47rpx;
} }
.graspTheSituation-left{ .graspTheSituation-num{
flex: 0 0 33.33%; flex: 1;
flex-direction: column; font-size: 36rpx;
font-size: 20rpx; font-weight: 800;
font-style: italic;
color: #282828; color: #282828;
font-weight: 400; align-items: center;
margin-top: 40rpx;
} }
.graspTheSituation-content{ .graspTheSituation-content{
text-align: center; flex-direction: column;
align-items: center;
} }
.graspTheSituation-title view:first-child{ .graspTheSituation-title view:first-child{
font-weight: bold; font-weight: bold;
......
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