科普答题

addons/exam/controller/Paper.php

@@ -107,10 +107,10 @@ class Paper extends Base
         $user_id = $this->auth->id;
 
         //检查考试状态
-        $check = Db::name('exam_grade')->where('user_id', $user_id)->where('status',1)->find();
+        /*$check = Db::name('exam_grade')->where('user_id', $user_id)->where('status',1)->find();
         if($check){
-            //$this->success('您有其他考试正在进行中,即将继续考试',0);//直接给成功，数据返回0，前端跳转
-        }
+            $this->success('您有其他考试正在进行中,即将继续考试',0);//直接给成功，数据返回0，前端跳转
+        }*/
 
         //检查试卷
         $paper   = PaperModel::get($paper_id);
@@ -125,17 +125,17 @@ class Paper extends Base
         }
 
         //时间限制
-        if ($paper['start_time'] > 0 && $paper['start_time'] > time()) {
+        /*if ($paper['start_time'] > 0 && $paper['start_time'] > time()) {
             $this->error('该试卷未开始，不能参与考试');
         }
         if ($paper['end_time'] > 0 && $paper['end_time'] < time()) {
             $this->error('该试卷已结束，不能参与考试');
-        }
+        }*/
 
         //考试资格
-        if(!in_array($user_id,explode(',',$paper['user_ids']))){
+        /*if(!in_array($user_id,explode(',',$paper['user_ids']))){
             $this->error('您不能参加该考试');
-        }
+        }*/
 
         //次数限制
         if ($paper['limit_count'] > 0){
@@ -193,6 +193,7 @@ class Paper extends Base
         $request       = Request::instance();
         $user_id       = $this->auth->id;
 
+        $grade_id      = $request->post('grade_id');
         $paper_id      = $request->post('paper_id/d', 0);
         $questions     = $request->post('questions/a', []);
         $start_time    = $request->post('start_time/d', time());
@@ -203,11 +204,10 @@ class Paper extends Base
             $this->error('提交数据有误');
         }
 
-        $check = Db::name('exam_grade')->where('status',1)->where('user_id',$user_id)->where('paper_id',$paper_id)->find();
+        $check = Db::name('exam_grade')->where('status',1)->where('grade_id',$grade_id)->where('user_id',$user_id)->where('paper_id',$paper_id)->find();
         if(!$check){
             $this->error('交卷有误,或者您已交卷');
         }
-        $grade_id = $check['id'];
         $start_time = $check['start_time'];
 
 
@@ -255,7 +255,6 @@ class Paper extends Base
             $update = array_merge(
                 $result,
                 [
-                    'cate_id'  => $paper['cate_id'],
                     'updatetime' => time(),
                     'date' => date('Y-m-d'),
 
@@ -273,20 +272,10 @@ class Paper extends Base
 
         $result['nickname'] = $this->auth->nickname;
 
-        //删除本试卷分数最低的试卷
-        $old_grade = Db::name('exam_grade')->where('user_id',$user_id)->where('paper_id',$paper_id)->where('id','NEQ',$grade_id)->find();
-        if(!empty($old_grade)){
-            if($old_grade['score'] <= $update['score']){
-                $delete_id = $old_grade['id'];
-            }else{
-                $delete_id = $grade_id;
-            }
-            Db::name('exam_grade')->where('id',$delete_id)->delete();
-        }
-        //删除本试卷分数最低的试卷
+
 
         $this->success('',$result);
-//        return json($result);
+
     }
 
     /*

application/admin/controller/exam/Paper.php

@@ -200,7 +200,7 @@ class Paper extends Backend
             $this->error('及格分数不能大于总分');
         }*/
 
-        $params['start_time'] = $params['start_time'] ?: 0;
+        /*$params['start_time'] = $params['start_time'] ?: 0;
         $params['end_time']   = $params['end_time'] ?: 0;
 
         if ($params['start_time']) {
@@ -215,7 +215,7 @@ class Paper extends Backend
             if (!$params['start_time']) {
                 $this->error('请先选择开始时间');
             }
-        }
+        }*/
 
         // 固定选题模式
         if ($params['mode'] == 'FIX') {

application/admin/model/exam/QuestionModel.php

@@ -48,7 +48,7 @@ class QuestionModel extends BaseModel
             'SINGLE'   => '单选题',
             'MULTI'    => '多选题',
 //            'FILL'     => '填空题',
-            'SHORT'    => '简答题',
+//            'SHORT'    => '简答题',
 //            'MATERIAL' => '材料题',
         ];
     }

application/admin/view/exam/paper/add.html

@@ -88,7 +88,7 @@
 
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
             <div class="col-xs-12 col-sm-8">
                 <input id="c-start_time" data-rule="match(lte, row[end_time], date);" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:date('Y-m-d H:i:s')}">
@@ -100,7 +100,7 @@
                 <input id="c-end_time" data-rule="match(gte, row[start_time], date);" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="">
                 <p class="text-info">* 试卷使用时间，清空则不限制试卷使用时间</p>
             </div>
-        </div>
+        </div>-->
 
 
 

application/admin/view/exam/paper/edit.html

@@ -86,7 +86,7 @@
         </div>
 
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
             <div class="col-xs-12 col-sm-8">
                 <input id="c-start_time" data-rule="match(lte, row[end_time], date);" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">
@@ -98,7 +98,7 @@
                 <input id="c-end_time" data-rule="match(gte, row[start_time], date);" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">
                 <p class="text-info">* 试卷使用时间，清空则不限制试卷使用时间</p>
             </div>
-        </div>
+        </div>-->
 
 
 

application/admin/view/exam/paper/extend.html

@@ -183,23 +183,23 @@
                 switch (this.mode) {
                     case 'FIX':
                         if (quantity == 0) {
-                            Toastr.error('固定模式下，试卷题数不能为0')
+                            Toastr.error('试卷题数不能为0')
                             return false
                         }
                         if (total_score == 0) {
-                            Toastr.error('固定模式下，试卷总分不能为0')
+                            Toastr.error('试卷总分不能为0')
                             return false
                         }
                         if (this.questions.length == 0) {
-                            Toastr.error('固定模式下，试卷题目不能为空')
+                            Toastr.error('试卷题目不能为空')
                             return false
                         }
                         if (this.summary.total_score != total_score) {
-                            Toastr.error('固定模式下，试卷总分与题目总分不一致')
+                            Toastr.error('试卷总分与题目总分不一致')
                             return false
                         }
                         if (this.summary.total_quantity != quantity) {
-                            Toastr.error('固定模式下，试卷题数与题目总数不一致')
+                            Toastr.error('试卷题数与题目总数不一致')
                             return false
                         }
 

application/admin/view/exam/question/add.html

@@ -27,7 +27,7 @@
             <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
             <div class="col-xs-12 col-sm-8">
                 <div id="c-title1" v-show="showTitleEditor">
-                    <textarea id="c-title" class="form-control editor" name="row[title]"></textarea>
+                    <input id="c-title" class="form-control" name="row[title]" type="text">
                 </div>
                 <input id="c-title2" class="form-control" name="row[title_fill]" type="text" @change="changeTitle" v-model:value="title" v-show="showTitleFill">
             </div>
@@ -204,8 +204,8 @@
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Explain')}:</label>
             <div class="col-xs-12 col-sm-8">
-                <!--            <input id="c-explain" class="form-control" name="row[explain]" type="text">-->
-                <textarea id="c-explain" class="form-control editor" name="row[explain]"></textarea>
+                <input id="c-explain" class="form-control" name="row[explain]" type="text">
+<!--                <textarea id="c-explain" class="form-control editor" name="row[explain]"></textarea>-->
             </div>
         </div>
 

application/admin/view/exam/question/edit.html

@@ -18,7 +18,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div id="c-title1">
-              <textarea id="c-title" class="form-control editor" name="row[title]">{$row.title|htmlentities}</textarea>
+                <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
             </div>
             <input id="c-title2" class="form-control" name="row[title_fill]" type="text" @change="changeTitle" v-model:value="title">
         </div>
@@ -203,8 +203,8 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Explain')}:</label>
         <div class="col-xs-12 col-sm-8">
-          <!--            <input id="c-explain" class="form-control" name="row[explain]" type="text" value="{$row.explain|htmlentities}">-->
-          <textarea id="c-explain" class="form-control editor" name="row[explain]">{$row.explain|htmlentities}</textarea>
+              <input id="c-explain" class="form-control" name="row[explain]" type="text" value="{$row.explain|htmlentities}">
+<!--          <textarea id="c-explain" class="form-control editor" name="row[explain]">{$row.explain|htmlentities}</textarea>-->
         </div>
     </div>
 

public/assets/js/backend/exam/paper.js

@@ -73,13 +73,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                         {field: 'total_score', title: __('Total_score'), operate: false},
                         // {field: 'pass_score', title: __('Pass_score'), operate: false},
                         {field: 'limit_count', title: __('Limit_count'), operate: false},
-                        {
+                        /*{
                             field: 'mode',
                             title: __('Mode'),
                             searchList: {"RANDOM": __('Random'), "FIX": __('Fix')},
                             formatter: Table.api.formatter.normal
-                        },
-                        {
+                        },*/
+                        /*{
                             field: 'limit_time',
                             title: __('Limit_time'),
                             operate: false,
@@ -87,23 +87,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                             formatter: function (value) {
                                 return Controller.api.formatDuring(value)
                             }
-                        },
-                        {
+                        },*/
+                        /*{
                             field: 'start_time',
                             title: __('Start_time'),
                             operate: 'RANGE',
                             addclass: 'datetimerange',
                             autocomplete: false,
                             formatter: Table.api.formatter.datetime
-                        },
-                        {
+                        },*/
+                      /*  {
                             field: 'end_time',
                             title: __('End_time'),
                             operate: 'RANGE',
                             addclass: 'datetimerange',
                             autocomplete: false,
                             formatter: Table.api.formatter.datetime
-                        },
+                        },*/
 //                        {field: 'is_only_room', title: __('Is_only_room'), searchList: {"1":__('Yes'),"0":__('No')}, formatter: Table.api.formatter.toggle},
                         {
                             field: 'status',
@@ -316,7 +316,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                         let configs = $('#c-configs').val()
                         console.log('configs', configs)
                         if (!configs) {
-                            Layer.alert('请配置试卷出题规则')
+                            Layer.alert('请选题')
                             return false
                         }