zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考试参考率bar颜色修改及相应一些修复

This commit is contained in:
caoqianming 2020-11-13 21:04:17 +08:00
parent 8107a0ff14
commit 180ebddf63
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
groups/templates/groups/exam.html
View File

@ -176,13 +176,14 @@
for(var i=0;i<data.data.s.length;i++){
var item = data.data.s[i]
item.type = 'bar'
item.barGap = 0
// item.label = labelOption
series.push(item)
}
examChart.hideLoading();
examChart.setOption(
option = {
color: ['#003366', '#006699', '#4cabce'],
color: ['#C2D69A', '#9CF2A2', '#56E860'],
tooltip: {
trigger: 'axis',
axisPointer: { // 坐标轴指示器，坐标轴触发有效

15
groups/views.py
View File

@ -474,7 +474,7 @@ def exam_rate(request):
start = request.GET.get('start', None)
end = request.GET.get('end', None)
companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all()
ret = {'x':{'name':'所属公司', 'data':[]}, 's':[{'name':'参考率', 'data':[]},{'name':'满分率', 'data':[]}, {'name':'优秀率', 'data':[]}], 't':'各公司考试比例统计', 'l':['参考率', '满分率', '优秀率']}
ret = {'x':{'name':'所属公司', 'data':[]}, 's':[{'name':'参考率', 'data':[]},{'name':'优秀率', 'data':[]}, {'name':'满分率', 'data':[]}], 't':'各公司考试比例统计', 'l':['参考率', '满分率', '优秀率']}
for i in companys:
# 员工数
user_count = s_models.User.objects.filter(usecomp=i, deletemark=1).count()
@ -490,7 +490,7 @@ def exam_rate(request):
# 考试总数
test_count = base.count()
# 满分数
full_count = base.filter(score = F('examtest__totalscore')).count()
full_count = base.filter(score__gte= F('examtest__totalscore')).count()
# 满分率
rate2 = full_count/test_count if test_count else 0
# 90分数
@ -498,13 +498,14 @@ def exam_rate(request):
# 90以上得分率
rate3 = ninety_count/test_count if test_count else 0
rate1 = '%.2f' % (rate1*100)
rate2 = '%.2f' % (rate2*100)
rate3 = '%.2f' % (rate3*100)
# rate1 = '%.2f' % (rate1*100)
rate1 = int(rate1*100+0.5)
rate2 = int(rate2*100+0.5)
rate3 = int(rate3*100+0.5)
ret['x']['data'].append(i.partname)
ret['s'][0]['data'].append(rate1)
ret['s'][1]['data'].append(rate2)
ret['s'][2]['data'].append(rate3)
ret['s'][1]['data'].append(rate3)
ret['s'][2]['data'].append(rate2)
return HttpResponse(json.dumps({'code':200,'data':ret}), content_type='application/json')