From fc66951a17e515043b2b5167c18de699b314dd6d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 20 Mar 2020 18:24:17 +0800
Subject: [PATCH] monitest complete

---
 test_client/src/views/crm/consumer.vue        |  42 +++---
 test_mini/app.json                            |   6 +-
 test_mini/pages/cuoti/index.js                |  20 +--
 test_mini/pages/cuoti/index.wxml              |   8 +-
 test_mini/pages/lianxi/main.js                |  22 +--
 test_mini/pages/lianxi/main.wxml              |   8 +-
 test_mini/pages/main/main.js                  |  11 ++
 test_mini/pages/main/main.wxml                |   8 +-
 test_mini/pages/moni/index.js                 |   2 +-
 test_mini/pages/test/detail.js                | 125 ++++++++++++++++
 test_mini/pages/test/detail.json              |   3 +
 test_mini/pages/test/detail.wxml              |  60 ++++++++
 test_mini/pages/test/detail.wxss              |  20 +++
 test_mini/pages/test/list.js                  | 102 +++++++++++++
 test_mini/pages/test/list.json                |   6 +
 test_mini/pages/test/list.wxml                |  30 ++++
 test_mini/pages/test/list.wxss                |   5 +
 test_mini/pages/test/result.js                |  76 ++++++++++
 test_mini/pages/test/result.json              |   3 +
 test_mini/pages/test/result.wxml              |  29 ++++
 test_mini/pages/test/result.wxss              |   1 +
 test_mini/pages/test/sheet.js                 |  86 +++++++++++
 test_mini/pages/test/sheet.json               |   4 +
 test_mini/pages/test/sheet.wxml               |  13 ++
 test_mini/pages/test/sheet.wxss               |  21 +++
 test_mini/pages/test/test.js                  |  42 +++++-
 test_mini/pages/test/test.json                |   2 +-
 test_mini/pages/test/test.wxml                |   2 +-
 test_mini/utils/util.js                       |   2 +-
 .../crm/migrations/0007_auto_20200320_1726.py |  39 +++++
 test_server/crm/models.py                     |  18 ++-
 test_server/crm/serializers.py                |  12 ++
 test_server/crm/views.py                      |  16 +-
 .../migrations/0008_auto_20200319_1827.py     |   6 +-
 .../migrations/0009_auto_20200319_1850.py     |   2 +-
 .../migrations/0010_testrule_is_pass.py       |  18 +++
 .../migrations/0011_auto_20200320_1115.py     |  42 ++++++
 .../migrations/0012_auto_20200320_1439.py     |  50 +++++++
 test_server/examtest/models.py                |  42 +++---
 test_server/examtest/serializers.py           |  35 ++++-
 test_server/examtest/urls.py                  |   4 +-
 test_server/examtest/views.py                 | 137 ++++++++++++------
 .../7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx | Bin 0 -> 13243 bytes
 .../a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx | Bin 0 -> 13245 bytes
 test_server/question/models.py                |   6 +-
 test_server/rbac/models.py                    |  20 ++-
 46 files changed, 1053 insertions(+), 153 deletions(-)
 create mode 100644 test_mini/pages/test/detail.js
 create mode 100644 test_mini/pages/test/detail.json
 create mode 100644 test_mini/pages/test/detail.wxml
 create mode 100644 test_mini/pages/test/detail.wxss
 create mode 100644 test_mini/pages/test/list.js
 create mode 100644 test_mini/pages/test/list.json
 create mode 100644 test_mini/pages/test/list.wxml
 create mode 100644 test_mini/pages/test/list.wxss
 create mode 100644 test_mini/pages/test/result.js
 create mode 100644 test_mini/pages/test/result.json
 create mode 100644 test_mini/pages/test/result.wxml
 create mode 100644 test_mini/pages/test/result.wxss
 create mode 100644 test_mini/pages/test/sheet.js
 create mode 100644 test_mini/pages/test/sheet.json
 create mode 100644 test_mini/pages/test/sheet.wxml
 create mode 100644 test_mini/pages/test/sheet.wxss
 create mode 100644 test_server/crm/migrations/0007_auto_20200320_1726.py
 create mode 100644 test_server/examtest/migrations/0010_testrule_is_pass.py
 create mode 100644 test_server/examtest/migrations/0011_auto_20200320_1115.py
 create mode 100644 test_server/examtest/migrations/0012_auto_20200320_1439.py
 create mode 100644 test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx
 create mode 100644 test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx

diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 053ce4d..3b9b216 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -16,7 +16,7 @@
           :value="item.value"
         />
       </el-select>
-      <el-select
+      <!-- <el-select
         v-model="listQuery.is_paid"
         placeholder="是否缴费"
         clearable
@@ -30,7 +30,7 @@
           :label="item.display_name"
           :value="item.key"
         />
-      </el-select>
+      </el-select> -->
       <el-input
         v-model="search"
         placeholder="姓名"
@@ -96,10 +96,14 @@
           v-if="scope.row.company_name != null"
         >{{ scope.row.company_name }}</template>
       </el-table-column>
-      <el-table-column align="center" label="是否付费">
-        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.is_paid">已付费</el-tag>
-          <el-tag type="danger" v-else>未付费</el-tag>
+      <el-table-column align="center" label="缴费科目">
+        <template slot-scope="scope" >
+          <el-tag
+    v-for="item in scope.row.subjects"
+    :key="item.id"
+    effect="dark">
+    {{ item.name }}
+  </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="创建日期">
@@ -153,7 +157,7 @@
         </el-form-item>
         <el-form-item label="单位" prop="company">
           <el-cascader
-            v-model="consumer.company"
+            v-model="consumer.company.id"
             :options="companyData"
             :props="{ checkStrictly: true }"
             clearable
@@ -188,8 +192,10 @@ const defaultConsumer = {
   id: "",
   name: "",
   username: "",
-  company: null,
-  is_paid: false
+  company: {
+    id:0,
+    name:''
+  },
 };
 const listQuery = {
   page: 1,
@@ -206,13 +212,7 @@ export default {
     return {
       uploadUrl: uploadUrl(),
       popovervisible: false,
-      consumer: {
-        id: "",
-        name: "",
-        username: "",
-        company: null,
-        ispaid: false
-      },
+      consumer: defaultConsumer,
       myHeaders: { Authorization: "JWT " + getToken() },
       consumerList: [],
       total: 0,
@@ -345,7 +345,9 @@ export default {
         if (valid) {
           const isEdit = this.dialogType === "edit";
           if (isEdit) {
-            updateConsumer(this.consumer.id, this.consumer).then(() => {
+            let consumer = this.consumer
+            consumer.company = consumer.company.id
+            updateConsumer(this.consumer.id, consumer).then(() => {
               for (let index = 0; index < this.consumerList.length; index++) {
                 if (this.consumerList[index].id === this.consumer.id) {
                   this.consumerList.splice(
@@ -365,8 +367,10 @@ export default {
               });
             });
           } else {
-            this.consumer.company = this.consumer.company.pop();
-            createConsumer(this.consumer).then(res => {
+            this.consumer.company.id = this.consumer.company.id.pop();
+            let consumer = this.consumer
+            consumer.company = consumer.company.id
+            createConsumer(consumer).then(res => {
               // this.consumer = res.data
               // this.consumerList.unshift(this.consumer)
               this.getList();
diff --git a/test_mini/app.json b/test_mini/app.json
index 7e83dba..9afa48d 100644
--- a/test_mini/app.json
+++ b/test_mini/app.json
@@ -11,7 +11,11 @@
     "pages/cuoti/index",
     "pages/moni/index",
     "pages/moni/note",
-    "pages/test/test"
+    "pages/test/test",
+    "pages/test/result",
+    "pages/test/detail",
+    "pages/test/sheet",
+    "pages/test/list"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/test_mini/pages/cuoti/index.js b/test_mini/pages/cuoti/index.js
index efbec89..e0e1bb7 100644
--- a/test_mini/pages/cuoti/index.js
+++ b/test_mini/pages/cuoti/index.js
@@ -8,20 +8,20 @@ Page({
    */
   data: {
     ctms: [],
-    tmIndex: 0,
+    tm_index: 0,
     isright:false,
     answerP:false
   },
   radioChange: function (e) {
     var that = this
     that.data.currentTm['user_answer'] = e.detail.value
-    that.data.ctms[that.data.tmIndex] = that.data.currentTm
+    that.data.ctms[that.data.tm_index] = that.data.currentTm
     that.showAnswer()
   },
   checkboxChange: function (e) {
     var that = this
     that.data.currentTm['user_answer'] = e.detail.value
-    that.data.ctms[that.data.tmIndex] = that.data.currentTm
+    that.data.ctms[that.data.tm_index] = that.data.currentTm
   },
   /**
    * 生命周期函数--监听页面加载
@@ -64,7 +64,7 @@ Page({
         }
       })
     }else{
-      that.showTm(that.data.tmIndex)
+      that.showTm(that.data.tm_index)
     }
     
   },
@@ -123,7 +123,7 @@ Page({
     var that = this
     var currentTm = that.data.ctms[index]
     that.setData({
-      'tmIndex': index,
+      'tm_index': index,
       'tmtotal':that.data.ctms.length,
       'currentTm': currentTm
     })
@@ -165,13 +165,13 @@ Page({
   },
   next: function () {
     var that = this
-    var tmIndex = that.data.tmIndex + 1
-    that.showTm(tmIndex)
+    var tm_index = that.data.tm_index + 1
+    that.showTm(tm_index)
   },
   previous: function () {
     var that = this
-    var tmIndex = that.data.tmIndex - 1
-    that.showTm(tmIndex)
+    var tm_index = that.data.tm_index - 1
+    that.showTm(tm_index)
   },
   showOptions: function () {
     let currentTm = this.data.currentTm
@@ -195,7 +195,7 @@ Page({
   },
   remove: function () {
     var that = this
-    var index = that.data.tmIndex
+    var index = that.data.tm_index
     that.data.ctms.splice(index,1)
     if(that.data.ctms.length>index){
       that.showTm(index)
diff --git a/test_mini/pages/cuoti/index.wxml b/test_mini/pages/cuoti/index.wxml
index 605bfff..3f5b0e2 100644
--- a/test_mini/pages/cuoti/index.wxml
+++ b/test_mini/pages/cuoti/index.wxml
@@ -1,9 +1,9 @@
 <view class="head">
-  题量: {{tmIndex+1}}/{{tmtotal}}
+  题量: {{tm_index+1}}/{{tmtotal}}
 </view>
 <scroll-view scroll-y="true" style="height: {{scrollHeight}}px;">
   <view class="weui-article">
-    <view class="weui-article__h2">{{tmIndex+1}}.
+    <view class="weui-article__h2">{{tm_index+1}}.
       <span class="txlabel">{{currentTm.type}}</span>
     </view>
     <view style="text-align:center">
@@ -52,10 +52,10 @@
 </scroll-view>
 <view class="btns">
   <view style="width:25%">
-    <button type="primary" size="mini" bindtap="previous" disabled="{{tmIndex==0}}">上题</button>
+    <button type="primary" size="mini" bindtap="previous" disabled="{{tm_index==0}}">上题</button>
   </view>
   <view style="width:25%">
-    <button type="primary" size="mini" bindtap="next" disabled="{{tmIndex==tmtotal-1}}">下题</button>
+    <button type="primary" size="mini" bindtap="next" disabled="{{tm_index==tmtotal-1}}">下题</button>
   </view>
   <view style="width:25%">
     <button type="primary" size="mini" bindtap="showAnswer">答案</button>
diff --git a/test_mini/pages/lianxi/main.js b/test_mini/pages/lianxi/main.js
index 5175d16..6224c35 100644
--- a/test_mini/pages/lianxi/main.js
+++ b/test_mini/pages/lianxi/main.js
@@ -11,14 +11,14 @@ Page({
     tms:[],
     ydtms:[],
     ctms:[],
-    tmIndex: 0,
+    tm_index: 0,
     answerP: false,
     isLoad:true,
   },
   radioChange: function (e) {
     var that = this
     that.data.tm_current['user_answer'] = e.detail.value
-    that.data.tms[that.data.tmIndex] = that.data.tm_current
+    that.data.tms[that.data.tm_index] = that.data.tm_current
     that.showAnswer()
     if (that.data.ydtms.indexOf(that.data.tm_current.id)==-1){
       that.data.ydtms.push(that.data.tm_current.id)
@@ -27,7 +27,7 @@ Page({
   checkboxChange: function (e) {
     var that = this
     that.data.tm_current['user_answer'] = e.detail.value
-    that.data.tms[that.data.tmIndex] = that.data.tm_current
+    that.data.tms[that.data.tm_index] = that.data.tm_current
     if (that.data.ydtms.indexOf(that.data.tm_current.id) == -1) {
       that.data.ydtms.push(that.data.tm_current.id)
     }
@@ -81,7 +81,7 @@ Page({
           })
         }else{
           that.data.tms = that.data.tms.concat(res.data.results)
-          that.showTm(that.data.tmIndex) //展示题目和答案
+          that.showTm(that.data.tm_index) //展示题目和答案
           if(that.data.isLoad){
             that.setData({
               tmtotal: res.data.total,
@@ -152,7 +152,7 @@ Page({
     var that = this
     var tm_current = that.data.tms[index]
     that.setData({
-      'tmIndex': index,
+      'tm_index': index,
       'tm_current': tm_current
     })
     that.showOptions()
@@ -193,25 +193,25 @@ Page({
   },
   next: function () {
     var that = this
-    var tmIndex = that.data.tmIndex + 1
+    var tm_index = that.data.tm_index + 1
     that.setData({
-      tmIndex: tmIndex,
+      tm_index: tm_index,
       answerP: false
     })
-    if (tmIndex + 1 > that.data.tms.length) {
+    if (tm_index + 1 > that.data.tms.length) {
       that.getTms()
     } else {
-      that.showTm(tmIndex)
+      that.showTm(tm_index)
     }
 
   },
   previous: function () {
     var that = this
-    var tmIndex = that.data.tmIndex - 1
+    var tm_index = that.data.tm_index - 1
     that.setData({
       answerP: false
     })
-    that.showTm(tmIndex)
+    that.showTm(tm_index)
   },
   showOptions: function () {
     let tm_current = this.data.tm_current
diff --git a/test_mini/pages/lianxi/main.wxml b/test_mini/pages/lianxi/main.wxml
index e018a1b..a8b5ff5 100644
--- a/test_mini/pages/lianxi/main.wxml
+++ b/test_mini/pages/lianxi/main.wxml
@@ -1,9 +1,9 @@
 <view class="head">
-  题量: {{tmIndex+1}}/{{tmtotal}}
+  题量: {{tm_index+1}}/{{tmtotal}}
 </view>
 <scroll-view scroll-y="true" style="height: {{scrollHeight}}px;">
   <view class="weui-article">
-    <view class="weui-article__h2">{{tmIndex+1}}.
+    <view class="weui-article__h2">{{tm_index+1}}.
     <span class="txlabel">{{tm_current.type}}</span>
     </view>
     <view class="weui-article__title">{{tm_current.name}}</view>
@@ -48,10 +48,10 @@
 </scroll-view>
 <view class="btns">
   <view style="width:25%">
-    <button type="primary" size="mini" bindtap="previous" disabled="{{tmIndex==0}}">上题</button>
+    <button type="primary" size="mini" bindtap="previous" disabled="{{tm_index==0}}">上题</button>
   </view>
   <view style="width:25%">
-    <button type="primary" size="mini" bindtap="next" disabled="{{tmIndex==tmtotal-1}}">下题</button>
+    <button type="primary" size="mini" bindtap="next" disabled="{{tm_index==tmtotal-1}}">下题</button>
   </view>
   <view style="width:25%">
     <button type="primary" size="mini" bindtap="showAnswer">答案</button>
diff --git a/test_mini/pages/main/main.js b/test_mini/pages/main/main.js
index b5b4f55..698e639 100644
--- a/test_mini/pages/main/main.js
+++ b/test_mini/pages/main/main.js
@@ -143,5 +143,16 @@ Page({
         duration: 1500
       })
     }
+  },
+  goYati: function () {
+    wx.showToast({
+      title: '暂未开放',
+      icon:'none'
+    })
+  },
+  testList: function (){
+    wx.navigateTo({
+      url: '/pages/test/list',
+    })
   }
 })
\ No newline at end of file
diff --git a/test_mini/pages/main/main.wxml b/test_mini/pages/main/main.wxml
index ae20a47..ed7d8a4 100644
--- a/test_mini/pages/main/main.wxml
+++ b/test_mini/pages/main/main.wxml
@@ -47,14 +47,14 @@
       </view>
       <view class="weui-grid__label">自助模考</view>
     </a>
-    <a class="weui-grid">
-      <view class="weui-grid__icon">
+    <a class="weui-grid" bindtap="goYati">
+      <view class="weui-grid__icon" >
         <image src="/images/yati.svg" alt></image>
       </view>
       <view class="weui-grid__label">押题考试</view>
     </a>
-    <a class="weui-grid">
-      <view class="weui-grid__icon">
+    <a class="weui-grid" bindtap="testList">
+      <view class="weui-grid__icon" >
         <image src="/images/ksjl.svg" alt></image>
       </view>
       <view class="weui-grid__label">考试记录</view>
diff --git a/test_mini/pages/moni/index.js b/test_mini/pages/moni/index.js
index c42669e..4768db0 100644
--- a/test_mini/pages/moni/index.js
+++ b/test_mini/pages/moni/index.js
@@ -91,7 +91,7 @@ Page({
     wx.showLoading({
       title: '正在生成试卷',
     })
-    api.request('examtest/monitest/', 'GET', { 'rule': e.currentTarget.id }).then(res => {
+    api.request('examtest/testrule/' + e.currentTarget.id + '/monitest', 'GET').then(res => {
       try {
         wx.setStorageSync('monitest', res.data)
       } catch (e) { }
diff --git a/test_mini/pages/test/detail.js b/test_mini/pages/test/detail.js
new file mode 100644
index 0000000..a3e22a3
--- /dev/null
+++ b/test_mini/pages/test/detail.js
@@ -0,0 +1,125 @@
+// pages/test/detail.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    tm_index:0,
+    results:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    var query = {'examtest':options.id}
+    api.request('examtest/answerdetail/', 'GET', query).then(res => {
+      that.data.results= res.data
+      that.showTm(0)
+      that.setData({
+        tmtotal:res.data.length
+      })
+    })
+    try {
+      const res = wx.getSystemInfoSync()
+      that.setData({
+        scrollHeight: res.windowHeight - 70
+      })
+    } catch (e) {
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  showTm: function (index) {
+    var that = this
+    var tm_current = that.data.results[index]
+    that.setData({
+      'tm_index': index,
+      'tm_current': tm_current
+    })
+    that.showOptions()
+  },
+  next: function () {
+    var that = this
+    var tm_index = that.data.tm_index + 1
+    that.showTm(tm_index)
+
+  },
+  previous: function () {
+    var that = this
+    var tm_index = that.data.tm_index - 1
+    that.showTm(tm_index)
+  },
+  showOptions: function () {
+    var that = this
+    let question_options = that.data.tm_current.question.options
+    let options = []
+    let user_answer = that.data.tm_current.user_answer
+    for (let key in question_options) {
+      let option = {}
+      option.key = key
+      option.value = key + ':' + question_options[key]
+      if (user_answer) {
+        if (key == user_answer || user_answer.indexOf(key) != -1) {
+          option.checked = true
+        }
+      } else {
+        option.checked = false
+      }
+      options.push(option)
+    }
+    that.setData({
+      options: options
+    })
+  },
+})
\ No newline at end of file
diff --git a/test_mini/pages/test/detail.json b/test_mini/pages/test/detail.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/test_mini/pages/test/detail.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/detail.wxml b/test_mini/pages/test/detail.wxml
new file mode 100644
index 0000000..36def9e
--- /dev/null
+++ b/test_mini/pages/test/detail.wxml
@@ -0,0 +1,60 @@
+<view class="head">
+  题量: {{tm_index+1}}/{{tmtotal}}
+</view>
+<scroll-view scroll-y="true" style="height: {{scrollHeight}}px;">
+  <view class="weui-article">
+    <view class="weui-article__h2">{{tm_index+1}}.
+    <span class="txlabel">{{tm_current.question.type}}</span>
+    </view>
+    <view class="weui-article__title">{{tm_current.question.name}}</view>
+  </view>
+  <view class="weui-cells weui-cells_radio">
+    <radio-group class="radio-group" wx:if="{{(tm_current.question.type=='单选' ||tm_current.question.type=='判断')}}">
+      <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
+        <view class="weui-cell__bd">
+          <view>{{item.value}}</view>
+        </view>
+        <view class="weui-cell__ft">
+          <radio class="weui-check" value="{{item.key}}" checked="{{item.checked}}" />
+          <i class="weui-icon-checked"></i>
+        </view>
+      </label>
+    </radio-group>
+  </view>
+  <view class="weui-cells weui-cells_checkbox">
+    <checkbox-group bindchange="checkboxChange" wx:if="{{tm_current.question.type=='多选'}}">
+      <label class="weui-cell weui-cell_active weui-check__label" wx:for="{{options}}" wx:key="key">
+        
+        <view class="weui-cell__bd">
+          <view>{{item.value}}</view>
+        </view>
+        <view class="weui-cell__hd">
+          <checkbox class="weui-check" value="{{item.key}}" checked="{{item.checked}}"/>
+          <i class="weui-icon-checked"></i>
+        </view>
+      </label>
+    </checkbox-group>
+  </view>
+  <view class="weui-article">
+    <view class="weui-article__h2" wx:if="{{tm_current.is_right}}" style="color:green;font-weight:bold">回答正确!</view>
+    <view class="weui-article__h2" wx:else style="color:red;font-weight:bold">回答有误!</view>
+    <view class="weui-article__h2">正确答案是{{tm_current.question.right}},你的答案是{{tm_current.user_answer}}</view>
+    <view class="weui-article__title">
+      <span style="color:blue">解析: </span>
+      <span wx:if="{{tm_current.question.resoluation != null}}">{{tm_current.question.resoluation}}</span>
+      <span wx:else>无</span>
+    </view>
+  </view>
+</scroll-view>
+<view class="btns">
+  <view style="width:33%">
+    <button type="primary" size="mini" bindtap="previous" disabled="{{tm_index==0}}">上题</button>
+  </view>
+  <view style="width:33%">
+    <button type="primary" size="mini" bindtap="next" disabled="{{tm_index==tmtotal-1}}">下题</button>
+  </view>
+  <view style="width:33%">
+    <image style="height: 80%;" src="/images/weishoucang.svg" bindtap="shoucang" wx:if="weishoucang"></image>
+    <image style="height: 80%;" src="/images/yishoucang.svg" bindtap="shoucang" wx:else></image>
+  </view>
+</view>
\ No newline at end of file
diff --git a/test_mini/pages/test/detail.wxss b/test_mini/pages/test/detail.wxss
new file mode 100644
index 0000000..0ee5e6b
--- /dev/null
+++ b/test_mini/pages/test/detail.wxss
@@ -0,0 +1,20 @@
+.head{
+  width:100%;
+  height:30px;
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
+.btns{
+  height:40px;
+  display:flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  text-align:center;
+}
+.txlabel{
+  color:#fff;
+  background-color: rgb(216, 140, 0);
+  padding: 2px
+}
+
diff --git a/test_mini/pages/test/list.js b/test_mini/pages/test/list.js
new file mode 100644
index 0000000..ffaaecf
--- /dev/null
+++ b/test_mini/pages/test/list.js
@@ -0,0 +1,102 @@
+// pages/lianxi/index.js
+const api = require("../../utils/request.js");
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    results: [],
+    query:{
+      page:1,
+      limit:10
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function () {
+    var that = this
+    that.getList(that.data.query)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  },
+  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
+        })
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this
+    that.data.query.page = 1;
+    that.getList();
+    wx.stopPullDownRefresh();
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    that.data.query.page = that.data.query.page + 1
+    that.getList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  detail: function (e) {
+    wx.navigateTo({
+      url: '',
+    })
+  },
+})
\ No newline at end of file
diff --git a/test_mini/pages/test/list.json b/test_mini/pages/test/list.json
new file mode 100644
index 0000000..27a9ac8
--- /dev/null
+++ b/test_mini/pages/test/list.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "考试记录",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/list.wxml b/test_mini/pages/test/list.wxml
new file mode 100644
index 0000000..57e78cf
--- /dev/null
+++ b/test_mini/pages/test/list.wxml
@@ -0,0 +1,30 @@
+<view class="head">
+
+  共{{count}}条考试记录</view>
+<view class="weui-cells weui-cells_after-title">
+  <block wx:for="{{results}}" wx:key="unique">
+    <navigator url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+      <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+        <view class="weui-media-box__title">{{item.name}}</view>
+        <view class="weui-media-box__desc" style="color:orange">
+          <span style="font-weight:bold;color:white;background-color:orange;">{{item.type}}</span>
+          <span>-</span>
+          <span style="font-weight:bold;color:white;background-color:green;" wx:if="{{item.is_pass}}">通过</span>
+          <span style="font-weight:bold;color:white;background-color:red;" wx:else>未通过</span>
+          (得分
+          <span style="color:green;font-weight:bold" wx:if="{{item.is_pass}}">{{item.score}}</span>
+          <span style="color:red;font-weight:bold" wx:else>{{item.score}}</span>
+          -满分
+          <span style="font-weight:bold">{{item.total_score}})</span>
+        </view>
+        <view class="weui-media-box__desc" style="color:orange">
+        耗时:{{item.took}}s  
+        开始答题:{{item.start_time}}
+        </view>
+      </view>
+      <view class="weui-panel__ft weui-cell__ft_in-access">
+        <view class="weui-media-box__desc">答卷详情</view>
+      </view>
+    </navigator>
+  </block>
+</view>
\ No newline at end of file
diff --git a/test_mini/pages/test/list.wxss b/test_mini/pages/test/list.wxss
new file mode 100644
index 0000000..a458506
--- /dev/null
+++ b/test_mini/pages/test/list.wxss
@@ -0,0 +1,5 @@
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/result.js b/test_mini/pages/test/result.js
new file mode 100644
index 0000000..269bcc9
--- /dev/null
+++ b/test_mini/pages/test/result.js
@@ -0,0 +1,76 @@
+// pages/examtest/result.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function () {
+    this.setData(getApp().globalData.testData)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  detail: function () {
+    wx.redirectTo({
+      url: 'detail?id=' + this.data.id,
+    })
+  },
+  back: function () {
+    wx.switchTab({
+      url: '/pages/main/main'
+    })
+  },
+})
\ No newline at end of file
diff --git a/test_mini/pages/test/result.json b/test_mini/pages/test/result.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/test_mini/pages/test/result.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/result.wxml b/test_mini/pages/test/result.wxml
new file mode 100644
index 0000000..4fccee8
--- /dev/null
+++ b/test_mini/pages/test/result.wxml
@@ -0,0 +1,29 @@
+<view class="page">
+	<view class="weui-msg">
+		<view class="weui-msg__icon-area" wx:if="{{is_pass}}"><i class="weui-icon-success weui-icon_msg"></i></view>
+    <view class="weui-msg__icon-area" wx:else><i class="weui-icon-warn weui-icon_msg"></i></view>
+		<view class="weui-msg__text-area">
+			<h2 class="weui-msg__title" wx:if="{{is_pass}}">恭喜您,通过考试</h2>
+      <h2 class="weui-msg__title" wx:else>很遗憾,下次加油</h2>
+			<view class="weui-msg__desc">
+      得分
+      <span style="color:green;font-weight:bold" wx:if="{{is_pass}}">{{score}}</span>
+      <span style="color:red;font-weight:bold" wx:else>{{score}}</span>
+      ——满分
+      <span style="font-weight:bold">{{total_score}}</span>
+      </view>
+      <view class="weui-msg__desc">
+      用时:
+      <span style="color:green;font-weight:bold" wx:if="{{is_pass}}">{{took}}</span>
+      <span style="color:red;font-weight:bold" wx:else>{{took}}</span>
+      秒
+      </view>
+		</view>
+		<view class="weui-msg__opr-area">
+			<view class="weui-btn-area">
+        <a class="weui-btn weui-btn_primary" bindtap="detail">查看答卷详情</a>
+				<a class="weui-btn weui-btn_default" bindtap="back">返回首页</a>
+			</view>
+		</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/test_mini/pages/test/result.wxss b/test_mini/pages/test/result.wxss
new file mode 100644
index 0000000..e45ef0f
--- /dev/null
+++ b/test_mini/pages/test/result.wxss
@@ -0,0 +1 @@
+/* pages/test/note.wxss */
\ No newline at end of file
diff --git a/test_mini/pages/test/sheet.js b/test_mini/pages/test/sheet.js
new file mode 100644
index 0000000..c444179
--- /dev/null
+++ b/test_mini/pages/test/sheet.js
@@ -0,0 +1,86 @@
+// pages/examtest/sheet.js
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  back: function (e) {
+    console.log(e.currentTarget.dataset.index);
+    var tm_index = e.currentTarget.dataset.index
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    prevPage.setData({
+      tm_index: tm_index
+    })
+    prevPage.showTm(tm_index)
+    prevPage.showOptions()
+    wx.navigateBack({
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2];  //上一个页面
+    var tms = prevPage.data.tms //取上页data里的数据也可以修改
+    this.setData({
+      tms: tms
+    })
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/test_mini/pages/test/sheet.json b/test_mini/pages/test/sheet.json
new file mode 100644
index 0000000..6cfdd8d
--- /dev/null
+++ b/test_mini/pages/test/sheet.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "答题卡"
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/sheet.wxml b/test_mini/pages/test/sheet.wxml
new file mode 100644
index 0000000..f79108e
--- /dev/null
+++ b/test_mini/pages/test/sheet.wxml
@@ -0,0 +1,13 @@
+<!--pages/examtest/sheet.wxml-->
+<view style="width:100%;display:flex;padding:20rpx;flex-wrap: wrap ">
+<view wx:for="{{tms}}" wx:key="id" >
+
+<view wx:if="{{item.user_answer && item.user_answer.length !=0 }}" class="ok" data-index="{{index}}" bindtap='back'>
+{{index+1}}
+</view>
+<view wx:else class="no" data-index="{{index}}" bindtap='back'>
+{{index+1}}
+</view>
+
+</view>
+</view>
diff --git a/test_mini/pages/test/sheet.wxss b/test_mini/pages/test/sheet.wxss
new file mode 100644
index 0000000..913bdd4
--- /dev/null
+++ b/test_mini/pages/test/sheet.wxss
@@ -0,0 +1,21 @@
+/* pages/examtest/sheet.wxss */
+.ok{
+  display: flex;
+  color:#fff;
+  background-color: green;
+  border:4rpx solid green;
+  height:100rpx;
+  width:100rpx;
+  margin:20rpx;
+  justify-content: center;
+  align-items: center;
+}
+.no{
+  display: flex;
+  border:4rpx solid red;
+  height:100rpx;
+  width:100rpx;
+  margin:20rpx;
+  justify-content: center;
+  align-items: center;
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/test.js b/test_mini/pages/test/test.js
index b5daeb4..f963fff 100644
--- a/test_mini/pages/test/test.js
+++ b/test_mini/pages/test/test.js
@@ -43,6 +43,12 @@ Page({
       })
     } catch (e) {
     }
+    try {
+      var value = wx.getStorageSync('ctms')
+      if (value) {
+        that.data.ctms = value
+      }
+    } catch (e) { }
     let mil = that.data.monitest.limit * 60 * 1000
     let starttimes = (new Date()).getTime() //时间戳
     let endtimes = starttimes + mil
@@ -78,6 +84,9 @@ Page({
    */
   onUnload: function () {
     clearInterval(getApp().globalData.timer)
+    try {
+      wx.setStorageSync('ctms', this.data.ctms)
+    } catch (e) { }
   },
 
   /**
@@ -178,6 +187,11 @@ Page({
       options: options
     })
   },
+  sheet: function () {
+    wx.navigateTo({
+      url: 'sheet',
+    })
+  },
   hand: function () {
     var that = this
     for (var i = 0, len = that.data.tms.length; i < len; i++) {
@@ -219,19 +233,35 @@ Page({
     for (var i = 0, len = that.data.tms.length; i < len; i++) {
       let tm_result = that.panTi(that.data.tms[i])
       that.data.tms[i].is_right = tm_result.is_right
+      if (tm_result.is_right == false){
+        that.data.ctms.unshift(that.data.tms[i])
+          if (that.data.ctms.length > 40) {
+            that.data.ctms.length = 40
+          }
+      }
       that.data.tms[i].score = tm_result.score
       score = score + tm_result.score
     }
     that.data.monitest.score = score
+    if (score >= that.data.monitest.pass_score){
+      that.data.monitest.is_pass = true
+    }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())
     that.data.monitest.took = Math.floor(((new Date()).getTime() - this.data.starttimes) / 1000)
-    console.log(that.data.monitest)
-    // api.request('examtest/monitest/', 'POST', that.data.monitest).then(res => {
-    //   wx.redirectTo({
-    //     url: 'note',
-    //   })
-    // })
+    api.request('examtest/monitest/', 'POST', that.data.monitest).then(res => {
+      getApp().globalData.testData = res.data
+      try {
+        wx.removeStorageSync('monitest')
+      } catch (e) {
+      }
+      wx.redirectTo({
+        url: 'result',
+      })
+    })
   }
 })
\ No newline at end of file
diff --git a/test_mini/pages/test/test.json b/test_mini/pages/test/test.json
index 9c848e5..33273aa 100644
--- a/test_mini/pages/test/test.json
+++ b/test_mini/pages/test/test.json
@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "考试中"
+  "navigationBarTitleText": "答题中"
 }
\ No newline at end of file
diff --git a/test_mini/pages/test/test.wxml b/test_mini/pages/test/test.wxml
index f8f918f..d7b91c0 100644
--- a/test_mini/pages/test/test.wxml
+++ b/test_mini/pages/test/test.wxml
@@ -53,7 +53,7 @@
     <button type="primary" size="mini" bindtap="next" disabled="{{tm_index==tm_total-1}}">下题</button>
   </view>
   <view style="width:25%">
-    <button type="primary" size="mini" bindtap="sheet">答题卡</button>
+    <a class="weui-btn weui-btn_mini weui-btn_primary" bindtap="sheet">答题卡</a>
   </view>
   <view style="width:25%">
     <a class="weui-btn weui-btn_mini weui-btn_warn" bindtap="hand">交卷</a>
diff --git a/test_mini/utils/util.js b/test_mini/utils/util.js
index 3cc2ba3..2cbf163 100644
--- a/test_mini/utils/util.js
+++ b/test_mini/utils/util.js
@@ -6,7 +6,7 @@ const formatTime = date => {
   const minute = date.getMinutes()
   const second = date.getSeconds()
 
-  return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
 const formatNumber = n => {
diff --git a/test_server/crm/migrations/0007_auto_20200320_1726.py b/test_server/crm/migrations/0007_auto_20200320_1726.py
new file mode 100644
index 0000000..73d5dd1
--- /dev/null
+++ b/test_server/crm/migrations/0007_auto_20200320_1726.py
@@ -0,0 +1,39 @@
+# Generated by Django 3.0.4 on 2020-03-20 09:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('question', '0007_auto_20200319_0846'),
+        ('crm', '0006_auto_20200310_1531'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='consumer',
+            name='is_paid',
+        ),
+        migrations.CreateModel(
+            name='PaySubject',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_delete', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('consumer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='crm.Consumer')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='question.Questioncat')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='consumer',
+            name='subjects',
+            field=models.ManyToManyField(through='crm.PaySubject', to='question.Questioncat', verbose_name='付费学科'),
+        ),
+    ]
diff --git a/test_server/crm/models.py b/test_server/crm/models.py
index a0edfc0..1fa0aa2 100644
--- a/test_server/crm/models.py
+++ b/test_server/crm/models.py
@@ -1,9 +1,10 @@
 from django.db import models
 import django.utils.timezone as timezone
-from rbac.models import CommonModel
+from rbac.models import SoftCommonModel, CommonModel
+from question.models import Questioncat
 # Create your models here.
 
-class Company(CommonModel):
+class Company(SoftCommonModel):
     """
     客户企业
     """
@@ -17,7 +18,7 @@ class Company(CommonModel):
     def __str__(self):
         return self.name
     
-class Consumer(CommonModel):
+class Consumer(SoftCommonModel):
     """
     学员
     """
@@ -27,7 +28,7 @@ class Consumer(CommonModel):
     openid = models.CharField(max_length=200, verbose_name="openid", null=True, blank=True, unique=True)
     avatar = models.CharField(default="/media/default/avatar.png",max_length=1000, null=True, blank=True, verbose_name="头像")
     nickname = models.CharField(max_length=200, verbose_name="昵称", null=True, blank=True)
-    is_paid = models.BooleanField(default=False,verbose_name="是否付费")
+    subjects = models.ManyToManyField(Questioncat, verbose_name="付费学科", through="PaySubject")
 
 
     class Meta:
@@ -35,4 +36,11 @@ class Consumer(CommonModel):
         verbose_name_plural = verbose_name
 
     def __str__(self):
-        return self.name
\ No newline at end of file
+        return self.name
+
+class PaySubject(CommonModel):
+    '''
+    付费学科关联表
+    '''
+    consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE)
+    subject = models.ForeignKey(Questioncat, on_delete=models.CASCADE)
\ No newline at end of file
diff --git a/test_server/crm/serializers.py b/test_server/crm/serializers.py
index 3f95d52..d439e61 100644
--- a/test_server/crm/serializers.py
+++ b/test_server/crm/serializers.py
@@ -24,3 +24,15 @@ class ConsumerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Consumer
         fields = '__all__'
+        depth = 1
+
+class ConsumerCUSerializer(serializers.ModelSerializer):
+    """
+    客户新增编辑序列化
+    """
+    create_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+    update_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+
+    class Meta:
+        model = Consumer
+        fields = '__all__'
\ No newline at end of file
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 4f4c288..8ebf927 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -14,9 +14,10 @@ import json
 
 from utils.custom import CommonPagination
 from rbac.permission import RbacPermission
-from .models import Company, Consumer
-from .serializers import CompanySerializer, ConsumerSerializer
+from .models import Company, Consumer, PaySubject
+from .serializers import CompanySerializer, ConsumerSerializer, ConsumerCUSerializer
 from server import settings
+from question.models import Questioncat
 
 appid = 'wx5c39b569f01c27db'
 secret = '68762892f8df2b4a0b1940c5250a8dc0'
@@ -70,9 +71,14 @@ class ConsumerViewSet(ModelViewSet):
     ordering_fields = ('id',)
     ordering = ['id']
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    filterset_fields = ('is_paid','company')
+    filterset_fields = ('company',)
     search_fields = ('^name',)
     
+    def get_serializer_class(self):
+        if self.action == 'list':
+            return ConsumerSerializer
+        else:
+            return ConsumerCUSerializer
 
     def destroy(self, request, *args, **kwargs): #逻辑删除
         instance = self.get_object()
@@ -125,8 +131,10 @@ class ConsumerViewSet(ModelViewSet):
                 obj.name = name
                 obj.username = username
                 obj.company = companyobj
-                obj.is_paid = True
                 obj.save()
+                subjects = Questioncat.objects.filter(is_subject=True,is_delete=False)
+                if subjects.exists():
+                    PaySubject.objects.create(subject=subjects.first(), consumer=obj)
             i = i + 1
         if consumerdict:
             return {"code":206,"data":consumerdict,"msg":"导入部分成功"}
diff --git a/test_server/examtest/migrations/0008_auto_20200319_1827.py b/test_server/examtest/migrations/0008_auto_20200319_1827.py
index 89ec25f..8bb176e 100644
--- a/test_server/examtest/migrations/0008_auto_20200319_1827.py
+++ b/test_server/examtest/migrations/0008_auto_20200319_1827.py
@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
             field=models.FloatField(default=0, verbose_name='判断分数'),
         ),
         migrations.CreateModel(
-            name='MoniTest',
+            name='ExamTest',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
@@ -73,8 +73,8 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='answerdetail',
-            name='monitest',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='examtest.MoniTest'),
+            name='examtest',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='examtest.ExamTest'),
         ),
         migrations.AddField(
             model_name='answerdetail',
diff --git a/test_server/examtest/migrations/0009_auto_20200319_1850.py b/test_server/examtest/migrations/0009_auto_20200319_1850.py
index 50d129f..ba19d56 100644
--- a/test_server/examtest/migrations/0009_auto_20200319_1850.py
+++ b/test_server/examtest/migrations/0009_auto_20200319_1850.py
@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
             options={'verbose_name': '答题记录', 'verbose_name_plural': '答题记录'},
         ),
         migrations.AlterModelOptions(
-            name='monitest',
+            name='examtest',
             options={'verbose_name': '自助模考', 'verbose_name_plural': '自助模考'},
         ),
     ]
diff --git a/test_server/examtest/migrations/0010_testrule_is_pass.py b/test_server/examtest/migrations/0010_testrule_is_pass.py
new file mode 100644
index 0000000..b830ded
--- /dev/null
+++ b/test_server/examtest/migrations/0010_testrule_is_pass.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-03-20 03:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('examtest', '0009_auto_20200319_1850'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='testrule',
+            name='is_pass',
+            field=models.BooleanField(default=True, verbose_name='是否通过'),
+        ),
+    ]
diff --git a/test_server/examtest/migrations/0011_auto_20200320_1115.py b/test_server/examtest/migrations/0011_auto_20200320_1115.py
new file mode 100644
index 0000000..b27fe64
--- /dev/null
+++ b/test_server/examtest/migrations/0011_auto_20200320_1115.py
@@ -0,0 +1,42 @@
+# Generated by Django 3.0.4 on 2020-03-20 03:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('examtest', '0010_testrule_is_pass'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='testrule',
+            name='is_pass',
+        ),
+        migrations.AddField(
+            model_name='examtest',
+            name='is_pass',
+            field=models.BooleanField(default=True, verbose_name='是否通过'),
+        ),
+        migrations.AddField(
+            model_name='examtest',
+            name='total_score',
+            field=models.FloatField(default=0, verbose_name='总分'),
+        ),
+        migrations.AlterField(
+            model_name='examtest',
+            name='score',
+            field=models.FloatField(default=0, verbose_name='得分'),
+        ),
+        migrations.AlterField(
+            model_name='testrule',
+            name='pass_score',
+            field=models.FloatField(default=0, verbose_name='及格分数'),
+        ),
+        migrations.AlterField(
+            model_name='testrule',
+            name='total_score',
+            field=models.FloatField(default=0, verbose_name='满分'),
+        ),
+    ]
diff --git a/test_server/examtest/migrations/0012_auto_20200320_1439.py b/test_server/examtest/migrations/0012_auto_20200320_1439.py
new file mode 100644
index 0000000..032e6ed
--- /dev/null
+++ b/test_server/examtest/migrations/0012_auto_20200320_1439.py
@@ -0,0 +1,50 @@
+# Generated by Django 3.0.4 on 2020-03-20 06:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('examtest', '0011_auto_20200320_1115'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Paper',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_delete', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('name', models.CharField(max_length=200, verbose_name='名称')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.DeleteModel(
+            name='PaperTest',
+        ),
+        migrations.AlterModelOptions(
+            name='examtest',
+            options={'verbose_name': '考试表', 'verbose_name_plural': '考试表'},
+        ),
+        migrations.AlterField(
+            model_name='examtest',
+            name='rule',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='examtest.TestRule', verbose_name='所用规则'),
+        ),
+        migrations.AlterField(
+            model_name='examtest',
+            name='type',
+            field=models.CharField(choices=[('自助模考', '自助模考'), ('押卷模考', '押卷模考')], default='自助模考', max_length=50, verbose_name='考试类型'),
+        ),
+        migrations.AddField(
+            model_name='examtest',
+            name='paper',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='examtest.Paper', verbose_name='所用试卷'),
+        ),
+    ]
diff --git a/test_server/examtest/models.py b/test_server/examtest/models.py
index 53df816..9283be5 100644
--- a/test_server/examtest/models.py
+++ b/test_server/examtest/models.py
@@ -1,11 +1,11 @@
 from django.db import models
-from rbac.models import CommonModel
+from rbac.models import SoftCommonModel, CommonModel
 from django.contrib.postgres.fields import JSONField, ArrayField
 from question.models import Questioncat, Question
 from crm.models import Consumer
 
 # Create your models here.
-class TestRule(CommonModel):
+class TestRule(SoftCommonModel):
     name = models.CharField(max_length=200, unique=True, verbose_name='名称')
     desc = models.TextField(verbose_name='描述', default='')
     subject = models.ForeignKey(Questioncat, blank=True, null=True, on_delete=models.CASCADE, verbose_name='所属学科', related_name='subject')
@@ -17,8 +17,9 @@ class TestRule(CommonModel):
     panduan_count = models.IntegerField(default=0, verbose_name='判断数量')
     panduan_score = models.FloatField(default=0, verbose_name='判断分数')
     limit = models.IntegerField(default=0, verbose_name='限时(分钟)')
-    total_score = models.IntegerField(default=0, verbose_name='满分')
-    pass_score = models.IntegerField(default=0, verbose_name='及格分数')
+    total_score = models.FloatField(default=0, verbose_name='满分')
+    pass_score = models.FloatField(default=0, verbose_name='及格分数')
+    
 
     class Meta:
         verbose_name = '出题规则'
@@ -27,31 +28,38 @@ class TestRule(CommonModel):
     def __str__(self):
         return self.name
 
-class PaperTest(CommonModel):
-    pass
-    class Meta:
-        verbose_name = '押题模考'
-        verbose_name_plural = verbose_name
 
-
-class MoniTest(CommonModel):
+class Paper(SoftCommonModel):
     name = models.CharField(max_length=200, verbose_name='名称')
-    type = models.CharField(max_length=50, default='自助模考',verbose_name='考试类型')
+
+class ExamTest(CommonModel):
+    '''
+    硬删除
+    '''
+    type_choices = (
+        ('自助模考', '自助模考'),
+        ('押卷模考', '押卷模考'),
+    )
+    name = models.CharField(max_length=200, verbose_name='名称')
+    type = models.CharField(max_length=50, default='自助模考',choices = type_choices, verbose_name='考试类型')
     limit = models.IntegerField(default=0, verbose_name='限时(分钟)')
-    rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='出题规则')
+    rule = models.ForeignKey(TestRule, on_delete=models.CASCADE, verbose_name='所用规则', null=True, blank=True)
+    paper = models.ForeignKey(Paper, on_delete=models.CASCADE, verbose_name='所用试卷', null=True, blank=True)
     consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE, verbose_name='模考人')
-    score = models.IntegerField(default=0, verbose_name='得分')
+    total_score = models.FloatField(default=0, verbose_name='总分')
+    score = models.FloatField(default=0, verbose_name='得分')
     took = models.IntegerField(default=0, verbose_name='耗时(秒)')
     start_time = models.DateTimeField(verbose_name='开始答题时间')
     end_time = models.DateTimeField(verbose_name='结束答题时间')
     detail = models.ManyToManyField(Question, related_name='答题记录', through='AnswerDetail')
+    is_pass = models.BooleanField(default=True, verbose_name='是否通过')
     class Meta:
-        verbose_name = '自助模考'
+        verbose_name = '考试表'
         verbose_name_plural = verbose_name
 
 
-class AnswerDetail(CommonModel):
-    monitest = models.ForeignKey(MoniTest, on_delete=models.CASCADE)
+class AnswerDetail(SoftCommonModel):
+    examtest = models.ForeignKey(ExamTest, on_delete=models.CASCADE)
     question = models.ForeignKey(Question, on_delete=models.CASCADE)
     user_answer = JSONField()
     score = models.FloatField(default=0, verbose_name='本题得分')
diff --git a/test_server/examtest/serializers.py b/test_server/examtest/serializers.py
index 4f6ca3b..f39f879 100644
--- a/test_server/examtest/serializers.py
+++ b/test_server/examtest/serializers.py
@@ -1,6 +1,7 @@
 from rest_framework import serializers
 from question.models import Questioncat
-from .models import TestRule, MoniTest
+from crm.models import Consumer
+from .models import TestRule, ExamTest, AnswerDetail
 
 
 
@@ -41,12 +42,36 @@ class MoniTestSerializer(serializers.ModelSerializer):
     """
     自助模考序列化
     """
-    start_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True)
-    end_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", read_only=True)
+    start_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
+    end_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
+    consumer = serializers.PrimaryKeyRelatedField(queryset=Consumer.objects.all(), required=False)
+    rule = serializers.PrimaryKeyRelatedField(queryset=TestRule.objects.all(), required=True)
     create_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
     update_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
     class Meta:
-        model = MoniTest
+        model = ExamTest
         fields = '__all__'
 
-        
+
+class ExamTestListSerializer(serializers.ModelSerializer):
+    """
+    考试列表序列化
+    """
+    start_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
+    end_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S")
+    create_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+    update_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
+    class Meta:
+        model = ExamTest
+        fields = '__all__'
+    
+class AnswerDetailSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AnswerDetail
+        fields = '__all__'
+        depth = 1
+
+class AnswerDetailCreateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AnswerDetail
+        fields = '__all__'
diff --git a/test_server/examtest/urls.py b/test_server/examtest/urls.py
index 2f8505e..de3e18c 100644
--- a/test_server/examtest/urls.py
+++ b/test_server/examtest/urls.py
@@ -1,5 +1,5 @@
 from django.urls import path,include
-from .views import TestRuleViewSet, MoniTestView
+from .views import TestRuleViewSet, MoniTestView, MyExamTestView, AnswerDetailView
 from rest_framework import routers
 
 
@@ -8,5 +8,7 @@ router.register('testrule', TestRuleViewSet, basename="testrule")
 
 urlpatterns = [
     path('monitest/',MoniTestView.as_view()),
+    path('myexamtest/',MyExamTestView.as_view()),
+    path('answerdetail/', AnswerDetailView.as_view()),
     path('', include(router.urls)),
 ]
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 631d0d9..bc4d864 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -15,60 +15,65 @@ from utils.custom import CommonPagination
 from rbac.permission import RbacPermission
 from question.models import Question
 from question.serializers import QuestionSerializer
-from .models import TestRule
-from .serializers import TestRuleSerializer, TestRuleListSerializer, TestRuleCreateSerializer, MoniTestSerializer
+from .models import TestRule, ExamTest, AnswerDetail
+from .serializers import TestRuleSerializer, TestRuleListSerializer, TestRuleCreateSerializer, MoniTestSerializer, AnswerDetailSerializer, ExamTestListSerializer, AnswerDetailCreateSerializer
 from server import settings
 from crm.authentication import ConsumerTokenAuthentication
+from utils.custom import CommonPagination
 
 # Create your views here.
 
 class MoniTestView(APIView):
     authentication_classes = [ConsumerTokenAuthentication]
     permission_classes = []
-
     def post(self, request, *args, **kwargs):
-        data = request.data
-        pass
-    def get(self, request, *args, **kwargs):
-        '''
-        生成模拟考试
-        '''
-        if request.query_params.get('rule', None):
-            ret = {}
-            testrule = TestRule.objects.get(id = request.query_params.get('rule'))
-            ret['name'] = '自助模考' + datetime.now().strftime('%Y%m%d%H%M')
-            ret['type'] = '自助模考' # 自助模拟考试
-            ret['rule'] = testrule.id
-            ret['limit'] = testrule.limit
-            ret['total_score'] = testrule.total_score
-            ret['pass_score'] = testrule.pass_score
-            ret['danxuan_count'] = testrule.danxuan_count
-            ret['danxuan_score'] = testrule.danxuan_score
-            ret['duoxuan_count'] = testrule.duoxuan_count
-            ret['duoxuan_score'] = testrule.duoxuan_score
-            ret['panduan_count'] = testrule.panduan_count
-            ret['panduan_score'] = testrule.panduan_score
-            question_queryset = Question.objects.none()
-            queryset = Question.objects.filter(is_delete=0,questioncat__in = testrule.questioncat.all())
-            if ret['danxuan_count']:
-                danxuan = queryset.filter(type='单选').order_by('?')[:ret['danxuan_count']]
-                question_queryset = question_queryset | danxuan
-            if ret['duoxuan_count']:
-                duoxuan = queryset.filter(type='多选').order_by('?')[:ret['duoxuan_count']]
-                question_queryset = question_queryset | duoxuan
-            if ret['panduan_count']:
-                panduan = queryset.filter(type='判断').order_by('?')[:ret['panduan_count']]
-                question_queryset = question_queryset | panduan
-            questions = QuestionSerializer(instance=question_queryset.order_by('type'),many=True).data
-            for i in questions:
-                if i['type'] == 1:
-                    i['total_score'] = ret['danxuan_score']
-                elif i['type'] == 2:
-                    i['total_score'] = ret['duoxuan_score']
+        serializer = MoniTestSerializer(data = request.data)
+        if serializer.is_valid():
+            instance = serializer.save(consumer = request.user)
+            if 'questions' in request.data:
+                questions = []
+                for i in request.data['questions']:
+                    question = {}
+                    question['question'] = i['id']
+                    question['examtest'] = instance.id
+                    question['score'] = i['score']
+                    if 'user_answer' in i:
+                        question['user_answer'] = i['user_answer']
+                    question['is_right'] = i['is_right']
+                    questions.append(question)
+                serializer_detail = AnswerDetailCreateSerializer(data=questions, many=True)
+                if serializer_detail.is_valid():
+                    serializer_detail.save()
+                    return Response(MoniTestSerializer(instance).data,status=status.HTTP_200_OK)
                 else:
-                    i['total_score'] = ret['panduan_score']
-            ret['questions'] = questions
-            return Response(ret)
+                    return Response(serializer_detail.errors)
+
+            else:
+                return Response({'error':'答题记录不存在'})
+        else:
+            return Response(serializer.errors)
+    
+
+class MyExamTestView(APIView):
+    authentication_classes = [ConsumerTokenAuthentication]
+    permission_classes = []
+    def get(self, request, *args, **kwargs):
+        queryset = ExamTest.objects.filter(consumer=request.user)
+        pg = CommonPagination()
+        p = pg.paginate_queryset(queryset=queryset,request=request,view=self)
+        serializer = ExamTestListSerializer(instance=p,many=True)
+        return pg.get_paginated_response(serializer.data)
+
+
+class AnswerDetailView(APIView):
+    authentication_classes = []
+    permission_classes = []
+    def get(self, request, *args, **kwargs):
+        queryset = AnswerDetail.objects.all()
+        if request.query_params.get('examtest', None):
+            queryset = queryset.filter(examtest=request.query_params.get('examtest'))
+        serializer = AnswerDetailSerializer(instance=queryset,many=True)
+        return Response(serializer.data)
 
     
 
@@ -114,4 +119,46 @@ class TestRuleViewSet(ModelViewSet):
         """
         if self.request.method == 'GET':
             self.permission_classes = []
-        return [permission() for permission in self.permission_classes]
\ No newline at end of file
+        return [permission() for permission in self.permission_classes]
+
+    @action(methods=['get'], detail=True, permission_classes=[IsAuthenticated],
+            url_path='monitest', url_name='gen_monitest')
+    def monitest(self, request, pk=None):
+        '''
+        生成自助模拟考试
+        '''
+        ret = {}
+        testrule = self.get_object()
+        ret['name'] = '自助模考' + datetime.now().strftime('%Y%m%d%H%M')
+        ret['type'] = '自助模考' # 自助模拟考试
+        ret['rule'] = testrule.id
+        ret['limit'] = testrule.limit
+        ret['total_score'] = testrule.total_score
+        ret['pass_score'] = testrule.pass_score
+        ret['danxuan_count'] = testrule.danxuan_count
+        ret['danxuan_score'] = testrule.danxuan_score
+        ret['duoxuan_count'] = testrule.duoxuan_count
+        ret['duoxuan_score'] = testrule.duoxuan_score
+        ret['panduan_count'] = testrule.panduan_count
+        ret['panduan_score'] = testrule.panduan_score
+        question_queryset = Question.objects.none()
+        queryset = Question.objects.filter(is_delete=0,questioncat__in = testrule.questioncat.all())
+        if ret['danxuan_count']:
+            danxuan = queryset.filter(type='单选').order_by('?')[:ret['danxuan_count']]
+            question_queryset = question_queryset | danxuan
+        if ret['duoxuan_count']:
+            duoxuan = queryset.filter(type='多选').order_by('?')[:ret['duoxuan_count']]
+            question_queryset = question_queryset | duoxuan
+        if ret['panduan_count']:
+            panduan = queryset.filter(type='判断').order_by('?')[:ret['panduan_count']]
+            question_queryset = question_queryset | panduan
+        questions = QuestionSerializer(instance=question_queryset.order_by('type'),many=True).data
+        for i in questions:
+            if i['type'] == 1:
+                i['total_score'] = ret['danxuan_score']
+            elif i['type'] == 2:
+                i['total_score'] = ret['duoxuan_score']
+            else:
+                i['total_score'] = ret['panduan_score']
+        ret['questions'] = questions
+        return Response(ret)
\ No newline at end of file
diff --git a/test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx b/test_server/media/20200320/7e69b28c-6a90-11ea-8b16-90cdb685c056.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a3867d18d785c728f31a3900e237495f4f6a7326
GIT binary patch
literal 13243
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

literal 0
HcmV?d00001

diff --git a/test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx b/test_server/media/20200320/a045ee7e-6a90-11ea-9c68-90cdb685c056.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..917c10f82edf3af43714368431cda757fe100c20
GIT binary patch
literal 13245
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

literal 0
HcmV?d00001

diff --git a/test_server/question/models.py b/test_server/question/models.py
index 8952115..15c00ce 100644
--- a/test_server/question/models.py
+++ b/test_server/question/models.py
@@ -1,10 +1,10 @@
 from django.db import models
-from rbac.models import CommonModel
+from rbac.models import SoftCommonModel
 from django.contrib.postgres.fields import JSONField, ArrayField
 # Create your models here.
 
 
-class Questioncat(CommonModel):
+class Questioncat(SoftCommonModel):
     name = models.CharField(max_length=200, unique=True, verbose_name='名称')
     pid = models.ForeignKey('self', verbose_name='父', null=True, blank=True, on_delete=models.CASCADE, related_name='questioncatpid')
     is_subject = models.BooleanField(default=False, verbose_name='是否是学科')
@@ -20,7 +20,7 @@ class Questioncat(CommonModel):
         return self.questioncat.count()
     
 
-class Question(CommonModel):
+class Question(SoftCommonModel):
     type_choices = (
         ('单选', '单选'),
         ('多选', '多选'),
diff --git a/test_server/rbac/models.py b/test_server/rbac/models.py
index 06c57d7..5acf02a 100644
--- a/test_server/rbac/models.py
+++ b/test_server/rbac/models.py
@@ -13,7 +13,7 @@ class SoftDeletManager(models.Manager):
     '''
     def get_queryset(self):
         """
-        在这里处理一下QuerySet, 然后返回没被标记位is_deleted的QuerySet
+        在这里处理一下QuerySet, 然后返回没被标记位is_delete的QuerySet
         """
         kwargs = {'model': self.model, 'using': self._db}
         if hasattr(self, '_hints'):
@@ -21,7 +21,7 @@ class SoftDeletManager(models.Manager):
 
         return self._queryset_class(**kwargs).filter(is_delete=False)
 
-class CommonModel(models.Model):
+class SoftCommonModel(models.Model):
     create_time = models.DateTimeField(default=timezone.now, verbose_name='创建时间', help_text='创建时间')
     update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间', help_text='修改时间')
     is_delete = models.BooleanField(default=False, verbose_name='删除标记', help_text='删除标记')
@@ -39,10 +39,18 @@ class CommonModel(models.Model):
             self.is_delete = True
             self.save(using=using)
         else:
-            return super(CommonModel, self).delete(using=using, *args, **kwargs)
+            return super(SoftCommonModel, self).delete(using=using, *args, **kwargs)
+
+class CommonModel(models.Model):
+    create_time = models.DateTimeField(default=timezone.now, verbose_name='创建时间', help_text='创建时间')
+    update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间', help_text='修改时间')
+    is_delete = models.BooleanField(default=False, verbose_name='删除标记', help_text='删除标记')
+
+    class Meta:
+        abstract = True
 
 
-class Menu(CommonModel):
+class Menu(SoftCommonModel):
     """
     功能权限:目录,菜单,权限
     """
@@ -68,7 +76,7 @@ class Menu(CommonModel):
         ordering = ['id']
 
 
-class Role(CommonModel):
+class Role(SoftCommonModel):
     """
     角色
     """
@@ -83,7 +91,7 @@ class Role(CommonModel):
     def __str__(self):
         return self.name
 
-class Organization(CommonModel):
+class Organization(SoftCommonModel):
     """
     组织架构
     """