20250208 优化调整

application/admin/controller/student/Collection.php

@@ -74,11 +74,7 @@ class Collection extends Backend
             //提示页面，没有开始的考试
             return $this->view->fetch('tishi');
         }else{
-////             $this->redirect('/admin/student/collection/examing/ids/'.$isset['exam_id'].'?ref=addtabs');
-//            echo "<script>location.href='/admin/student/collection/examing/ids/".$isset['exam_id']."';</script>";
-//            //$this->redirect('/hotelmanage/room/displayindex/ids/1');
-//            exit();
-              echo "<script>location.href='/admin/student/collection/into/ids/".$isset['exam_collection_id']."'</script>";
+            echo "<script>location.href='/admin/student/collection/into/ids/".$isset['exam_collection_id']."'</script>";
         }
         die();
         //设置过滤方法
@@ -531,26 +527,32 @@ class Collection extends Backend
             $unwin = $this->request->post('unwin/a');
             $arr = [];
             if(!empty($unwin)){
-                if(!empty($unwin['xx_id'])){
-                    $xx_name = Fault::where('fault_id',$unwin['xx_id'])->value('name');
+                if(empty($unwin['xx_id'])){
+                    $this->error('故障现象选项有空白项');
                 }
-                $yy_name = Fault::where('fault_id','in',$unwin['yy_id'])->column('name');
-                if(!empty($unwin['bw_id'])){
-                    $bw_name = Fault::where('fault_id',$unwin['bw_id'])->value('name');
+                if(empty($unwin['yy_id'][0])){
+                    $this->error('可能原因选项有空白项');
+                }
+                if(empty($unwin['bw_id'])){
+                    $this->error('故障部位选项有空白项');
                 }
-                if(!empty($unwin['pc_id'])){
-                    $pc_name = Fault::where('fault_id',$unwin['pc_id'])->value('name');
+                if(empty($unwin['pc_id'])){
+                    $this->error('排除方法选项有空白项');
                 }
+                $xx_name = Fault::where('fault_id',$unwin['xx_id'])->value('name');
+                $yy_name = Fault::where('fault_id','in',$unwin['yy_id'])->column('name');
+                $bw_name = Fault::where('fault_id',$unwin['bw_id'])->value('name');
+                $pc_name = Fault::where('fault_id',$unwin['pc_id'])->value('name');
                 $arr = [
                     'xh_id' => $unwin['xh_id'],
-                    'xx_id' => $unwin['xx_id']??'',
-                    'xx_name'=>$xx_name??'',
+                    'xx_id' => $unwin['xx_id'],
+                    'xx_name'=>$xx_name,
                     'yy_id' => implode(',',$unwin['yy_id']),
-                    'yy_name' => !empty($yy_name)? implode(',',$yy_name):'',
-                    'bw_id' => $unwin['bw_id']??'',
-                    'bw_name' => $bw_name??'',
-                    'pc_id' => $unwin['pc_id']??'',
-                    'pc_name' => $pc_namee??'',
+                    'yy_name' =>  implode(',',$yy_name),
+                    'bw_id' => $unwin['bw_id'],
+                    'bw_name' => $bw_name,
+                    'pc_id' => $unwin['pc_id'],
+                    'pc_name' => $pc_name,
                 ];
             }
             $other_report = !empty($row->other_report) ? json_decode($row->other_report,true) : [];
@@ -601,27 +603,33 @@ class Collection extends Backend
         if ($this->request->isPost()) {
             $unwin = $this->request->post('unwin/a');
             if(!empty($unwin)){
-                if(!empty($unwin['xx_id'])){
-                    $xx_name = Fault::where('fault_id',$unwin['xx_id'])->value('name');
+                if(empty($unwin['xx_id'])){
+                    $this->error('故障现象选项有空白项');
                 }
-                $yy_name = Fault::where('fault_id','in',$unwin['yy_id'])->column('name');
-                if(!empty($unwin['bw_id'])){
-                    $bw_name = Fault::where('fault_id',$unwin['bw_id'])->value('name');
+                if(empty($unwin['yy_id'][0])){
+                    $this->error('可能原因选项有空白项');
+                }
+                if(empty($unwin['bw_id'])){
+                    $this->error('故障部位选项有空白项');
                 }
-                if(!empty($unwin['pc_id'])){
-                    $pc_name = Fault::where('fault_id',$unwin['pc_id'])->value('name');
+                if(empty($unwin['pc_id'])){
+                    $this->error('排除方法选项有空白项');
                 }
+                $xx_name = Fault::where('fault_id',$unwin['xx_id'])->value('name');
+                $yy_name = Fault::where('fault_id','in',$unwin['yy_id'])->column('name');
+                $bw_name = Fault::where('fault_id',$unwin['bw_id'])->value('name');
+                $pc_name = Fault::where('fault_id',$unwin['pc_id'])->value('name');
                 $other_report = !empty($row->other_report) ? json_decode($row->other_report,true) : [];
                 foreach ($other_report as $k  =>$item){
                     if($k==$xh_id){
-                        $other_report[$k]['xx_id'] =$unwin['xx_id']??'';
-                        $other_report[$k]['xx_name'] =$xx_name??'';
+                        $other_report[$k]['xx_id'] =$unwin['xx_id'];
+                        $other_report[$k]['xx_name'] =$xx_name;
                         $other_report[$k]['yy_id'] = implode(',',$unwin['yy_id']);
-                        $other_report[$k]['yy_name'] =!empty($yy_name)? implode(',',$yy_name):'';
-                        $other_report[$k]['bw_id'] = $unwin['bw_id']??'';
-                        $other_report[$k]['bw_name'] =$bw_name??'';
-                        $other_report[$k]['pc_id'] =$unwin['pc_id']??'';
-                        $other_report[$k]['pc_name'] =$pc_name??'';
+                        $other_report[$k]['yy_name'] =implode(',',$yy_name);
+                        $other_report[$k]['bw_id'] = $unwin['bw_id'];
+                        $other_report[$k]['bw_name'] =$bw_name;
+                        $other_report[$k]['pc_id'] =$unwin['pc_id'];
+                        $other_report[$k]['pc_name'] =$pc_name;
                     }
                 }
                 $row->other_report = json_encode($other_report);

application/admin/controller/student/Exercise.php

@@ -471,7 +471,8 @@ class Exercise extends Backend
             $row['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
 
-
+        $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
+        $this->view->assign('other_report', $other_report);
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

application/admin/controller/student/Practice.php

@@ -58,10 +58,6 @@ class Practice extends Backend
             //提示页面，没有开始的考试
             return $this->view->fetch('tishi');
         }else{
-////             $this->redirect('/admin/student/collection/examing/ids/'.$isset['exam_id'].'?ref=addtabs');
-//            echo "<script>location.href='/admin/student/collection/examing/ids/".$isset['exam_id']."';</script>";
-//            //$this->redirect('/hotelmanage/room/displayindex/ids/1');
-//            exit();
             echo "<script>location.href='/admin/student/practice/into/ids/".$isset['exam_collection_id']."'</script>";
         }
         die();
@@ -493,8 +489,8 @@ class Practice extends Backend
         {
             $row['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
-
-
+        $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
+        $this->view->assign('other_report', $other_report);
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

application/admin/controller/teacher/Exams.php

@@ -164,7 +164,9 @@ class Exams extends Backend
             $row['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
 
+        $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
         if (false === $this->request->isPost()) {
+            $this->view->assign('other_report', $other_report);
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -235,6 +237,8 @@ class Exams extends Backend
         {
             $row['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
+        $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
+        $this->view->assign('other_report', $other_report);
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }
@@ -278,12 +282,57 @@ class Exams extends Backend
             return $this->selectpage();
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
-        $list = $this->model
-            ->where($where)->where('exam_collection_id',$ids)
-            ->where($this->whereExtend)->with($this->relationtTable)
-            ->order($sort, $order)
-            ->paginate($limit);
-        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        // $list = $this->model
+        //     ->where($where)->where('exam_collection_id',$ids)
+        //     ->where($this->whereExtend)->with($this->relationtTable)
+        //     ->order($sort, $order)
+        //     ->paginate($limit);
+        $list = Db::name('seat')->select();
+        foreach ($list as $key => $value) {
+            $sim = Db::name('sim')->where('seat_id',$value['seat_id'])->find();
+            if(!empty($sim['sim_state'])){
+                switch ($sim['sim_state']) {
+                    case '1':
+                        $sim_state = '在线';
+                        break;
+                    case '2':
+                        $sim_state = '模拟器离线';
+                        break;
+                    default:
+                        $sim_state = '';
+                        break;
+                }
+            }else{
+                $sim_state = '';
+            }
+            $exam = $this->model->where('exam_collection_id',$ids)->where('seat_id',$value['seat_id'])->find();
+            $user_username = '';
+            $user_nickname = '';
+            $exam_status = '未登录';
+            $total_score = 0;
+            $fault_names = '';
+            $exam_id = 0;
+            if(!empty($exam)){
+                $user_username = $exam['user_username']??'';
+                $user_nickname = $exam['user_nickname']??'';
+                if($exam['exam_status']==4){
+                    $exam_status= '答题中';
+                }else if($exam['exam_status']==5){
+                    $exam_status= '已交卷';
+                }
+                $total_score = $exam['total_score']??'';
+                $fault_names = $exam['fault_names']??'';
+                $exam_id = $exam['exam_id']??0;
+            }
+            $list[$key]['user_username'] = $user_username;
+            $list[$key]['user_nickname'] = $user_nickname;
+            $list[$key]['exam_status'] = $exam_status;
+            $list[$key]['total_score'] = $total_score;
+            $list[$key]['fault_names'] = $fault_names;
+            $list[$key]['exam_id'] = $exam_id;
+            $list[$key]['sim_state'] = $sim_state;
+        }
+        $result = ['total' => count($list), 'rows' => $list];
         return json($result);
     }
 

application/admin/view/student/collection/examing.html

@@ -176,7 +176,6 @@
                         </div>
                     </div>
                     <div class="form-group" style="text-align: center">
-<!--                        <button type="button" class="btn btn-success btn-replace" style="text-align: center;width: 10%;margin-top: 5%">{:__('暂存')}</button>-->
                         <button type="submit" class="btn btn-info" style="text-align: center;width: 10%;margin-top: 5%">{:__('交卷')}</button>
                     </div>
                     </form>

application/admin/view/student/collection/tishi.html

@@ -69,7 +69,7 @@
                         <div style="color: rgb(192, 74, 84)">3.超时10分钟不交卷自动结束</div>
                     </div>
                     <div class="form-group" style="text-align: center">
-                        <button type="button" class="btn btn-warning">{:__('暂无开启的考试，请耐心等待...')}</button>
+                        <button type="button" class="btn btn-warning">{:__('暂无考试')}</button>
                     </div>
                 </form>
             </div>

application/admin/view/student/exercise/analysis.html

@@ -85,6 +85,30 @@
                             <td>{$row.fault_name_three|htmlentities}</td>
                         </tr>
                         <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                        </tr>
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
+                        </tr>
+                        <tr>
+                            <td style="width:5%">序号</td>
+                            <td style="width:15%">故障现象</td>
+                            <td style="width:20%">可能原因</td>
+                            <td style="width:10%">故障部位</td>
+                            <td style="width:35%">排除方法</td>
+                        </tr>
+                        {if $other_report}
+                        {volist name="other_report" id="vo2"}
+                        <tr style="height: 60px">    
+                            <td>{++$key}</td>
+                            <td>{$vo2.xx_name|htmlentities}</td>
+                            <td>{$vo2.yy_name|htmlentities}</td>
+                            <td>{$vo2.bw_name|htmlentities}</td>
+                            <td>{$vo2.pc_name|htmlentities}</td>
+                        </tr>
+                        {/volist}
+                        {/if}
+                        <tr>
                             <td style="width:5%">序号</td>
                             <td style="width:25%">评分标准</td>
                             <td style="width:10%">扣分</td>
@@ -92,9 +116,6 @@
                             <td style="width:45%">扣分原因</td>
                         </tr>
                         <tr>
-                            <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
-                        </tr>
-                        <tr>
                             <td>1</td>
                             <td>故障现象少写或错写1条扣1分</td>
                             <td>{$row.xianxian_score|htmlentities}</td>

application/admin/view/student/practice/analysis.html

@@ -84,6 +84,31 @@
                         <td>{if $row.fault_three_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                         <td>{$row.fault_name_three|htmlentities}</td>
                     </tr>
+                    
+                    <tr>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                    </tr>
+                    <tr>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
+                    </tr>
+                    <tr>
+                        <td style="width:5%">序号</td>
+                        <td style="width:15%">故障现象</td>
+                        <td style="width:20%">可能原因</td>
+                        <td style="width:10%">故障部位</td>
+                        <td style="width:35%">排除方法</td>
+                    </tr>
+                    {if $other_report}
+                    {volist name="other_report" id="vo2"}
+                    <tr style="height: 60px">    
+                        <td>{++$key}</td>
+                        <td>{$vo2.xx_name|htmlentities}</td>
+                        <td>{$vo2.yy_name|htmlentities}</td>
+                        <td>{$vo2.bw_name|htmlentities}</td>
+                        <td>{$vo2.pc_name|htmlentities}</td>
+                    </tr>
+                    {/volist}
+                    {/if}
                     <tr>
                         <td style="width:5%">序号</td>
                         <td style="width:25%">评分标准</td>
@@ -92,9 +117,6 @@
                         <td style="width:45%">扣分原因</td>
                     </tr>
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
-                    </tr>
-                    <tr>
                         <td>1</td>
                         <td>故障现象少写或错写1条扣1分</td>
                         <td>{$row.xianxian_score|htmlentities}</td>

application/admin/view/student/practice/tishi.html

@@ -69,7 +69,7 @@
                         <div style="color: rgb(192, 74, 84)">3.超时10分钟不交卷自动结束</div>
                     </div>
                     <div class="form-group" style="text-align: center">
-                        <button type="button" class="btn btn-warning">{:__('暂无开启的练习，请耐心等待...')}</button>
+                        <button type="button" class="btn btn-warning">{:__('暂无练习')}</button>
                     </div>
                 </form>
             </div>

application/admin/view/teacher/exams/edit.html

@@ -89,6 +89,32 @@
                         <td colspan="3">二.维修报告表(15分)</td>
                     </tr>
                     <tr>
+                        <td colspan="3">
+                            <table class="new_table">
+                                <tr>
+                                    <td colspan="4">学员答作答情况</td>
+                                </tr>
+                                <tr>
+                                    <td>故障现象</td>
+                                    <td>可能原因</td>
+                                    <td>故障部位</td>
+                                    <td>排除方法</td>
+                                </tr>
+                                {if $other_report}
+                                {volist name="other_report" id="vo2"}
+                                <tr style="height: 30px">    
+                                    <td>{$vo2.xx_name|htmlentities}</td>
+                                    <td>{$vo2.yy_name|htmlentities}</td>
+                                    <td>{$vo2.bw_name|htmlentities}</td>
+                                    <td>{$vo2.pc_name|htmlentities}</td>
+                                </tr>
+                                {/volist}
+                                {/if}
+                            </table>
+                        </td>
+                    </tr>
+
+                    <tr>
                         <td>故障现象少写或错写1条扣1分</td>
                         <td><input type="text" name="row[xianxian_score]" value="{$row.xianxian_score|htmlentities}"></td>
                         <td>

application/admin/view/teacher/exams/view.html

@@ -87,6 +87,31 @@
                         <td>{if $row.fault_three_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                         <td>{$row.fault_name_three|htmlentities}</td>
                     </tr>
+                    
+                    <tr>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                    </tr>
+                    <tr>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
+                    </tr>
+                    <tr>
+                        <td style="width:5%">序号</td>
+                        <td style="width:15%">故障现象</td>
+                        <td style="width:20%">可能原因</td>
+                        <td style="width:10%">故障部位</td>
+                        <td style="width:35%">排除方法</td>
+                    </tr>
+                    {if $other_report}
+                    {volist name="other_report" id="vo2"}
+                    <tr style="height: 60px">    
+                        <td>{++$key}</td>
+                        <td>{$vo2.xx_name|htmlentities}</td>
+                        <td>{$vo2.yy_name|htmlentities}</td>
+                        <td>{$vo2.bw_name|htmlentities}</td>
+                        <td>{$vo2.pc_name|htmlentities}</td>
+                    </tr>
+                    {/volist}
+                    {/if}
                     <tr>
                         <td style="width:5%">序号</td>
                         <td style="width:25%">评分标准</td>
@@ -94,9 +119,6 @@
                         <td style="width:10%">报告情况</td>
                         <td style="width:45%">扣分原因</td>
                     </tr>
-                    <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
-                    </tr>
                     <tr style="height: 60px">
                         <td>1</td>
                         <td>故障现象少写或错写1条扣1分</td>

application/admin/view/teacher/practice/persent.html

@@ -45,7 +45,7 @@
 
             <div id="" class="tab-content">
                 <div class="tab-pane fade active in" id="two">
-                    <div class="tableTitle" style="font-size: 16px;margin: 10px 0">考试列表</div>
+                    <div class="tableTitle" style="font-size: 16px;margin: 10px 0">坐席列表</div>
                     <div class="widget-body no-padding">
                         <div id="toolbar1" class="toolbar">
                             <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>

public/assets/js/backend/student/collection.js

@@ -217,10 +217,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 Form.events.selectpage(obj);
             });
 
+
             Form.api.bindevent($("form[role=form]"), function(data, ret) {
                 if(ret.code==1){
-                    // Backend.api.addtabs( ret.url,'得分分析');
-                    Backend.api.addtabs( ret.url);
+                    Backend.api.addtabs( ret.url,'成绩管理');
+                    Backend.api.closetabs('/admin/student/collection/index');
                 }
             });
         },

public/assets/js/backend/student/practice.js

@@ -225,6 +225,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Form.api.bindevent($("form[role=form]"), function(data, ret) {
                 if(ret.code==1){
                     Backend.api.addtabs( ret.url,'得分分析');
+                    Backend.api.closetabs('/admin/student/practice/index');
                 }
             });
         },

public/assets/js/backend/teacher/collection.js

@@ -268,6 +268,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     fixedColumns: true,
                     fixedRightNumber: 1,
                     searchFormVisible:false,
+                    pageSize: 30,
                     Search:false,
                     columns: [
                         [

public/assets/js/backend/teacher/exams.js

@@ -237,28 +237,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                 searchFormVisible:false,
                 showExport:false,
                 search:false,
+                pagination:false,
                 columns: [
                     [
                         // {checkbox: true},
                         {field: 'seat_id', title: __('座号')},
-                        {field: '', title: __('模拟器状态'),
+                        {field: 'sim_state', title: __('模拟器状态'),
                             formatter: function(value, row,index) {
-                                return '<span class="text-success">就绪</span>';
+                                return '<span class="text-success">'+value+'</span>';
                             }
                         },
                         {field: 'user_username', title: __('学员学号')},
                         {field: 'user_nickname', title: __('学员姓名')},
-                        {field: '', title: __('考试状态'),
+                        {field: 'exam_status', title: __('考试状态'),
                             formatter: function(value, row,index) {
-                                return '<span class="text-success">已交卷</span>';
+                                return '<span class="text-success">'+value+'</span>';
                             }
                         },
                         {field: 'total_score', title: __('考试成绩')},
                         {field: 'fault_names', title: __('出题题目'),formatter: Table.api.formatter.faultname},
-                        {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.answerName},
-                        {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.answerName},
-                        {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.answerName},
-                        {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.answerName},
+                        // {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.answerName},
+                        // {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.answerName},
+                        // {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.answerName},
+                        // {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.answerName},
                         {field: 'operate', title: __('Operate'), table: table1,
                             events: Table.api.events.operate,
                             // formatter: Table.api.formatter.operate
@@ -271,6 +272,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                                     title: '成绩详情',
                                     classname: 'btn btn-info btn-xs btn-magic btn-dialog',
                                     extend: 'data-area=\'["55%","95%"]\'',
+                                    visible: function (row) {
+                                        if(row.total_score>0){
+                                            return true;
+                                        }
+                                        return false;
+                                    },
                                     url: 'teacher/exams/view',
                                 }
                             ],
@@ -312,7 +319,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                         {field: 'yuanyin_socre', title: __('可能原因扣分'),editable:true},
                         {field: 'buwei_score', title: __('故障部位扣分'),editable:true},
                         {field: 'fangfa_score', title: __('排除方法扣分'),editable:true},
-                        // {field: 'jielun_score', title: __('修复结论扣分'),editable:true},
                         {field: 'overtime_score', title: __('超时扣分'),editable:true},
                         {field: 'operate', title: __('Operate'), table: table1,
                             events: Table.api.events.operate,

public/assets/js/backend/teacher/practice.js

@@ -238,11 +238,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             }
                         },
                         {field: 'total_score', title: __('考试成绩')},
-                        {field: 'fault_names', title: __('出题题目'),formatter: Table.api.formatter.faultname},
-                        {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.faultname},
-                        {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.faultname},
-                        {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.faultname},
-                        {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.faultname},
+                        // {field: 'fault_names', title: __('出题题目'),formatter: Table.api.formatter.faultname},
+                        // {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.faultname},
+                        // {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.faultname},
+                        // {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.faultname},
+                        // {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.faultname},
                     ]
                 ]
             });
@@ -300,6 +300,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     fixedColumns: true,
                     fixedRightNumber: 1,
                     searchFormVisible:false,
+                    pageSize: 30,
                     Search:false,
                     columns: [
                         [
@@ -330,50 +331,77 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         $(".qudui_input").val(qudui_total);
                         $(".xueyuan_input").val(xueyuan_total);
                     },
-                });
-
-                // 为表格绑定事件
-                Table.api.bindevent(table);
+                    // 点击每一个单选框时触发的操作
+                    onCheck:function(row){
+                        rel_Ids.push(row.id);
+                        qudui_total = qudui_total+1;
+                        xueyuan_total = xueyuan_total+row.department_admin_count;
 
-                table.on('click-row.bs.table', function (e, row, element) {
-                    console.log(rel_Ids)
-                    // console.log('row')
-                    if(!$.inArray(row.id,rel_Ids)){
-                        if(Config.row_info.starttime>0){
-                            Layer.alert('考试正在进行中,只可增加区队不可取消区队');
-                            return false;
-                        }
-                        arr = $.grep(rel_Ids, function(value) {
-                            return value != row["id"];
-                        });
-                        rel_Ids = arr;
-                        qudui_total = qudui_total-1;
-                        xueyuan_total = xueyuan_total-row.department_admin_count;
-                    }else if(rel_Ids.indexOf(row.id)>-1){
-                        if(Config.row_info.starttime>0){
-                            Layer.alert('考试正在进行中,只可增加区队不可取消区队');
-                            return false;
-                        }
+                        $(".depart_ids").val(rel_Ids.join());
+                        $(".qudui_total").html(qudui_total);
+                        $(".xueyuan_total").html(xueyuan_total);
+                        $(".qudui_input").val(qudui_total);
+                        $(".xueyuan_input").val(xueyuan_total);
+                    },
+                    // 取消每一个单选框时对应的操作；
+                    onUncheck:function(row){
                         var index = rel_Ids.indexOf(row.id);
                         if(index > -1) {
                             rel_Ids.splice(index, 1);
                         }
                         qudui_total = qudui_total-1;
                         xueyuan_total = xueyuan_total-row.department_admin_count;
-                    }else{
-                        qudui_total = qudui_total+1;
-                        xueyuan_total = xueyuan_total+row.department_admin_count;
-                        rel_Ids.push(row.id);
+
+                        $(".depart_ids").val(rel_Ids.join());
+                        $(".qudui_total").html(qudui_total);
+                        $(".xueyuan_total").html(xueyuan_total);
+                        $(".qudui_input").val(qudui_total);
+                        $(".xueyuan_input").val(xueyuan_total);
                     }
-                    console.log(qudui_total);
-                    console.log(xueyuan_total);
-                    $(".depart_ids").val(rel_Ids.join());
-                    $(".qudui_total").html(qudui_total);
-                    $(".xueyuan_total").html(xueyuan_total);
-                    $(".qudui_input").val(qudui_total);
-                    $(".xueyuan_input").val(xueyuan_total);
                 });
 
+                // 为表格绑定事件
+                Table.api.bindevent(table);
+
+                // table.on('click-row.bs.table', function (e, row, element) {
+                //     console.log(rel_Ids)
+                //     // console.log('row')
+                //     if(!$.inArray(row.id,rel_Ids)){
+                //         if(Config.row_info.starttime>0){
+                //             Layer.alert('考试正在进行中,只可增加区队不可取消区队');
+                //             return false;
+                //         }
+                //         arr = $.grep(rel_Ids, function(value) {
+                //             return value != row["id"];
+                //         });
+                //         rel_Ids = arr;
+                //         qudui_total = qudui_total-1;
+                //         xueyuan_total = xueyuan_total-row.department_admin_count;
+                //     }else if(rel_Ids.indexOf(row.id)>-1){
+                //         if(Config.row_info.starttime>0){
+                //             Layer.alert('考试正在进行中,只可增加区队不可取消区队');
+                //             return false;
+                //         }
+                //         var index = rel_Ids.indexOf(row.id);
+                //         if(index > -1) {
+                //             rel_Ids.splice(index, 1);
+                //         }
+                //         qudui_total = qudui_total-1;
+                //         xueyuan_total = xueyuan_total-row.department_admin_count;
+                //     }else{
+                //         qudui_total = qudui_total+1;
+                //         xueyuan_total = xueyuan_total+row.department_admin_count;
+                //         rel_Ids.push(row.id);
+                //     }
+                //     console.log(qudui_total);
+                //     console.log(xueyuan_total);
+                //     $(".depart_ids").val(rel_Ids.join());
+                //     $(".qudui_total").html(qudui_total);
+                //     $(".xueyuan_total").html(xueyuan_total);
+                //     $(".qudui_input").val(qudui_total);
+                //     $(".xueyuan_input").val(xueyuan_total);
+                // });
+
                 $(document).on('change', '#c-question_setting_method', function () {
                     if($(this).val()==1){
                         $(".btn-sm,.btn-task").css('display','none');