20250116 调整

application/admin/controller/student/Exam.php

@@ -2,6 +2,8 @@
 
 namespace app\admin\controller\student;
 
+use app\admin\model\Fault;
+use app\admin\model\Report;
 use app\common\controller\Backend;
 use app\common\model\Config as ConfigModel;
 use think\Db;
@@ -60,6 +62,40 @@ class Exam extends Backend
         $row['start_time'] = $rows->start_time;
         $row['end_time'] = $rows->end_time;
 
+        $fault_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
+        $row['fault_name_one'] = Fault::where('fault_id',$fault_list[0]['fault_id'])->value('name');
+        $row['fault_name_two'] = Fault::where('fault_id',$fault_list[1]['fault_id'])->value('name');
+        $row['fault_name_three'] = Fault::where('fault_id',$fault_list[2]['fault_id'])->value('name');
+
+        if($row['xianxian_score']>0 && empty($row['xianxian_content']))
+        {
+            $row['xianxian_content_name'] = '未选择';
+        }else{
+            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
+            $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
+        }
+        if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
+        {
+            $row['yuanyin_content_name'] = '未选择';
+        }else{
+            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
+            $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
+        }
+
+        if($row['buwei_score']>0 &&empty($row['buwei_content']))
+        {
+            $row['buwei_content_name'] = '未选择';
+        }else{
+            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
+            $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
+        }
+        if($row['fangfa_score']>0 && empty($row['fangfa_content']))
+        {
+            $row['fangfa_content_name'] = '未选择';
+        }else{
+            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
+            $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
+        }
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

application/admin/controller/student/Practice.php

@@ -422,14 +422,14 @@ class Practice extends Backend
         {
             $row['xianxian_content_name'] = '未选择';
         }else{
-            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->column('xx_name');
+            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
             $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
         }
         if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
         {
             $row['yuanyin_content_name'] = '未选择';
         }else{
-            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->column('yy_name');
+            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
             $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
         }
 
@@ -437,14 +437,14 @@ class Practice extends Backend
         {
             $row['buwei_content_name'] = '未选择';
         }else{
-            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->column('bw_name');
+            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
             $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
         }
         if($row['fangfa_score']>0 && empty($row['fangfa_content']))
         {
             $row['fangfa_content_name'] = '未选择';
         }else{
-            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->column('pc_name');
+            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
             $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
         }
 

application/admin/controller/teacher/Exams.php

@@ -147,14 +147,14 @@ class Exams extends Backend
         {
             $row['xianxian_content_name'] = '未选择';
         }else{
-            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->column('xx_name');
+            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
             $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
         }
         if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
         {
             $row['yuanyin_content_name'] = '未选择';
         }else{
-            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->column('yy_name');
+            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
             $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
         }
 
@@ -162,14 +162,14 @@ class Exams extends Backend
         {
             $row['buwei_content_name'] = '未选择';
         }else{
-            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->column('bw_name');
+            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
             $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
         }
         if($row['fangfa_score']>0 && empty($row['fangfa_content']))
         {
             $row['fangfa_content_name'] = '未选择';
         }else{
-            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->column('pc_name');
+            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
             $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
         }
 
@@ -228,14 +228,14 @@ class Exams extends Backend
         {
             $row['xianxian_content_name'] = '未选择';
         }else{
-            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->column('xx_name');
+            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
             $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
         }
         if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
         {
             $row['yuanyin_content_name'] = '未选择';
         }else{
-            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->column('yy_name');
+            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
             $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
         }
 
@@ -243,14 +243,14 @@ class Exams extends Backend
         {
             $row['buwei_content_name'] = '未选择';
         }else{
-            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->column('bw_name');
+            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
             $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
         }
         if($row['fangfa_score']>0 && empty($row['fangfa_content']))
         {
             $row['fangfa_content_name'] = '未选择';
         }else{
-            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->column('pc_name');
+            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
             $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
         }
 

application/admin/controller/teacher/Practice.php

@@ -405,26 +405,22 @@ class Practice extends Backend
         }
         $this->error(__('No rows were updated'));
     }
-    public function persent()
+    public function persent($ids = null)
     {
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if (false === $this->request->isAjax()) {
-
-            $examlist = Exams::select();
-            foreach ($examlist as $k => $v){
-                $examlist[$k]['score'] = Db::name('real_exam_score')->where('exam_id',$v['exam_id'])->find();
-            }
-            $this->view->assign('examlist', $examlist);
+            $this->assignConfig('ids', $ids);
             return $this->view->fetch();
         }
+        $exam_ids = $this->exam_model->where('exam_collection_id',$ids)->column('exam_id');
         //如果发送的来源是 Selectpage，则转发到 Selectpage
         if ($this->request->request('keyField')) {
             return $this->selectpage();
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         $list = Db::name('real_exam_comp_request')
-            ->where($where)->where('exam_collection_type',1)
+            ->where($where)->where('exam_id','in',$exam_ids)
             ->order($sort, $order)
             ->paginate($limit);
         unset($v);
@@ -432,11 +428,12 @@ class Practice extends Backend
         return json($result);
     }
 
-    public function examing()
+    public function examing($ids = null)
     {
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if (false === $this->request->isAjax()) {
+            $this->assignConfig('ids', $ids);
             return $this->view->fetch();
         }
         //如果发送的来源是 Selectpage，则转发到 Selectpage
@@ -444,21 +441,21 @@ class Practice extends Backend
             return $this->selectpage();
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
-        $list = $this->model
-            ->where($where)->where($this->whereExtend)
+        $list = $this->exam_model
+            ->where($where)->where($this->whereExtend)->where(['starttime'=>['>',0],'endtime'=>['>',0]])
             ->order($sort, $order)
             ->paginate($limit);
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
 
-    public function start($ids = null){
-//        $row = $this->model->get($ids);
-//        if (!$row) {
-//            $this->error(__('No Results were found'));
-//        }
-//        $params['starttime'] = time();
-//        $result = $row->allowField(true)->save($params);
-        $this->success('开始成功');
-    }
+//    public function start($ids = null){
+////        $row = $this->model->get($ids);
+////        if (!$row) {
+////            $this->error(__('No Results were found'));
+////        }
+////        $params['starttime'] = time();
+////        $result = $row->allowField(true)->save($params);
+//        $this->success('开始成功');
+//    }
 }

application/admin/model/teacher/Exams.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\model\teacher;
 
+use app\admin\model\Report;
 use think\Model;
 use think\Db;
 use traits\model\SoftDelete;
@@ -79,27 +80,35 @@ class Exams extends Model
     //现象
     public function getXianxiangNamesAttr($value, $data)
     {
-        $xianxiang_name = '';
+        $xianxian_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('xianxian_content');
+        $xianxian = Report::where(['xx_id'=>['in',json_decode($xianxian_content,true)]])->group('xx_name')->column('xx_name');
+        $xianxiang_name = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
         return $xianxiang_name;
     }
     //原因
     public function getYuanyinNamesAttr($value, $data)
     {
-        $yuanyin_name = '';
+        $yuanyin_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('yuanyin_content');
+        $yuanyin = Report::where(['xx_id'=>['in',json_decode($yuanyin_content,true)]])->group('yy_name')->column('yy_name');
+        $yuanyin_name = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
         return $yuanyin_name;
     }
 
     //部位
     public function getBuweiNamesAttr($value, $data)
     {
-        $buwei_name = '';
+        $buwei_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('buwei_content');
+        $buwei = Report::where(['xx_id'=>['in',json_decode($buwei_content,true)]])->group('bw_name')->column('bw_name');
+        $buwei_name = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
         return $buwei_name;
     }
 
     //方法
     public function getFangfaNamesAttr($value, $data)
     {
-        $fangfa_name = '';
+        $fangfa_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('fangfa_content');
+        $fangfa = Report::where(['xx_id'=>['in',json_decode($fangfa_content,true)]])->group('pc_name')->column('pc_name');
+        $fangfa_name = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
         return $fangfa_name;
     }
 

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

@@ -136,7 +136,6 @@
                                         </select>
                                         <input type="text" class="form-control" readonly name="unwin[<%=index%>][request_status]" value="<%if(row["request_status"]==1){%>已申请<%}else if(row["request_status"]==2){ %>已送达<%}else if(row["request_status"]==3){%>驳回<%}else{%>未申请<%}%>" style="width: 430px;">
                                         <span class="btn btn-sm btn-danger btn-remove" title="移除"><i class="fa fa-times"></i></span>
-
                                     </dd>
                                 </script>
                             </div>
@@ -157,7 +156,6 @@
                                     <dd style="margin-right: 87%">
                                         <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>
                                     </dd>
-<!--                                        hide-->
                                     <textarea name="row[other_report]" class="form-control hide other_report" cols="30" rows="5">{$row.other_report}</textarea>
                                 </dl>
                                 <script type="text/html" id="other_suppliertpl1">
@@ -171,30 +169,6 @@
                                         <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][yy_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"2","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.yy_id%>"/>
                                         <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][bw_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"3","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.bw_id%>"/>
                                         <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][pc_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"4","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.pc_id%>"/>
-
-
-
-
-
-<!--                                            <input style="width: 250px;" data-rule="required" data-multiple="true"  data-source="category/index" class="form-control selectpage" name="unwin[<%=index%>][xx_id]" type="text" value="">-->
-<!--                                            <select class="form-control" name="unwin[<%=index%>][yy_id]" style="width: 250px;">-->
-<!--                                                <option value="" >请选择</option>-->
-<!--                                                {foreach name="yuanyin" item="vo"}-->
-<!--                                                <option value="{$vo.fault_id}" <%if(row.yy_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>-->
-<!--                                                {/foreach}-->
-<!--                                            </select>-->
-<!--                                            <select class="form-control" name="unwin[<%=index%>][bw_id]" style="width: 250px;">-->
-<!--                                                <option value="" >请选择</option>-->
-<!--                                                {foreach name="buwei" item="vo"}-->
-<!--                                                <option value="{$vo.fault_id}" <%if(row.bw_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>-->
-<!--                                                {/foreach}-->
-<!--                                            </select>-->
-<!--                                            <select class="form-control" name="unwin[<%=index%>][pc_id]" style="width: 250px;">-->
-<!--                                                <option value="" >请选择</option>-->
-<!--                                                {foreach name="paichu" item="vo"}-->
-<!--                                                <option value="{$vo.fault_id}" <%if(row.pc_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>-->
-<!--                                                {/foreach}-->
-<!--                                            </select>-->
                                         <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
                                     </dd>
                                 </script>

application/admin/view/student/exam/view.html

@@ -57,37 +57,42 @@
             <div class="tab-pane tab_log1" style="display: block">
                 <table class="new_table">
                     <tr>
-                        <td style="width:15%">序号</td>
-                        <td style="width:20%">评分标准</td>
-                        <td style="width:15%">扣分</td>
-                        <td style="width:15%">维修情况</td>
+                        <td style="width:5%">序号</td>
+                        <td style="width:25%">评分标准</td>
+                        <td style="width:10%">扣分</td>
+                        <td style="width:10%">维修情况</td>
+                        <td style="width:45%">题目</td>
                     </tr>
                     <tr>
-                        <td colspan="4" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
                     </tr>
                     <tr>
                         <td>1</td>
                         <td>故障一未排除扣25分</td>
                         <td>{$row.fault_one_score|htmlentities}</td>
                         <td>{if $row.fault_one_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.fault_name_one|htmlentities}</td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>故障二未排除扣25分</td>
                         <td>{$row.fault_two_score|htmlentities}</td>
                         <td>{if $row.fault_two_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.fault_name_two|htmlentities}</td>
                     </tr>
                     <tr>
-                        <td>2</td>
+                        <td>3</td>
                         <td>故障三未排除扣25分</td>
                         <td>{$row.fault_three_score|htmlentities}</td>
                         <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 style="width:15%">序号</td>
-                        <td style="width:20%">评分标准</td>
-                        <td style="width:15%">扣分</td>
-                        <td style="width:15%">报告情况</td>
+                        <td style="width:5%">序号</td>
+                        <td style="width:25%">评分标准</td>
+                        <td style="width:10%">扣分</td>
+                        <td style="width:10%">报告情况</td>
+                        <td style="width:45%">扣分原因</td>
                     </tr>
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
@@ -97,24 +102,28 @@
                         <td>故障现象少写或错写1条扣1分</td>
                         <td>{$row.xianxian_score|htmlentities}</td>
                         <td>{if $row.xianxian_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.xianxian_content_name|htmlentities}</td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>可能原因少写或错写1条扣1分</td>
                         <td>{$row.yuanyin_socre|htmlentities}</td>
                         <td>{if $row.yuanyin_socre eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.yuanyin_content_name|htmlentities}</td>
                     </tr>
                     <tr>
                         <td>3</td>
                         <td>故障部位少写或错写1条扣1分</td>
                         <td>{$row.buwei_score|htmlentities}</td>
                         <td>{if $row.buwei_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.buwei_content_name|htmlentities}</td>
                     </tr>
                     <tr>
                         <td>4</td>
                         <td>排除方法少写或错写1条扣1分</td>
                         <td>{$row.fangfa_score|htmlentities}</td>
                         <td>{if $row.fangfa_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                        <td>{$row.fangfa_content_name|htmlentities}</td>
                     </tr>
 <!--                    <tr>-->
 <!--                        <td>5</td>-->
@@ -123,19 +132,15 @@
 <!--                        <td>{if $row.jielun_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>-->
 <!--                    </tr>-->
                     <tr>
-                        <td colspan="4" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
                     </tr>
                     <tr>
                         <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
-                        <td colspan="2">{$row.overtime_score|htmlentities}</td>
+                        <td colspan="3">{$row.overtime_score|htmlentities}</td>
                     </tr>
-<!--                    <tr>-->
-<!--                        <td colspan="2">扣分小计</td>-->
-<!--                        <td colspan="2">超时</td>-->
-<!--                    </tr>-->
                     <tr>
                         <td colspan="2">五.成绩</td>
-                        <td colspan="2">{$row.total|htmlentities}</td>
+                        <td colspan="3">{$row.total|htmlentities}</td>
                     </tr>
                 </table>
             </div>

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

@@ -179,7 +179,7 @@
                             </div>
                         </div>
                         <div class="form-group" style="text-align: center">
-                            <button type="button" class="btn btn-success btn-save" style="text-align: center;width: 10%;margin-top: 5%">{:__('暂存')}</button>
+                            <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/teacher/practice/persent.html

@@ -66,7 +66,7 @@
             <div class="form-group layer-footer" style="margin-top: 3%;text-align: center">
                 <label class="control-label col-xs-12 col-sm-2"></label>
                 <div class="col-xs-12 col-sm-8">
-                    <button type="submit" class="btn btn-info">{:__('关闭')}</button>
+                    <button type="button" class="btn btn-info btn-closes">{:__('关闭')}</button>
                 </div>
             </div>
         </form>

public/assets/js/backend/department/admin.js

@@ -171,6 +171,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 //固定右侧列数
                 fixedRightNumber: 1,
+                search:false,
+                searchFormVisible:true,
                 singleSelect : true, //
             });
 

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

@@ -78,6 +78,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                 fixedRightNumber: 1,
                 searchFormVisible:true,
                 singleSelect : true, //
+                search:false,
                 columns: [
                     [
                         {checkbox: true},
@@ -346,7 +347,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                     success:function(data){
                         if(data.code==1){
                             Backend.api.closetabs('/ZQOtIMLKud.php/teacher/exams/persent/ids/'+Config.ids)
-                            Backend.api.addtabs('teacher/collection','考试列表');
+                            // Backend.api.addtabs('teacher/collection','考试列表');
                         }
                     },
                     error:function(){

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

@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:true,
+                search:false,
                 columns: [
                     [
                         {checkbox: true},
@@ -126,8 +127,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         persent: function () {
             Table.api.init({
                 extend: {
-                    index_url: 'teacher/practice/persent' + location.search,
-                    indexed_url: 'teacher/practice/examing' + location.search,
+                    index_url: 'teacher/practice/persent/ids/'+Config.ids + location.search,
+                    indexed_url: 'teacher/practice/examing/ids/'+ Config.ids+ location.search,
                     table: 'teacher_exams',
                 }
             });
@@ -136,8 +137,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
-                pk: 'exam_id',
-                sortName: 'exam_id',
+                pk: 'rel_id',
+                sortName: 'rel_id',
                 toolbar: '#toolbar',
                 fixedColumns: true,
                 fixedRightNumber: 1,
@@ -168,7 +169,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             buttons: [
                                 {
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '已送',
                                     icon: 'fa fa-check',
                                     title: '已送',
                                     classname: 'btn btn-success btn-xs btn-magic btn-ajax',
@@ -184,7 +185,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     },
                                 },{
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '驳回',
                                     icon: 'fa fa-reply-all',
                                     title: '驳回',
                                     classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
@@ -231,18 +232,48 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         },
                         {field: 'user_username', title: __('学员学号')},
                         {field: 'user_nickname', title: __('学员姓名')},
-                        {field: '', title: __('状态'),
+                        {field: '', title: __('考试状态'),
                             formatter: function(value, row,index) {
                                 return '<span class="text-success">已交卷</span>';
                             }
                         },
-                        {field: 'total_score', title: __('模拟成绩')},
+                        {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},
                     ]
                 ]
             });
 
             // 为表格绑定事件
             Table.api.bindevent(table1);
+
+
+            //关闭考试 并且
+            $(document).on('click', '.btn-closes', function () {
+                var ids  = Config.ids;
+                Backend.api.closetabs('/ZQOtIMLKud.php/teacher/practice/persent/ids/'+Config.ids)
+                // Backend.api.addtabs('teacher/practice','练习列表');
+                // $.ajax({
+                //     type:'post',
+                //     url:'teacher/collection/multi',
+                //     data:{ids:ids,params:'exam_collection_state=3'},  //重点必须为一个变量如：data
+                //     success:function(data){
+                //         if(data.code==1){
+                //             Backend.api.closetabs('/ZQOtIMLKud.php/teacher/exams/persent/ids/'+Config.ids)
+                //             Backend.api.addtabs('teacher/collection','考试列表');
+                //         }
+                //     },
+                //     error:function(){
+                //         layer.alert("操作失败");
+                //         return;
+                //     }
+                // })
+            });
+
+
         },
         add: function () {
             Controller.api.bindevent();

public/assets/js/backend/teacher/task.js

@@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:true,
+                search:false,
                 columns: [
                     [
                         {checkbox: true},