|
@@ -8,10 +8,10 @@
|
|
<div class="percent-item" v-for="(item,index) in passRate" :key="index">
|
|
<div class="percent-item" v-for="(item,index) in passRate" :key="index">
|
|
<div class="fl-col-center">
|
|
<div class="fl-col-center">
|
|
<span class="percent-name">{{item.name}}</span>
|
|
<span class="percent-name">{{item.name}}</span>
|
|
- <span class="percent-value"><span class="percent-line" :style="{background:colorList[index]}"></span>{{item.value}}</span>
|
|
|
|
|
|
+ <span class="percent-value"><span class="percent-line" :style="{background:colorList[index]}"></span>{{item.sRate}} <span style="font-size: 22px;">%</span></span>
|
|
<div style="margin-left: 30px;">
|
|
<div style="margin-left: 30px;">
|
|
- <p>平均分:110</p>
|
|
|
|
- <p>标准差:20</p>
|
|
|
|
|
|
+ <p>{{ $t('totalAnalysis.echarts_text15') }}:{{item.average.toFixed(1)}} </p>
|
|
|
|
+ <p>{{ $t('totalAnalysis.ach_table_text4') }}:{{item.standard.toFixed(1)}}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -26,8 +26,23 @@
|
|
<span class="component-title">{{$t('totalAnalysis.ach_title3')}}</span>
|
|
<span class="component-title">{{$t('totalAnalysis.ach_title3')}}</span>
|
|
<BaseEntryBar :echartData="classDatas" echartsId="entryNumberBar"></BaseEntryBar>
|
|
<BaseEntryBar :echartData="classDatas" echartsId="entryNumberBar"></BaseEntryBar>
|
|
</Col>
|
|
</Col>
|
|
|
|
+ <!-- <Col span="8">
|
|
|
|
+ <span class="component-title">{{$t('totalAnalysis.ach_title3')}}</span>
|
|
|
|
+ <BaseScoreRateBar></BaseScoreRateBar>
|
|
|
|
+ </Col> -->
|
|
</Row>
|
|
</Row>
|
|
|
|
|
|
|
|
+ <Row></Row>
|
|
|
|
+ <Row>
|
|
|
|
+ <Col span="12">
|
|
|
|
+ <span class="component-title">{{$t('totalAnalysis.scoreRate')}}</span>
|
|
|
|
+ <BaseScoreRateBar echartsId="sRateBar1" :echartsData="getAnalysisJson.students"></BaseScoreRateBar>
|
|
|
|
+ </Col>
|
|
|
|
+ <Col span="12">
|
|
|
|
+
|
|
|
|
+ </Col>
|
|
|
|
+ </Row>
|
|
|
|
+
|
|
<!-- 进线人数统计 -->
|
|
<!-- 进线人数统计 -->
|
|
<!-- <Row>
|
|
<!-- <Row>
|
|
<span class="component-title">{{$t('totalAnalysis.ach_title3')}}</span>
|
|
<span class="component-title">{{$t('totalAnalysis.ach_title3')}}</span>
|
|
@@ -58,9 +73,10 @@
|
|
import BaseEntryBar from '@/components/student-analysis/total/BaseEntryBar.vue'
|
|
import BaseEntryBar from '@/components/student-analysis/total/BaseEntryBar.vue'
|
|
import BaseTable from '@/components/student-analysis/total/BaseMyTable.vue'
|
|
import BaseTable from '@/components/student-analysis/total/BaseMyTable.vue'
|
|
import EntryTables from '@/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue'
|
|
import EntryTables from '@/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue'
|
|
|
|
+ import BaseScoreRateBar from '@/components/student-analysis/total/BaseScoreRateBar.vue'
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
- BaseBar, BaseEntryBar, BaseTable, EntryTables
|
|
|
|
|
|
+ BaseBar, BaseEntryBar, BaseTable, EntryTables,BaseScoreRateBar
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -141,7 +157,9 @@
|
|
console.log(analysisJson)
|
|
console.log(analysisJson)
|
|
let result = [{
|
|
let result = [{
|
|
name: this.$t('totalAnalysis.allSubjects'),
|
|
name: this.$t('totalAnalysis.allSubjects'),
|
|
- value: '88.8%'
|
|
|
|
|
|
+ average:analysisJson.all.average,
|
|
|
|
+ sRate:analysisJson.all.sRate,
|
|
|
|
+ standard:analysisJson.all.standard
|
|
}]
|
|
}]
|
|
analysisJson.subjects.forEach((item,index) => {
|
|
analysisJson.subjects.forEach((item,index) => {
|
|
let o = {}
|
|
let o = {}
|
|
@@ -152,7 +170,9 @@
|
|
})
|
|
})
|
|
result.push({
|
|
result.push({
|
|
name:item.name,
|
|
name:item.name,
|
|
- value:(+(classAverage / analysisJson.classes.length) * 100).toFixed(1) + '%',
|
|
|
|
|
|
+ average:item.average,
|
|
|
|
+ sRate:item.sRate,
|
|
|
|
+ standard:item.standard
|
|
})
|
|
})
|
|
})
|
|
})
|
|
return result
|
|
return result
|