From afeda18ce0313b88994834c983d19ff8067c215c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Feb 2021 08:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8C=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20part2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/views/analyse/chart.vue | 29 +++++++++++++++++--------
 test_server/analyse/views.py            |  8 ++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/test_client/src/views/analyse/chart.vue b/test_client/src/views/analyse/chart.vue
index 545a6b9..400b656 100644
--- a/test_client/src/views/analyse/chart.vue
+++ b/test_client/src/views/analyse/chart.vue
@@ -2,12 +2,12 @@
   <div class="app-container">
     <div style="margin-bottom: 2px">
       <el-date-picker
+        ref="picker"
         v-model="daterange"
         type="daterange"
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
         :picker-options="pickerOptions"
       >
       </el-date-picker>
@@ -56,7 +56,20 @@ export default {
       monidata: {},
       daterange: [],
       query: { datestart: null, dateend: null },
-      pickerOptions: null,
+      pickerOptions: {
+        shortcuts: [{
+            text: '2020年',
+            onClick(picker) {
+              picker.$emit('pick', ['2020-01-01','2021-01-01']);
+            }
+          },
+          {
+            text: '2021年',
+            onClick(picker) {
+              picker.$emit('pick', ['2021-01-01','2022-01-01']);
+            }
+          }]
+      },
     };
   },
   created() {
@@ -65,13 +78,11 @@ export default {
   methods: {
     initquery() {
       let date = new Date();
-      this.query.datestart = date.getFullYear() + "-01-01";
-      this.query.dateend = date.getFullYear() + 1 + "-01-01";
-      this.daterange = [this.query.datestart, this.query.dateend];
-      this.getadmindata1(this.query);
-      this.getcompanydis(this.query);
-      this.getconsumerdis(this.query);
-      this.getmonitest(this.query);
+      let start = date.getFullYear() + "-01-01";
+      let end = date.getFullYear() + 1 + "-01-01";
+      this.daterange = [start,end];
+      // this.$refs["picker"].$emit('pick', [start, end]);
+      this.handleFilter()
     },
     handleFilter() {
       this.query.datestart = this.daterange[0];
diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index 32e5aac..dff690e 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -32,11 +32,13 @@ class Admindata1(APIView):
     各管理员录入学员数-柱状图
     """
     def get(self, request, format=None):
-        queryset = UserProfile.objects.filter(is_delete=False)
+        queryset = Consumer.objects.exclude(create_admin__isnull=True)
+        queryset = queryset.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else queryset
+        queryset = queryset.filter(create_time__lte = request.query_params.get('dateend')) if request.query_params.get('dateend', None) else queryset
         ret = {'x':{'name':'管理员', 'data':[]}, 's':[{'name':'学员数', 'data':[]}], 't':'各管理员录入学员数'}
-        tmp = queryset.annotate(total=Count('consumer_create_admin')).order_by('-total').values('username', 'total')
+        tmp = queryset.values('create_admin__username').annotate(total=Count('create_admin__username')).order_by('-total')
         for i in tmp:
-            ret['x']['data'].append(i['username'])
+            ret['x']['data'].append(i['create_admin__username'])
             ret['s'][0]['data'].append(i['total'])
         return Response(ret)