From e51fedc48e3edc3c18fa951b6d44756af6843ea4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Feb 2021 11:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/api/analyse.js                |  3 +-
 test_client/src/views/analyse/chart.vue       |  5 ++
 .../src/views/components/PanelGroup.vue       |  3 +-
 test_client/src/views/dashboard/index.vue     | 58 +++++++++++++++++--
 test_server/analyse/views.py                  | 19 ++++--
 5 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/test_client/src/api/analyse.js b/test_client/src/api/analyse.js
index 90634e3..f61cd72 100644
--- a/test_client/src/api/analyse.js
+++ b/test_client/src/api/analyse.js
@@ -1,9 +1,10 @@
 import request from '@/utils/request'
 
-export function getBasicCount() {
+export function getBasicCount(query) {
   return request({
     url: '/analyse/basic/',
     method: 'get',
+    params:query
   })
 }
 
diff --git a/test_client/src/views/analyse/chart.vue b/test_client/src/views/analyse/chart.vue
index 681a28a..3f54120 100644
--- a/test_client/src/views/analyse/chart.vue
+++ b/test_client/src/views/analyse/chart.vue
@@ -8,6 +8,7 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         :picker-options="pickerOptions"
+        @change="change"
       >
       </el-date-picker>
       <el-button type="primary" icon="el-icon-query" @click="handleFilter"
@@ -111,6 +112,10 @@ export default {
         this.monidata = res.data;
       });
     },
+    change(v){
+      console.log(v)
+      if (v == null) this.daterange=["",""]
+    }
   },
 };
 </script>
\ No newline at end of file
diff --git a/test_client/src/views/components/PanelGroup.vue b/test_client/src/views/components/PanelGroup.vue
index cf088ef..de583b6 100644
--- a/test_client/src/views/components/PanelGroup.vue
+++ b/test_client/src/views/components/PanelGroup.vue
@@ -62,6 +62,7 @@ export default {
   components: {
     CountTo
   },
+  props:['query'],
   data() {
     return {
       ret:{
@@ -81,7 +82,7 @@ export default {
     },
     getBasicCount() {
       this.listLoading = true;
-      getBasicCount().then(response => {
+      getBasicCount(this.query).then(response => {
         this.ret = response.data;
       });
     },
diff --git a/test_client/src/views/dashboard/index.vue b/test_client/src/views/dashboard/index.vue
index 4f9e6d3..756d0ef 100644
--- a/test_client/src/views/dashboard/index.vue
+++ b/test_client/src/views/dashboard/index.vue
@@ -1,6 +1,21 @@
 <template>
   <div class="dashboard-editor-container">
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+    <div style="margin-bottom: 2px">
+      <el-date-picker
+        v-model="daterange"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :picker-options="pickerOptions"
+        @change="change"
+      >
+      </el-date-picker>
+      <el-button type="primary" icon="el-icon-query" @click="handleFilter"
+        >确定</el-button
+      >
+    </div>
+    <panel-group @handleSetLineChartData="handleSetLineChartData" ref="panelg" :query="query"/>
 
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
       <bar-chart :chartData="admindata1" />
@@ -42,21 +57,56 @@ export default {
   data() {
     return {
       lineChartData: lineChartData.访问用户,
-      admindata1:{}
+      admindata1:{},
+      daterange:[],
+      query: { datestart: null, dateend: 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() {
-    this.getadmindata1()
+    this.initquery()
   },
   methods: {
     handleSetLineChartData(type) {
       this.lineChartData = lineChartData[type]
     },
+    initquery() {
+      let date = new Date();
+      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.query.datestart = this.daterange[0];
+      this.query.dateend = this.daterange[1];
+      this.getadmindata1();
+    },
     getadmindata1(){
-            getAdmindata1().then(res=>{
+            getAdmindata1(this.query).then(res=>{
                 this.admindata1 = res.data
             })
         },
+    handleFilter(){
+      this.query.datestart = this.daterange[0];
+      this.query.dateend = this.daterange[1];
+      this.getadmindata1();
+      this.$refs['panelg'].getBasicCount();
+    },
+    change(v){
+      if (v == null) this.daterange=["",""]
+    }
   }
 }
 </script>
diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py
index dff690e..325c37d 100644
--- a/test_server/analyse/views.py
+++ b/test_server/analyse/views.py
@@ -21,10 +21,21 @@ class BasicCount(APIView):
     '''
     def get(self, request, format=None):
         ret={}
-        ret['consumer1_count'] = Consumer.objects.filter(is_delete=False).count()
-        ret['consumer2_count'] = Consumer.objects.filter(is_delete=False).exclude(create_admin=None).count()
-        ret['test_count'] = ExamTest.objects.filter(is_delete=False).count()
-        ret['question_count'] = Question.objects.filter(is_delete=False).count()
+        q1 = Consumer.objects.filter(is_delete=False)
+        q1 = q1.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q1
+        ret['consumer1_count'] = q1.count()
+
+        q2 = Consumer.objects.filter(is_delete=False).exclude(create_admin=None)
+        q2 = q2.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q2 
+        ret['consumer2_count'] = q2.count()
+
+        q3 = ExamTest.objects.filter(is_delete=False)
+        q3 = q3.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q3 
+        ret['test_count'] = q3.count()
+
+        q4 = ExamTest.objects.filter(is_delete=False)
+        q4 = q4.filter(create_time__gte = request.query_params.get('datestart')) if request.query_params.get('datestart', None) else q4
+        ret['question_count'] = q4.count()
         return Response(ret)
 
 class Admindata1(APIView):