From c1f545bc68ce6cf67310e01a0d0258b79f80cb3d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 27 Apr 2020 11:35:36 +0800
Subject: [PATCH] sort

---
 test_client/src/views/analyse/examtest.vue | 15 +++++++++++++--
 test_client/src/views/crm/consumer.vue     | 12 ++++++------
 test_client/src/views/login/index.vue      |  2 +-
 test_server/crm/views.py                   |  4 ++--
 test_server/examtest/views.py              |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/test_client/src/views/analyse/examtest.vue b/test_client/src/views/analyse/examtest.vue
index 2cf4e3d..70c8dc8 100644
--- a/test_client/src/views/analyse/examtest.vue
+++ b/test_client/src/views/analyse/examtest.vue
@@ -60,6 +60,7 @@
       v-loading="listLoading"
       highlight-current-row
       max-height="600"
+      @sort-change="changeSort"
     >
       <el-table-column type="index" width="50"></el-table-column>
       <el-table-column align="left" label="类型">
@@ -74,10 +75,10 @@
       <el-table-column align="left" label="押题卷">
         <template slot-scope="scope">{{ scope.row.paper_name }}</template>
       </el-table-column>
-      <el-table-column align="left" label="得分">
+      <el-table-column align="left" label="得分" sortable='custom' prop="score">
         <template slot-scope="scope">{{ scope.row.score }}</template>
       </el-table-column>
-      <el-table-column align="left" label="耗时(秒)">
+      <el-table-column align="left" label="耗时(时分秒)" sortable='custom' prop="took">
         <template slot-scope="scope">{{ scope.row.took_format }}</template>
       </el-table-column>
       <el-table-column align="left" label="答题时间">
@@ -214,6 +215,16 @@ export default {
       this.listQuery.start = this.value[0],
       this.listQuery.end = this.value[1],
       this.getList()
+    },
+    changeSort (val) {
+      if(val.order == 'ascending'){
+        this.listQuery.ordering = val.prop
+      }else{
+        this.listQuery.ordering = '-' + val.prop
+      }
+    
+      this.getList()
+
     }
   }
 };
diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 8305d8d..15859ab 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -86,7 +86,7 @@
       <el-table-column align="center" label="姓名">
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
-      <el-table-column align="header-center" label="手机号">
+      <el-table-column align="header-center" label="手机号" sortable='custom' prop="username">
         <template slot-scope="scope">{{ scope.row.username }}</template>
       </el-table-column>
       <el-table-column align="header-center" label="小程序OpenId">
@@ -95,7 +95,7 @@
       <el-table-column align="header-center" label="微信昵称">
         <template slot-scope="scope">{{ scope.row.nickname }}</template>
       </el-table-column>
-      <el-table-column align="header-center" label="单位">
+      <el-table-column align="header-center" label="单位" sortable='custom' prop="company">
         <template
           slot-scope="scope"
           v-if="scope.row.company_name != null"
@@ -110,7 +110,7 @@
   </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="工作类别">
+      <el-table-column align="center" label="工作类别" sortable='custom' prop="workscope">
         <template slot-scope="scope" >
           <el-tag v-if="scope.row.workscope_name">{{ scope.row.workscope_name }}</el-tag>
         </template>
@@ -317,9 +317,9 @@ export default {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
     },
-    getList(query = this.listQuery) {
+    getList() {
       this.listLoading = true;
-      getConsumerList(query).then(response => {
+      getConsumerList(this.listQuery).then(response => {
         this.consumerList = response.data.results;
         this.total = response.data.count;
         this.listLoading = false;
@@ -453,7 +453,7 @@ export default {
         this.listQuery.ordering = '-' + val.prop
       }
     
-    this.getList()
+      this.getList()
 
     }
   }
diff --git a/test_client/src/views/login/index.vue b/test_client/src/views/login/index.vue
index 0018a1b..a8645ba 100644
--- a/test_client/src/views/login/index.vue
+++ b/test_client/src/views/login/index.vue
@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
 
       <div class="title-container">
-        <h3 class="title">答题平台后台管理</h3>
+        <h3 class="title">辐射学堂后台管理</h3>
       </div>
 
       <el-form-item prop="username">
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 8bf4b65..ec8859d 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -81,8 +81,8 @@ class ConsumerViewSet(ModelViewSet):
     queryset = Consumer.objects.filter(is_delete=0).all()
     serializer_class = ConsumerSerializer
     pagination_class = CommonPagination
-    ordering_fields = ('id','company','create_time')
-    ordering = ['-create_time', 'company']
+    ordering_fields = ('id','company','create_time', 'username', 'workscope')
+    ordering = ['-create_time']
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ('company',)
     search_fields = ('^name','^username')
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 24309ee..7b7949f 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -205,7 +205,7 @@ class ExamTestViewSet(ModelViewSet):
     pagination_class = CommonPagination
     queryset = ExamTest.objects.filter(is_delete=0).all()
     serializer_class = ExamTestListSerializer
-    ordering_fields = ('id','create_time')
+    ordering_fields = ('id','create_time','took','score')
     ordering = ['-create_time']
     search_fields = ('^name',)
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]