试卷

application/admin/controller/exam/Paper.php

@@ -196,9 +196,9 @@ class Paper extends Backend
      */
     protected function valid(&$params)
     {
-        if ($params['pass_score'] > $params['total_score']) {
+        /*if ($params['pass_score'] > $params['total_score']) {
             $this->error('及格分数不能大于总分');
-        }
+        }*/
 
         $params['start_time'] = $params['start_time'] ?: 0;
         $params['end_time']   = $params['end_time'] ?: 0;
@@ -229,12 +229,12 @@ class Paper extends Backend
         }
 
         $limit_time = 0;
-        if ($params['limit_time_hour']) {
+        /*if ($params['limit_time_hour']) {
             $limit_time += $params['limit_time_hour'] * 60 * 60;
         }
         if ($params['limit_time_minute']) {
             $limit_time += $params['limit_time_minute'] * 60;
-        }
+        }*/
         $params['limit_time'] = $limit_time;
     }
 

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

@@ -7,27 +7,7 @@
 <div id="app">
     <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-cate_id" data-rule="required" data-source="exam/cate/selectpage"
-                       data-params='{"custom[kind]":"QUESTION","isTree":true}' class="form-control selectpage" name="row[cate_id]"
-                       type="text" value="">
-            </div>
-        </div>-->
-
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Kind')}:</label>
-            <div class="col-xs-12 col-sm-8">
-
-                <select  id="c-kind" data-rule="required" class="form-control selectpicker" name="row[kind]">
-                    {foreach name="kindList" item="vo"}
-                        <option value="{$key}" {in name="key" value="RANDOM"}selected{/in}>{$vo}</option>
-                    {/foreach}
-                </select>
 
-            </div>
-        </div>-->
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
             <div class="col-xs-12 col-sm-8">
@@ -72,13 +52,7 @@
                        step="1" min="1" value="100" placeholder="请输入试卷总分数">
             </div>
         </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Pass_score')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-pass_score" data-rule="required" class="form-control" name="row[pass_score]" type="number"
-                       step="1" min="1" placeholder="请输入及格分数">
-            </div>
-        </div>
+
 
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Mode')}:</label>
@@ -87,7 +61,7 @@
                 <div class="radio">
                     {foreach name="modeList" item="vo"}
                     <label for="row[mode]-{$key}">
-                      <input @change="changeMode" id="row[mode]-{$key}" name="row[mode]" type="radio" value="{$key}" {in name="key" value="RANDOM" }checked{/in} /> {$vo}
+                      <input @change="changeMode" id="row[mode]-{$key}" name="row[mode]" type="radio" value="{$key}" {in name="key" value="RANDOM" }checked{/in} /> 选题
                     </label>
                     {/foreach}
                 </div>
@@ -110,18 +84,7 @@
             </div>
 
         </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Limit_time')}:</label>
-            <div class="col-xs-12 col-sm-8" style="line-height: 31px;">
-                <input id="c-limit_time" data-rule="required" class="form-control hide" name="row[limit_time]" type="number"
-                       step="1" min="0" value="0" style="width: 200px" placeholder="考试限时，0不限制">
 
-                <input id="c-limit_time_hour" data-rule="required" class="form-control" name="row[limit_time_hour]"
-                       type="number" step="1" min="0" max="23" value="0" style="width: 100px" placeholder="考试限时小时">时
-                <input id="c-limit_time_minute" data-rule="required" class="form-control" name="row[limit_time_minute]"
-                       type="number" step="1" min="0" max="60" value="60" style="width: 100px" placeholder="考试限时分钟，0不限制">分
-            </div>
-        </div>
 
 
 
@@ -139,25 +102,7 @@
             </div>
         </div>
 
-       <!-- <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Is_only_room')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-is_only_room" name="row[is_only_room]" type="hidden" value="{$row.is_only_room|default=0}">
-                <a href="javascript:;" data-toggle="switcher" class="btn-is_only_room" data-input-id="c-is_only_room" data-yes="1" data-no="0" >
-                    <i class="fa fa-toggle-on text-success fa-flip-horizontal text-gray fa-2x"></i>
-                </a>
-                <p class="text-info">* 开启该功能后，该试卷将不再显示于前端试卷列表，仅考场可使用</p>
-            </div>
-        </div>-->
-
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-end_time" 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 class="form-group">
             <label class="control-label col-xs-12 col-sm-2">每人限制考试次数:</label>
@@ -182,12 +127,6 @@
         </div>
 
 
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">可参加考试的用户:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-user_ids" data-source="user/user/index" data-multiple="true" data-order-by="id desc" data-pagination="false" data-field="nickname" class="form-control selectpage" name="row[user_ids]" type="text" value="">
-            </div>
-        </div>-->
 
 
         <div class="form-group layer-footer">

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

@@ -7,14 +7,7 @@
 <div id="app">
     <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-cate_id" data-rule="required" data-source="exam/cate/selectpage"
-                       data-params='{"custom[kind]":"QUESTION","isTree":true}' class="form-control selectpage" name="row[cate_id]"
-                       type="text" value="{$row.cate_id|htmlentities}">
-            </div>
-        </div>-->
+
 
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
@@ -60,13 +53,6 @@
                        value="{$row.total_score|htmlentities}" step="1" min="1" placeholder="请输入试卷总分数">
             </div>
         </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Pass_score')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-pass_score" data-rule="required" class="form-control" name="row[pass_score]" type="number"
-                       value="{$row.pass_score|htmlentities}" step="1" min="1" placeholder="请输入及格分数">
-            </div>
-        </div>
 
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Mode')}:</label>
@@ -75,7 +61,7 @@
                 <div class="radio">
                     {foreach name="modeList" item="vo"}
                     <label for="row[mode]-{$key}">
-                        <input @change="changeMode" id="row[mode]-{$key}" name="row[mode]" type="radio" value="{$key}" {in name="key" value="$row.mode" }checked{/in} /> {$vo}
+                        <input @change="changeMode" id="row[mode]-{$key}" name="row[mode]" type="radio" value="{$key}" {in name="key" value="$row.mode" }checked{/in} /> 选题
                     </label>
                     {/foreach}
                 </div>
@@ -89,7 +75,7 @@
                 <input id="c-configs" data-rule="required" class="form-control hide" name="row[configs]" type="text"
                        value="{$row.configs|htmlentities}">
 
-                {include file="../application/admin/view/exam/paper/configs_setting.html" /}
+<!--                {include file="../application/admin/view/exam/paper/configs_setting.html" /}-->
             </div>
 
             <div class="col-xs-12 col-sm-8" v-show="mode === 'FIX'">
@@ -98,19 +84,7 @@
                 {include file="../application/admin/view/exam/paper/configs_setting_fix.html" /}
             </div>
         </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('Limit_time')}:</label>
-            <div class="col-xs-12 col-sm-8" style="line-height: 31px;">
-                <input id="c-limit_time" data-rule="required" class="form-control hide" name="row[limit_time]"
-                       value="{$row.limit_time|default=0}" type="number" step="1" min="0" placeholder="考试限时，0不限制"
-                       style="width: 200px">
-
-                <input id="c-limit_time_hour" data-rule="required" class="form-control" name="row[limit_time_hour]"
-                       type="number" step="1" min="0" max="23" value="0" style="width: 100px" placeholder="考试限时小时">时
-                <input id="c-limit_time_minute" data-rule="required" class="form-control" name="row[limit_time_minute]"
-                       type="number" step="1" min="0" max="60" value="60" style="width: 100px" placeholder="考试限时分钟，0不限制">分
-            </div>
-        </div>
+
 
         <div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
@@ -126,24 +100,7 @@
             </div>
         </div>
 
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">仅用于考场:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-is_only_room" name="row[is_only_room]" type="hidden" value="{$row.is_only_room|default=0}">
-                <a href="javascript:;" data-toggle="switcher" class="btn-is_only_room" data-input-id="c-is_only_room" data-yes="1" data-no="0" >
-                    <i class="fa fa-toggle-on text-success {if condition="!isset($row['is_only_room']) || !$row['is_only_room']"}fa-flip-horizontal text-gray{/if} fa-2x"></i>
-                </a>
-                <p class="text-info">* 开启该功能后，该试卷将不再显示于前端试卷列表，仅考场可使用</p>
-            </div>
-        </div>-->
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">{:__('End_time')}:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-end_time" 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 class="form-group">
             <label class="control-label col-xs-12 col-sm-2">每人限制考试次数:</label>
@@ -168,12 +125,7 @@
             </div>
         </div>
 
-        <!--<div class="form-group">
-            <label class="control-label col-xs-12 col-sm-2">可参加考试的用户:</label>
-            <div class="col-xs-12 col-sm-8">
-                <input id="c-user_ids" data-source="user/user/index" data-multiple="true" data-order-by="id desc" data-pagination="false" data-field="nickname" class="form-control selectpage" name="row[user_ids]" type="text" value="{$row.user_ids}">
-            </div>
-        </div>-->
+
 
         <div class="form-group layer-footer">
             <label class="control-label col-xs-12 col-sm-2"></label>

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

@@ -71,7 +71,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                         // {field: 'configs', title: __('Configs'), operate: 'LIKE'},
                         {field: 'quantity', title: __('Quantity'), operate: false},
                         {field: 'total_score', title: __('Total_score'), operate: false},
-                        {field: 'pass_score', title: __('Pass_score'), operate: false},
+                        // {field: 'pass_score', title: __('Pass_score'), operate: false},
                         {field: 'limit_count', title: __('Limit_count'), operate: false},
                         {
                             field: 'mode',