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"
>
@@ -74,10 +75,10 @@
{{ scope.row.paper_name }}
-
+
{{ scope.row.score }}
-
+
{{ scope.row.took_format }}
@@ -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 @@
{{ scope.row.name }}
-
+
{{ scope.row.username }}
@@ -95,7 +95,7 @@
{{ scope.row.nickname }}
-
+
-
+
{{ scope.row.workscope_name }}
@@ -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 @@
-
答题平台后台管理
+ 辐射学堂后台管理
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]