From 323d2eb22219bf0f32467fd5235eb9dd16ab5959 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 23 Nov 2020 10:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=BE=97=E5=88=86=E7=8E=87?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=86=E6=9E=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 groups/templates/groups/exam.html | 48 ++++++++++++++++++++-----------
 groups/views.py                   |  2 +-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/groups/templates/groups/exam.html b/groups/templates/groups/exam.html
index d7328424..b2047f2d 100644
--- a/groups/templates/groups/exam.html
+++ b/groups/templates/groups/exam.html
@@ -77,7 +77,21 @@
             success: function (data) {
                 console.log(data.data.number);
                 //请求成功时执行该函数内容，data即为服务器返回的json对象
-
+                var labelOption = {
+    show: true,
+    formatter: '{c}',
+    fontSize: 14,
+    align: 'middle',
+    verticalAlign: 'middle',
+    position: 'top',
+    color:'#A52A2A'
+    // distance: 15,
+    // rich: {
+    //     name: {
+    //         textBorderColor: '#fff'
+    //     }
+    // }
+};
 
                 var exnum = [];
                 var companyName = [];
@@ -126,7 +140,8 @@
                             series: [{
                                 name: '公司在线考试总数',
                                 data: exnum,
-                                type: 'bar'
+                                type: 'bar',
+                                label:labelOption
                             }]
 
                         }
@@ -158,27 +173,28 @@
             success: function (data) {
                 var labelOption = {
     show: true,
-    formatter: '{c}  {name|{a}}',
-    fontSize: 16,
-    rotate: 90,
-    align: 'left',
+    formatter: '{c}%',
+    fontSize: 14,
+    align: 'middle',
     verticalAlign: 'middle',
-    position: 'insideBottom',
-    distance: 15,
-    rich: {
-        name: {
-            textBorderColor: '#fff'
-        }
-    }
+    position: 'top',
+    color:'#A52A2A'
+    // distance: 15,
+    // rich: {
+    //     name: {
+    //         textBorderColor: '#fff'
+    //     }
+    // }
 };
                 if (data.data != null) {
-                    var series = []
+                    var series = [], legend = []
                     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
+                        item.label = labelOption
                         series.push(item)
+                        legend.push(item.name)
                     }
                     examChart.hideLoading();
                     examChart.setOption(
@@ -196,7 +212,7 @@
                             },
                             tooltip: {},
                             legend: {
-                                data: data.data.l
+                                data: legend
                             },
                             xAxis: {
                                 type: 'category',
diff --git a/groups/views.py b/groups/views.py
index 73c6af56..f9faf49e 100644
--- a/groups/views.py
+++ b/groups/views.py
@@ -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':'各公司考试比例统计'}
     for i in companys:
         # 员工数
         user_count = s_models.User.objects.filter(usecomp=i, deletemark=1).count()