From c49eca8dc684b61c1a99d876818fad37e6242185 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 10 Dec 2020 21:45:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E8=80=83=E8=AF=95=E6=AF=94?=
 =?UTF-8?q?=E7=8E=87=E5=A2=9E=E5=8A=A0=E5=B7=A6=E4=BE=A7=E9=9B=86=E5=9B=A2?=
 =?UTF-8?q?=E6=80=BB=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 groups/templates/groups/base.html |  2 +-
 groups/templates/groups/exam.html | 19 ++++++++-----------
 groups/views.py                   | 21 +++++++++++++++++++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/groups/templates/groups/base.html b/groups/templates/groups/base.html
index c7d80651..35dcea2d 100644
--- a/groups/templates/groups/base.html
+++ b/groups/templates/groups/base.html
@@ -73,7 +73,7 @@ desired effect
         <!-- mini logo for sidebar mini 50x50 pixels -->
         <!-- <span class="logo-mini"><b>A</b>LT</span> -->
         <!-- logo for regular state and mobile devices -->
-        <span class="logo-lg"><b>集团后台</b></span>
+        <span class="logo-lg"><b>{{ request.session.user_groupname }}</b></span>
       </a>
 
       <!-- Header Navbar -->
diff --git a/groups/templates/groups/exam.html b/groups/templates/groups/exam.html
index b2047f2d..f85db51e 100644
--- a/groups/templates/groups/exam.html
+++ b/groups/templates/groups/exam.html
@@ -1,6 +1,13 @@
 {% extends "groups/base.html" %}
 {% load static %}
-
+{% block headother%}
+<link rel="stylesheet" href="{% static 'groups/bower_components/layer/theme/default/layer.css' %}">
+<link rel="stylesheet" href="{% static 'groups/bower_components/bootstrap-table/bootstrap-table.min.css' %}">
+<script src="{% static 'groups/time/laydate/laydate.js' %}"></script>
+<link rel="stylesheet" href="{% static 'groups/time/laydate/theme/default/laydate.css' %}">
+<script src="{% static 'groups/plugins/iCheck/icheck.min.js' %}"></script>
+<script src="{% static 'groups/bower_components/echarts.min.js' %}"></script>
+{% endblock %}
 {% block title %}在线考试统计{% endblock %}
 {% block pagehead %}
 
@@ -25,16 +32,6 @@
 <div style="background-color:#dac2a3;margin-top:10px">
     <div id="examChart2" style="width:100%;height:500px;margin:auto"></div>
 </div>
-<!-- jQuery 3 -->
-<script src="{% static 'groups/bower_components/jquery/dist/jquery.min.js' %}"></script>
-<!-- Bootstrap 3.3.7 -->
-<script src="{% static 'groups/bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
-
-<script src="{% static 'groups/time/laydate/laydate.js' %}"></script>
-<link rel="stylesheet" href="{% static 'groups/time/laydate/theme/default/laydate.css' %}">
-<!-- iCheck -->
-<script src="{% static 'groups/plugins/iCheck/icheck.min.js' %}"></script>
-<script src="{% static 'groups/bower_components/echarts.min.js' %}"></script>
 <script type="text/javascript">
     //隐患数量趋势图
 
diff --git a/groups/views.py b/groups/views.py
index 334b3c71..85d1f8d8 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -74,6 +74,7 @@ def login(request):
                 request.session['is_login'] = True
                 request.session['user_id'] = user.id
                 request.session['user_name'] = user.username
+                request.session['user_groupname'] = user.group.groupname
                 if user.issuper==1:
                     request.session['issuper'] = True #是否是超级管理员
                 return redirect('/groups/index/')
@@ -473,8 +474,13 @@ 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()
+    groupuser = GroupUser.objects.get(id = request.session['user_id'])
+    companys = groupuser.group.members.all()
     ret = {'x':{'name':'所属公司', 'data':[]}, 's':[{'name':'参考率', 'data':[]},{'name':'优秀率', 'data':[]}, {'name':'满分率', 'data':[]}], 't':'各公司考试比例统计'}
+    user_count_t = 0
+    testuser_count_t = 0
+    full_count_t = 0
+    ninety_count_t = 0
     for i in companys:
         # 员工数
         user_count = s_models.User.objects.filter(usecomp=i, deletemark=1).count()
@@ -489,7 +495,7 @@ def exam_rate(request):
         # 参考率
         rate1 = testuser_count/user_count
         # 考试总数
-        test_count = base.count()
+        # test_count = base.count()
         # 满分人数
         full_count = base.filter(score__gte= F('examtest__totalscore')).values('user').distinct().count()
         # 满分率
@@ -506,6 +512,17 @@ def exam_rate(request):
         ret['s'][0]['data'].append(rate1)
         ret['s'][1]['data'].append(rate3)
         ret['s'][2]['data'].append(rate2)
+        user_count_t = user_count_t + user_count
+        testuser_count_t = testuser_count_t + testuser_count
+        full_count_t = full_count_t + full_count
+        ninety_count_t = ninety_count_t + ninety_count
+    rate1_t = testuser_count_t/user_count_t
+    rate2_t = full_count_t/user_count_t if user_count_t else 0
+    rate3_t = ninety_count_t/user_count_t if user_count_t else 0
+    ret['x']['data'].insert(0, groupuser.group.groupname)
+    ret['s'][0]['data'].insert(0, int(rate1_t*100+0.5))
+    ret['s'][1]['data'].insert(0, int(rate3_t*100+0.5))
+    ret['s'][2]['data'].insert(0, int(rate2_t*100+0.5))
     return HttpResponse(json.dumps({'code':200,'data':ret}), content_type='application/json')