diff --git a/test_mini/pages/admin/exam/detail.js b/test_mini/pages/admin/exam/detail.js
index c3a9dc1..89702dd 100644
--- a/test_mini/pages/admin/exam/detail.js
+++ b/test_mini/pages/admin/exam/detail.js
@@ -28,7 +28,12 @@ Page({
})
}
},
+ issue: function(){
+ wx.showLoading({
+ title: '正在生成...',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/test_mini/pages/admin/exam/detail.wxml b/test_mini/pages/admin/exam/detail.wxml
index 160b04d..e345b57 100644
--- a/test_mini/pages/admin/exam/detail.wxml
+++ b/test_mini/pages/admin/exam/detail.wxml
@@ -5,7 +5,10 @@
{{exam.name}}
-
+
+
+ 工作类别:{{exam.workscope_name}}
+
考试地点:{{exam.place}}
@@ -19,23 +22,33 @@
- 共{{tests.count}}人员参加考试
+ 共{{tests.length}}名人员参加考试
-
+
- 考试地点:{{item.place}}
+ {{item.consumer_detail.company_name}} {{item.consumer_detail.deptname}}
- 开关时间:{{item.opentime}}-{{item.closetime}}
+ 身份证号:{{item.consumer_detail.ID_number}}
- 监考人:{{item.proctor_name}}-{{item.proctor_phone}}
+ 开始答题:{{item.start_time}}-耗时:{{item.took_format}}
-
+
+ 得分:{{item.score}}
+
+
+
+
+
+
+
+
到底了
diff --git a/test_mini/pages/admin/exam/detail.wxss b/test_mini/pages/admin/exam/detail.wxss
index c7c5173..8d4b5d6 100644
--- a/test_mini/pages/admin/exam/detail.wxss
+++ b/test_mini/pages/admin/exam/detail.wxss
@@ -1 +1,4 @@
-/* pages/admin/exam/detail.wxss */
\ No newline at end of file
+/* pages/admin/exam/detail.wxss */
+.weui-media-box {
+ padding: 12px;
+}
\ No newline at end of file
diff --git a/test_mini/pages/admin/exam/index.wxml b/test_mini/pages/admin/exam/index.wxml
index 11267ff..525b2cf 100644
--- a/test_mini/pages/admin/exam/index.wxml
+++ b/test_mini/pages/admin/exam/index.wxml
@@ -4,7 +4,7 @@
diff --git a/test_server/crm/models.py b/test_server/crm/models.py
index 234dde2..01c6550 100644
--- a/test_server/crm/models.py
+++ b/test_server/crm/models.py
@@ -108,4 +108,5 @@ class Candidate(CommonModel):
consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE, related_name='candidate_consumer')
workscope = models.ForeignKey(WorkScope, on_delete=models.CASCADE, related_name='candidate_workscope')
report_number = models.TextField('报告单号', null=True, blank=True)
- issue_date = models.DateField('发证日期', null=True, blank=True)
\ No newline at end of file
+ issue_date = models.DateField('发证日期', null=True, blank=True)
+ examtest = models.ForeignKey(to='examtest.examtest', verbose_name='关联考试', null=True, blank=True, on_delete=models.CASCADE)
\ No newline at end of file
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 3eae58b..dd5ad55 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -36,7 +36,7 @@ from django.db.models import Q
from utils.pagination import PageOrNot
# Create your views here.
-class ExamViewSet(PageOrNot, ModelViewSet):
+class ExamViewSet(ModelViewSet):
"""
正式考试增删改查
"""
@@ -376,7 +376,7 @@ class TestRuleViewSet(ModelViewSet):
self.permission_classes = []
return [permission() for permission in self.permission_classes]
-class ExamTestViewSet(ModelViewSet):
+class ExamTestViewSet(PageOrNot, ModelViewSet):
"""
考试记录列表和详情
"""