From 4575ac8d4ff591914ed2c49b6d52f0641ca3b90d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Wed, 2 Jun 2021 22:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E9=A2=81=E5=8F=91=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_mini/pages/admin/exam/detail.js   |  5 +++++
 test_mini/pages/admin/exam/detail.wxml | 31 ++++++++++++++++++--------
 test_mini/pages/admin/exam/detail.wxss |  5 ++++-
 test_mini/pages/admin/exam/index.wxml  |  2 +-
 test_server/crm/models.py              |  3 ++-
 test_server/examtest/views.py          |  4 ++--
 6 files changed, 36 insertions(+), 14 deletions(-)

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 @@
     <view class="weui-panel__hd">{{exam.name}}</view>
     <view class="weui-panel__bd">
 				<view class="weui-media-box weui-media-box_text">
-					<!-- <h4 class="weui-media-box__title">标题一</h4> -->
+          <!-- <h4 class="weui-media-box__title">标题一</h4> -->
+          <view class="weui-media-box__desc">
+            工作类别:{{exam.workscope_name}}
+          </view>
 					<view class="weui-media-box__desc">
             考试地点:{{exam.place}}
           </view>
@@ -19,23 +22,33 @@
     </view>
   </view>
 		<view class="weui-panel weui-panel_access">
-			<view class="weui-panel__hd">共{{tests.count}}人员参加考试</view>
+			<view class="weui-panel__hd">共{{tests.length}}名人员参加考试</view>
 			<view class="weui-panel__bd">
-				<navigator class="weui-media-box weui-media-box_text"  wx:for="{{results}}" wx:key="unique" url="detail?id={{item.id}}">
+				<view class="weui-media-box weui-media-box_text"  wx:for="{{tests}}" wx:key="unique">
 					<h4 class="weui-media-box__title">
-          <text style="color:blue;font-weight:bold;">{{item.workscope_name}}</text>
-          {{item.name}}
+          <text style="color:green;" wx:if="{{item.is_pass}}">通过</text>
+          <text style="color:red;" wx:else>未过</text>
+          {{item.consumer_detail.name}}
           </h4>
           <view class="weui-media-box__desc">
-            考试地点:{{item.place}}
+            {{item.consumer_detail.company_name}} {{item.consumer_detail.deptname}}
           </view>
 					<view class="weui-media-box__desc">
-            开关时间:{{item.opentime}}-{{item.closetime}}
+            身份证号:{{item.consumer_detail.ID_number}}
           </view>
           <view class="weui-media-box__desc">
-            监考人:{{item.proctor_name}}-{{item.proctor_phone}}
+            开始答题:{{item.start_time}}-耗时:{{item.took_format}}
           </view>
-				</navigator>
+          <view class="weui-media-box__desc">
+            得分:{{item.score}}
+          </view>
+          <view style="text-align:right;padding-right:8rpx">
+          <button type="primary" size="mini" bindtap="issue">颁发证书</button>
+          <button type="default" size="mini" bindtap="unbindmp" style="margin-left:4px">查看证书</button>
+          <button type="default" size="mini" bindtap="logout" style="margin-left:4px">答卷详情</button>
+        </view>
+        </view>
+
 			</view>
 			<view class="weui-loadmore weui-loadmore_line" wx:if="{{isLoadedAll}}">
 			<text class="weui-loadmore__tips">到底了</text>
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 @@
 			<view class="weui-panel__bd">
 				<navigator class="weui-media-box weui-media-box_text"  wx:for="{{results}}" wx:key="unique" url="detail?id={{item.id}}">
 					<h4 class="weui-media-box__title">
-          <text style="color:blue;font-weight:bold;">{{item.workscope_name}}</text>
+          <text style="color:blue;">{{item.workscope_name}}</text>
           {{item.name}}
           </h4>
           <view class="weui-media-box__desc">
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):
     """
     考试记录列表和详情
     """