diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js index 3342a4b..6d66527 100644 --- a/test_client/src/router/index.js +++ b/test_client/src/router/index.js @@ -183,7 +183,7 @@ export const asyncRoutes = [ path: 'chart', name: 'chart', component: () => import('@/views/analyse/chart.vue'), - meta: { title: '图标分析', icon: '', perms: ['chart_manage'] } + meta: { title: '图表分析', icon: '', perms: ['chart_manage'] } }, ] }, diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue index a72fec0..71695d0 100644 --- a/test_client/src/views/crm/consumer.vue +++ b/test_client/src/views/crm/consumer.vue @@ -87,10 +87,10 @@ - + - + diff --git a/test_client/src/views/question/question.vue b/test_client/src/views/question/question.vue index 647e7ec..7945d9d 100644 --- a/test_client/src/views/question/question.vue +++ b/test_client/src/views/question/question.vue @@ -70,6 +70,7 @@ :data="tableData" style="width: 100%;margin-top:10px;" border + stripe fit v-loading="listLoading" highlight-current-row diff --git a/test_mini/pages/cuoti/index.wxml b/test_mini/pages/cuoti/index.wxml index 40d6748..890d047 100644 --- a/test_mini/pages/cuoti/index.wxml +++ b/test_mini/pages/cuoti/index.wxml @@ -45,7 +45,7 @@ 正确答案是{{currentTm.right}},你的答案是{{currentTm.user_answer}} 解析: - {{currentTm.resolution}} + {{currentTm.resolution}} 无 diff --git a/test_mini/pages/lianxi/index.js b/test_mini/pages/lianxi/index.js index 8fd67f4..3352f55 100644 --- a/test_mini/pages/lianxi/index.js +++ b/test_mini/pages/lianxi/index.js @@ -53,6 +53,7 @@ Page({ questioncat['id'] = res.data[i].id questioncat['name'] = res.data[i].name questioncat['tmtotal'] = res.data[i].tmtotal + questioncat['type'] = res.data[i].type questioncat['ydtmtotal'] = 0 questioncatData.push(questioncat) } diff --git a/test_mini/pages/lianxi/index.wxml b/test_mini/pages/lianxi/index.wxml index ae565a7..c527cce 100644 --- a/test_mini/pages/lianxi/index.wxml +++ b/test_mini/pages/lianxi/index.wxml @@ -11,7 +11,8 @@

{{item.name}}

- 共 + {{item.type}} + --共 {{item.tmtotal}} 道/已答 {{item.ydtmtotal}} diff --git a/test_mini/pages/lianxi/main.wxml b/test_mini/pages/lianxi/main.wxml index e30667f..cf1dfda 100644 --- a/test_mini/pages/lianxi/main.wxml +++ b/test_mini/pages/lianxi/main.wxml @@ -41,7 +41,7 @@ 正确答案是{{tm_current.right}},你的答案是{{tm_current.user_answer}} 解析: - {{tm_current.resolution}} + {{tm_current.resolution}} 无 diff --git a/test_mini/pages/test/detail.wxml b/test_mini/pages/test/detail.wxml index 66d0dc4..ac3198a 100644 --- a/test_mini/pages/test/detail.wxml +++ b/test_mini/pages/test/detail.wxml @@ -36,15 +36,15 @@ - 回答正确! - 回答有误! + 回答正确!得{{tm_current.score}}分 + 回答有误!得{{tm_current.score}}分 正确答案是{{tm_current.question.right}}, 你的答案是{{tm_current.user_answer}} 你未作答 解析: - {{tm_current.question.resolution}} + {{tm_current.question.resolution}} 无 diff --git a/test_mini/pages/test/list.js b/test_mini/pages/test/list.js index ffaaecf..23c789d 100644 --- a/test_mini/pages/test/list.js +++ b/test_mini/pages/test/list.js @@ -36,23 +36,17 @@ Page({ getList: function () { var that = this api.request('examtest/myexamtest/', 'GET', that.data.query).then(res => { - if(res.data.length==0){ - wx.showToast({ - title: '没有更多了', - icon:'' - }) - }else{ - if (that.data.query.page == 1){ - that.data.results = res.data.results - }else{ - that.data.results = that.data.results.concat(res.data.results) - } - - that.setData({ - results:that.data.results, - count:res.data.count - }) + if (that.data.query.page == 1) { + that.data.results = res.data.results + } else { + that.data.results = that.data.results.concat(res.data.results) } + + that.setData({ + results: that.data.results, + count: res.data.count + }) + }) }, /** @@ -83,8 +77,17 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - that.data.query.page = that.data.query.page + 1 - that.getList() + var that=this + if(that.data.count<=that.data.query.page*that.data.query.limit){ + wx.showToast({ + title: '没有更多了', + icon: 'none' + }) + }else{ + that.data.query.page = that.data.query.page + 1 + that.getList() + } + }, /** diff --git a/test_mini/pages/test/list.wxml b/test_mini/pages/test/list.wxml index 57e78cf..fb86eec 100644 --- a/test_mini/pages/test/list.wxml +++ b/test_mini/pages/test/list.wxml @@ -6,18 +6,18 @@ {{item.name}} - + {{item.type}} - 通过 未通过 (得分 - {{item.score}} - {{item.score}} + {{item.score}} + {{item.score}} -满分 {{item.total_score}}) - + 耗时:{{item.took}}s 开始答题:{{item.start_time}} diff --git a/test_mini/pages/test/test.js b/test_mini/pages/test/test.js index 747c539..8820ced 100644 --- a/test_mini/pages/test/test.js +++ b/test_mini/pages/test/test.js @@ -9,6 +9,7 @@ Page({ data: { tms:[], tm_index: 0, + ctms:[], }, radioChange: function (e) { var that = this @@ -143,6 +144,7 @@ Page({ if(tm_current.right.indexOf(tm_current.user_answer[i])!=-1){ score = score + 1 }else{ + score = 0 break; } } @@ -248,7 +250,6 @@ Page({ }else{ that.data.monitest.is_pass = false } - console.log(that.data.tms) that.data.monitest.questions = that.data.tms that.data.monitest.start_time = util.formatTime(new Date(that.data.starttimes)) that.data.monitest.end_time = util.formatTime(new Date()) diff --git a/test_mini/pages/workscope/index.js b/test_mini/pages/workscope/index.js index 4e341da..939bde1 100644 --- a/test_mini/pages/workscope/index.js +++ b/test_mini/pages/workscope/index.js @@ -17,7 +17,7 @@ Page({ var that = this try { var value = wx.getStorageSync('nowSubject') - if (value) { + if (value.id) { api.request('examtest/workscope/', 'GET', { subject:value.id}).then(res => { that.setData({ workData:res.data diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py index b49475a..ee45ab3 100644 --- a/test_server/examtest/views.py +++ b/test_server/examtest/views.py @@ -59,7 +59,7 @@ class MyExamTestView(APIView): authentication_classes = [ConsumerTokenAuthentication] permission_classes = [] def get(self, request, *args, **kwargs): - queryset = ExamTest.objects.filter(consumer=request.user) + queryset = ExamTest.objects.filter(consumer=request.user).order_by('-create_time') pg = CommonPagination() p = pg.paginate_queryset(queryset=queryset,request=request,view=self) serializer = ExamTestListSerializer(instance=p,many=True) @@ -72,7 +72,7 @@ class MyExamTestFxView(APIView): queryset = ExamTest.objects.filter(consumer=request.user) ret = {} ret['total'] = queryset.count() - ret['avg_score'] = queryset.aggregate(avg=Avg('score'))['avg'] + ret['avg_score'] = round(queryset.aggregate(avg=Avg('score'))['avg']) ret['pass_rate'] = round(((queryset.filter(is_pass=True).count())/ret['total'])*100) if ret['total'] else 0 return Response(ret) diff --git a/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx b/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx new file mode 100644 index 0000000..9b0e58a Binary files /dev/null and b/test_server/media/20200326/925d1614-6f0e-11ea-b730-90cdb685c056.xlsx differ diff --git a/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx b/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx new file mode 100644 index 0000000..3340c0c Binary files /dev/null and b/test_server/media/20200326/c7559124-6f10-11ea-81e6-90cdb685c056.xlsx differ diff --git a/test_server/server/urls.py b/test_server/server/urls.py index fc1b2b2..daa4077 100644 --- a/test_server/server/urls.py +++ b/test_server/server/urls.py @@ -34,5 +34,5 @@ urlpatterns = [ path('token/remove/', UserLogoutView.as_view()), path('uploadfile/', UploadFileView.as_view()), path('admin/', admin.site.urls), - path('docs/', include_docs_urls(title="API文档",authentication_classes=[], permission_classes=[])), + path('docs/', include_docs_urls(title="答题平台接口文档",authentication_classes=[], permission_classes=[])), ]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)