20250207 优化调整

application/admin/controller/student/Collection.php

@@ -155,7 +155,7 @@ class Collection extends Backend
         return $this->view->fetch();
     }
 
-    public  function  examing($ids = null)
+    public function examing($ids = null)
     {
         $row = $this->exam_model->get($ids);
         if(!$row){
@@ -166,7 +166,6 @@ class Collection extends Backend
             if(Env::get('app.is_fault')){
                 $url = config('site.url_type').'/sim/real-exam/student/exam/submit/'.$ids;
                 $ret = json_decode(send_get($url),true);
-                // halt($ret);
                 if($ret['code']!=200){
                     $this->error($ret['msg']);
                 }
@@ -244,23 +243,16 @@ class Collection extends Backend
 
                     //根据故障部位 数组
                     $fault_arr = [$fault_right_list[0]['fault_id'],$fault_right_list[1]['fault_id'],$fault_right_list[2]['fault_id']];
+                    
                     //根据故障部位查找，匹配的排除方法
                     $paichu_arr =  Report::where(['bw_id'=>['in',$fault_arr]])->column('pc_id');
                     //根据故障部位查找，匹配可能原因
                     $yy_arr =  Report::where(['bw_id'=>['in',$fault_arr]])->column('yy_id');
+
                     //查找故障现象 数组
                     $partent_fault_id = Fault::where(['fault_id'=>['in',$fault_arr]])->column('parent_fault_id');
 
-                    $issetValue = '';
-                    $issetValue_count = 0;
-                    //出题的 判断故障现象 是否有重复的，拿出重复的fault_id 和重复次数
-                    $countedValues = array_count_values($partent_fault_id);
-                    foreach ($countedValues as $value => $count) {
-                        if ($count > 1) {
-                            $issetValue = $value;
-                            $issetValue_count = $count;
-                        }
-                    }
+                    //获取数组
                     $other_report = json_decode($params['other_report'],true);
                     if(!empty($other_report)){
                         foreach ($other_report as $key => $em){
@@ -274,95 +266,30 @@ class Collection extends Backend
                             $fangfa_arr[] = $em['pc_id'];
                         }
                     }
-
-                    $xxValue = '';
-                    $xxValue_count = 0;
-                    //维修报告 判断故障现象 是否有重复的，拿出重复的fault_id 和重复次数
-                    $xxcountedValues = array_count_values($xianxian_arr);
-                    foreach ($xxcountedValues as $v => $t) {
-                        if ($t > 1) {
-                            $xxValue = $v;
-                            $xxValue_count = $t;
-                        }
-                    }
-                    //故障现象  判断数量是否一致,
-                    if(count($partent_fault_id)!=count($xianxian_arr)){
-                        foreach ($partent_fault_id as $k0 =>$t0){
-                            if(!in_array($t0,$xianxian_arr)){
-                                //错写
-                                $xianxian_score = 1+$xianxian_score;
-//                                echo "错写:".$t0."@@@@".$xianxian_score."<br/>";
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t0,
-                                    'cx_type'=>'错写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t0])->value('name'),
-                                ];
-                                $xianxian_score = 1+$xianxian_score;
-//                                echo "少写:".$t0."@@@@".$xianxian_score."<br/>";
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t0,
-                                    'cx_type'=>'少写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t0])->value('name'),
-                                ];
-                            }
-                        }
-                        foreach ($xianxian_arr as $k01 =>$t01){
-                            if(!in_array($t01,$partent_fault_id)){
-                                $xianxian_score = 1+$xianxian_score;
-//                                echo "多写:".$t01."@@@@".$xianxian_score."<br/>";
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t01,
-                                    'cx_type'=>'多写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t01])->value('name'),
-                                ];
-                            }
-                        }
-                    }else{ //数量相同
-                        //计算故障现象分数
-                        foreach ($partent_fault_id as $k1 =>$t){
-                            if(!in_array($t,$xianxian_arr)){
-                                $xianxian_score = 1+$xianxian_score;
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t,
-                                    'cx_type'=>'少写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t])->value('name'),
-                                ];
-                            }
-                        }
-                        foreach ($xianxian_arr as $k2 =>$t2){
-                            if(!in_array($t2,$partent_fault_id)){
-                                $xianxian_score = 1+$xianxian_score;
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t2,
-                                    'cx_type'=>'错写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t2])->value('name'),
-                                ];
-                                $xianxian_score = 1+$xianxian_score;
-//                                echo "多写:".$t2."@@@@".$xianxian_score."<br/>";
-                                $xianxian_content[] = [
-                                    'cx_id'=>$t2,
-                                    'cx_type'=>'多写',
-                                    'cx_name'=>Fault::where(['fault_id'=>$t2])->value('name'),
-                                ];
-                            }
-                        }
-                        if($xxValue_count!=$issetValue_count){
+                    
+                    //故障现象 分数 start
+                    foreach ($partent_fault_id as $k1 =>$t){
+                        if(!in_array($t,$xianxian_arr)){
                             $xianxian_score = 1+$xianxian_score;
                             $xianxian_content[] = [
-                                'cx_id'=>$xxValue,
-                                'cx_type'=>'错写',
-                                'cx_name'=>Fault::where(['fault_id'=>$xxValue])->value('name'),
+                                'cx_id'=>$t,
+                                'cx_type'=>'少写',
+                                'cx_name'=>Fault::where(['fault_id'=>$t])->value('name'),
                             ];
-                            //多写
+                        }
+                    }
+                    foreach ($xianxian_arr as $k2 =>$t2){
+                        if(!in_array($t2,$partent_fault_id)){
                             $xianxian_score = 1+$xianxian_score;
                             $xianxian_content[] = [
-                                'cx_id'=>$xxValue,
-                                'cx_type'=>'多写',
-                                'cx_name'=>Fault::where(['fault_id'=>$xxValue])->value('name'),
+                                'cx_id'=>$t2,
+                                'cx_type'=>'错写',
+                                'cx_name'=>Fault::where(['fault_id'=>$t2])->value('name'),
                             ];
-//                            echo "多写:".$xxValue."####".$xianxian_score."<br/>";
                         }
                     }
+                    //故障现象 end
+
 
                     //故障部位 start
                     foreach ($fault_arr as $k11 =>$t11){
@@ -384,16 +311,10 @@ class Collection extends Backend
                                 'cx_type'=>'错写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t12])->value('name'),
                             ];
-                            //多写
-                            $buwei_score = 1+$buwei_score;
-                            $buwei_content[] = [
-                                'cx_id'=>$t12,
-                                'cx_type'=>'多写',
-                                'cx_name'=>Fault::where(['fault_id'=>$t12])->value('name'),
-                            ];
                         }
                     }
                     //故障部位 end
+                    
 
                     //排除方法 start
                     //循环固定的排除方法，匹配作答的排除方法
@@ -416,12 +337,6 @@ class Collection extends Backend
                                 'cx_type'=>'错写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t22])->value('name'),
                             ];
-                            $fangfa_score = 1+$fangfa_score;
-                            $fangfa_content[] = [
-                                'cx_id'=>$t22,
-                                'cx_type'=>'多写',
-                                'cx_name'=>Fault::where(['fault_id'=>$t22])->value('name'),
-                            ];
                         }
                     }
                     //排除方法 end
@@ -447,20 +362,14 @@ class Collection extends Backend
                                 'cx_type'=>'错写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t32])->value('name'),
                             ];
-                            $yuanyin_socre = 1+$yuanyin_socre;
-                            $yuanyin_content[] = [
-                                'cx_id'=>$t32,
-                                'cx_type'=>'多写',
-                                'cx_name'=>Fault::where(['fault_id'=>$t32])->value('name'),
-                            ];
                         }
                     }
                     //可能原因 end
                 }
-                 $weixiu_score = $xianxian_score+$yuanyin_socre+$buwei_score+$fangfa_score;
-                 if($weixiu_score>15){
-                     $weixiu_score = 15;
-                 }
+                $weixiu_score = $xianxian_score+$yuanyin_socre+$buwei_score+$fangfa_score;
+                if($weixiu_score>15){
+                    $weixiu_score = 15;
+                }
 
                 //是否超时
                 $overtime_fen = intval((time()-$info['endtime']) / 60);
@@ -480,15 +389,19 @@ class Collection extends Backend
                 $params['fault_two_score'] = $fault_two_score;//得分;
                 $params['fault_three_score'] = $fault_three_score;//得分;
 
+
                 $params['xianxian_score'] = $xianxian_score;//得分;
                 $params['xianxian_content'] = json_encode($xianxian_content);//错题;
-//                $params['yuanyin_socre'] = $yuanyin_socre;//得分;
-//                $params['yuanyin_content'] = !empty($yuanyin_arr) ? json_encode($yuanyin_arr) : '';//错题;
+
+                $params['yuanyin_socre'] = $yuanyin_socre;//得分;
+                $params['yuanyin_content'] = json_encode($yuanyin_content);//错题;
+
                 $params['buwei_score'] = $buwei_score;//得分;
                 $params['buwei_content'] = json_encode($buwei_content);//错题;
-//                $params['fangfa_score'] = $fangfa_score;//得分;
-//                $params['fangfa_content'] = !empty($fangfa_arr) ? json_encode($fangfa_arr):'';//错题;
-//                $params['jielun_score'] = $jielun_score;//得分;
+
+                $params['fangfa_score'] = $fangfa_score;//得分;
+                $params['fangfa_content'] = json_encode($fangfa_content);//错题;
+
                 $params['overtime_score'] = $overtime_score;//得分;
                 Db::name('real_exam_score')->insert($params);
 
@@ -618,18 +531,18 @@ class Collection extends Backend
             if(!empty($unwin)){
                 $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','in',$unwin['bw_id'])->column('name');
-                $pc_name = Fault::where('fault_id','in',$unwin['pc_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,
                     'yy_id' => implode(',',$unwin['yy_id']),
                     'yy_name' => implode(',',$yy_name),
-                    'bw_id' => implode(',',$unwin['bw_id']),
-                    'bw_name' => implode(',',$bw_name),
-                    'pc_id' => implode(',',$unwin['pc_id']),
-                    'pc_name' => implode(',',$pc_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) : [];
@@ -653,10 +566,15 @@ class Collection extends Backend
         $this->view->assign('paichu', $paichu);
 
         $row->other_report_count = 0;
+        $xxid = [];
         if(!empty($row->other_report)){
             $row->other_report_count = count(json_decode($row->other_report,true));
+            $otherreport = json_decode($row->other_report,true);
+            foreach ($otherreport as $k  =>$item){
+                array_push($xxid,$item['xx_id']);
+            }
         }
-
+        $row->xxid = $xxid;
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }
@@ -677,8 +595,8 @@ class Collection extends Backend
             if(!empty($unwin)){
                 $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','in',$unwin['bw_id'])->column('name');
-                $pc_name = Fault::where('fault_id','in',$unwin['pc_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){
@@ -686,10 +604,10 @@ class Collection extends Backend
                         $other_report[$k]['xx_name'] =$xx_name;
                         $other_report[$k]['yy_id'] = implode(',',$unwin['yy_id']);
                         $other_report[$k]['yy_name'] =implode(',',$yy_name);
-                        $other_report[$k]['bw_id'] = implode(',',$unwin['bw_id']);
-                        $other_report[$k]['bw_name'] =implode(',',$bw_name);
-                        $other_report[$k]['pc_id'] =implode(',',$unwin['pc_id']);
-                        $other_report[$k]['pc_name'] =implode(',',$pc_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);
@@ -719,8 +637,8 @@ class Collection extends Backend
                     $row->other_report_text = [
                         'xx_id'=>$item['xx_id'],
                         'yy_id'=>explode(',',$item['yy_id']),
-                        'bw_id'=>explode(',',$item['bw_id']),
-                        'pc_id'=>explode(',',$item['pc_id']),
+                        'bw_id'=>$item['bw_id'],
+                        'pc_id'=>$item['pc_id'],
                         'xh_id'=>$item['xh_id']
                     ];
                 }

application/admin/controller/teacher/Collection.php

@@ -110,14 +110,21 @@ class Collection extends Backend
                 //匹配的学员自动加入  mx_real_exam_fault 考试故障关联表
                 $fault_list = Fault::where(['sim_type' => $params['sim_type'], 'fault_state' => 0,'fault_type'=>3])->select();
                 if($params['question_setting_method']==1){ //系统随机
-                    $faultlist = Fault::where(['sim_type' => $params['sim_type'], 'fault_state' => 0,'fault_type'=>3])->group('parent_fault_id')->select();
-                    $fault_key = array_rand($faultlist, 3);
+                    $fault_key1 = array_rand($fault_list);
+                    $fault_key2 = array_rand($fault_list);
+                    $fault_key3 = array_rand($fault_list);
+                    if($fault_list[$fault_key1]['parent_fault_id']==$fault_list[$fault_key2]['parent_fault_id']){
+                        $fault_key2 = array_rand($fault_list);
+                    }
+                    if($fault_list[$fault_key2]['parent_fault_id']==$fault_list[$fault_key3]['parent_fault_id']){
+                        $fault_key3 = array_rand($fault_list);
+                    }
+                    $fault_key = [$fault_key1,$fault_key2,$fault_key3];
                 }else if($params['question_setting_method']==2){//教师自选
                     $question_ids = $params['question_ids'];
                 }else if($params['question_setting_method']==3){ //任务自选
                     $task_ids = Db::name('task_fault')->where(['task_id'=>['in',$params['task_id']]])->column('fault_id');
                 }
-//                halt($question_ids);
                 foreach ($fault_list as $key=> $item1){
                     $flag = 0;
                     if(!empty($fault_key) && in_array($key,$fault_key)){
@@ -230,7 +237,16 @@ class Collection extends Backend
                     //匹配的学员自动加入  mx_real_exam_fault 考试故障关联表
                     $fault_list = Fault::where(['sim_type' => $params['sim_type'], 'fault_state' => 0,'fault_type'=>3])->select();
                     if($params['question_setting_method']==1){ //系统随机
-                        $fault_key = array_rand($fault_list, 3);
+                        $fault_key1 = array_rand($fault_list);
+                        $fault_key2 = array_rand($fault_list);
+                        $fault_key3 = array_rand($fault_list);
+                        if($fault_list[$fault_key1]['parent_fault_id']==$fault_list[$fault_key2]['parent_fault_id']){
+                            $fault_key2 = array_rand($fault_list);
+                        }
+                        if($fault_list[$fault_key2]['parent_fault_id']==$fault_list[$fault_key3]['parent_fault_id']){
+                            $fault_key3 = array_rand($fault_list);
+                        }
+                        $fault_key = [$fault_key1,$fault_key2,$fault_key3];
                     }else if($params['question_setting_method']==2){//教师自选
                         $question_ids = $params['question_ids'];
                     }else if($params['question_setting_method']==3){ //任务自选

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

@@ -3,7 +3,8 @@
         border-collapse: collapse;
         margin: 0 auto;
         text-align: center;
-        width: 25%;float: left;
+        width: 24%;
+        float: left;
         font-size: 12px;
     }
 
@@ -31,16 +32,14 @@
                         </tr>
                     </thead>
                     <tbody>
+                    {foreach name="xianxiang" item="vo"}
                     <tr>
                         <td>
-                            <select class="form-control" name="unwin[xx_id]">
-                                <option value="" >请选择</option>
-                                {foreach name="xianxiang" item="vo"}
-                                <option value="{$vo.fault_id}" >{$vo.name}</option>
-                                {/foreach}
-                            </select>
+
+                            <input {if in_array($vo.fault_id,$row.xxid)} disabled {/if} id="row[xx_id]" name="unwin[xx_id]" type="radio" value="{$vo.fault_id}">&nbsp;&nbsp;&nbsp;{$vo.name}<br/>
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -50,15 +49,22 @@
                     </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            <select  class="form-control selectpicker" multiple="" name="unwin[yy_id][]">-->
+<!--                                {foreach name="yuanyin" item="vv"}-->
+<!--                                <option value="{$key}">{$vv}</option>-->
+<!--                                {/foreach}-->
+<!--                            </select>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="yuanyin" item="vv"}
                     <tr>
                         <td>
-                            <select  class="form-control selectpicker" multiple="" name="unwin[yy_id][]">
-                                {foreach name="yuanyin" item="vv"}
-                                <option value="{$key}">{$vv}</option>
-                                {/foreach}
-                            </select>
+                            <input type="checkbox" name="unwin[yy_id][]" value="{$key}">&nbsp;&nbsp;&nbsp;{$vv}
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -68,15 +74,22 @@
                     </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                        <select  class="form-control selectpicker" multiple="" name="unwin[bw_id][]">-->
+<!--                            {foreach name="buwei" item="v2"}-->
+<!--                            <option value="{$key}">{$v2}</option>-->
+<!--                            {/foreach}-->
+<!--                        </select>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="buwei" item="v2"}
                     <tr>
                         <td>
-                        <select  class="form-control selectpicker" multiple="" name="unwin[bw_id][]">
-                            {foreach name="buwei" item="v2"}
-                            <option value="{$key}">{$v2}</option>
-                            {/foreach}
-                        </select>
+                            <input id="row[bw_id]" name="unwin[bw_id]" type="radio" value="{$key}">&nbsp;&nbsp;&nbsp;{$v2}<br/>
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -86,15 +99,22 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr>
-                        <td>
-                            <select  class="form-control selectpicker" multiple="" name="unwin[pc_id][]">
-                                {foreach name="paichu" item="v3"}
-                                <option value="{$key}">{$v3}</option>
-                                {/foreach}
-                            </select>
-                        </td>
-                    </tr>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            <select  class="form-control selectpicker" multiple="" name="unwin[pc_id][]">-->
+<!--                                {foreach name="paichu" item="v3"}-->
+<!--                                <option value="{$key}">{$v3}</option>-->
+<!--                                {/foreach}-->
+<!--                            </select>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                        {foreach name="paichu" item="v3"}
+                        <tr>
+                            <td>
+                                <input id="row[pc_id]" name="unwin[pc_id]" type="radio" value="{$key}">&nbsp;&nbsp;&nbsp;{$v3}<br/>
+                            </td>
+                        </tr>
+                        {/foreach}
                     </tbody>
                 </table>
             </div>

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

@@ -31,16 +31,23 @@
                         </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            <select class="form-control" name="unwin[xx_id]">-->
+<!--                                <option value="" >请选择</option>-->
+<!--                                {foreach name="xianxiang" item="vo"}-->
+<!--                                <option value="{$vo.fault_id}" {if $row.other_report_text.xx_id eq $vo.fault_id} selected {/if}>{$vo.name}</option>-->
+<!--                                {/foreach}-->
+<!--                            </select>-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="xianxiang" item="vo"}
                     <tr>
                         <td>
-                            <select class="form-control" name="unwin[xx_id]">
-                                <option value="" >请选择</option>
-                                {foreach name="xianxiang" item="vo"}
-                                <option value="{$vo.fault_id}" {if $row.other_report_text.xx_id eq $vo.fault_id} selected {/if}>{$vo.name}</option>
-                                {/foreach}
-                            </select>
+                            <input {if $row.other_report_text.xx_id eq $vo.fault_id} checked {/if} id="row[xx_id]" name="unwin[xx_id]" type="radio" value="{$vo.fault_id}">&nbsp;&nbsp;&nbsp;{$vo.name}<br/>
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -50,11 +57,18 @@
                     </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            {:build_select('unwin[yy_id][]', $yuanyin, $row.other_report_text.yy_id, ['class'=>'form-control selectpicker','multiple'=>''])}-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="yuanyin" item="vv"}
                     <tr>
                         <td>
-                            {:build_select('unwin[yy_id][]', $yuanyin, $row.other_report_text.yy_id, ['class'=>'form-control selectpicker','multiple'=>''])}
+                            <input type="checkbox" {if in_array($key,$row.other_report_text.yy_id)} checked {/if} name="unwin[yy_id][]" value="{$key}">&nbsp;&nbsp;&nbsp;{$vv}
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -64,11 +78,19 @@
                     </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            {:build_select('unwin[bw_id][]', $buwei, $row.other_report_text.bw_id, ['class'=>'form-control selectpicker','multiple'=>''])}-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="buwei" item="vv"}
                     <tr>
                         <td>
-                            {:build_select('unwin[bw_id][]', $buwei, $row.other_report_text.bw_id, ['class'=>'form-control selectpicker','multiple'=>''])}
+                            <input {if $row.other_report_text.bw_id eq $key} checked {/if} id="row[bw_id]" name="unwin[bw_id]" type="radio" value="{$key}">
+                            &nbsp;&nbsp;&nbsp;{$vv}
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
                 <table class="new_table">
@@ -78,11 +100,19 @@
                     </tr>
                     </thead>
                     <tbody>
+<!--                    <tr>-->
+<!--                        <td>-->
+<!--                            {:build_select('unwin[pc_id][]', $paichu, $row.other_report_text.pc_id, ['class'=>'form-control selectpicker','multiple'=>''])}-->
+<!--                        </td>-->
+<!--                    </tr>-->
+                    {foreach name="paichu" item="v2"}
                     <tr>
                         <td>
-                            {:build_select('unwin[pc_id][]', $paichu, $row.other_report_text.pc_id, ['class'=>'form-control selectpicker','multiple'=>''])}
+                            <input {if $row.other_report_text.pc_id eq $key} checked {/if} id="row[pc_id]" name="unwin[pc_id]" type="radio" value="{$key}">
+                            &nbsp;&nbsp;&nbsp;{$v2}
                         </td>
                     </tr>
+                    {/foreach}
                     </tbody>
                 </table>
             </div>

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

@@ -127,7 +127,14 @@
                                 </script>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <div class="col-xs-9 col-sm-9" style="margin-left:44%;margin-bottom:15px">
+                                <button type="button" class="btn btn-success btn-replace" style="text-align: center;width: 13%;margin-top: 5%">
+                                    {:__('立即申请')}</button>
+                            </div>
+                        </div>
                     </div>
+
                     <div class="col-xs-12 col-sm-12">
                         <div class="form-group">
                             <label  style=" width: 10%;" class="control-label col-xs-3 col-sm-3">{:__('维修报告列表')}:</label>
@@ -169,7 +176,7 @@
                         </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="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/exam/view.html

@@ -115,7 +115,13 @@
                         <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>
+                        <td>
+                            {if $row.yuanyin_content_name}
+                            {volist name="row.yuanyin_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td>3</td>
@@ -135,14 +141,14 @@
                         <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>
+                        <td>
+                            {if $row.fangfa_content_name}
+                            {volist name="row.fangfa_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
-<!--                    <tr>-->
-<!--                        <td>5</td>-->
-<!--                        <td>修复结论错扣2分</td>-->
-<!--                        <td>{$row.jielun_score|htmlentities}</td>-->
-<!--                        <td>{if $row.jielun_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>-->
-<!--                    </tr>-->
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
                     </tr>

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

@@ -102,7 +102,13 @@
                     <tr>
                         <td>可能原因少写或错写1条扣1分</td>
                         <td><input type="text" name="row[yuanyin_socre]" value="{$row.yuanyin_socre|htmlentities}"></td>
-                        <td>{$row.yuanyin_content_name|htmlentities}</td>
+                        <td>
+                            {if $row.yuanyin_content_name}
+                            {volist name="row.yuanyin_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td>故障部位少写或错写1条扣1分</td>
@@ -118,7 +124,13 @@
                     <tr>
                         <td>排除方法少写或错写1条扣1分</td>
                         <td><input type="text" name="row[fangfa_score]" value="{$row.fangfa_score|htmlentities}"></td>
-                        <td>{$row.fangfa_content_name|htmlentities}</td>
+                        <td>
+                            {if $row.fangfa_content_name}
+                            {volist name="row.fangfa_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td colspan="3">三.维修时间(10分)</td>

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

@@ -115,7 +115,13 @@
                         <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>
+                        <td>
+                            {if $row.yuanyin_content_name}
+                            {volist name="row.yuanyin_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td>3</td>
@@ -135,7 +141,13 @@
                         <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>
+                        <td>
+                            {if $row.fangfa_content_name}
+                            {volist name="row.fangfa_content_name" id="vo" }
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>

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

@@ -131,11 +131,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 }, 1000);
 
                 //五秒刷新,同步更换件列表数据
-                // if(Config.isloading==1 && countdownTime>0){
-                //     setInterval(function() {
-                //         window.location.reload();
-                //     }, 30000);
-                // }
+                 if(Config.isloading==1 && countdownTime>0){
+                     setInterval(function() {
+                         window.location.reload();
+                     }, 30000);
+                 }
 
             });
 
@@ -167,13 +167,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     Layer.alert('维修报告最多允许增加三条');
                     return false;
                 }
-                Fast.api.open('student/collection/addreport/ids/'+ids, __("维修报告"), {area: ["99%", "70%"], maxmin: true, moveOut: false});
+                Fast.api.open('student/collection/addreport/ids/'+ids, __("维修报告"), {area: ["95%", "85%"], maxmin: true, moveOut: false});
             });
             //编辑记录
             $(document).on('click', '.btnedit', function () {
                 var ids = Config.ids;
                 var xh_id = $(this).attr('xh_id');
-                Fast.api.open('student/collection/editreport/ids/'+ids+'/xh_id/'+xh_id, __("维修报告"), {area: ["99%", "70%"], maxmin: true, moveOut: false});
+                Fast.api.open('student/collection/editreport/ids/'+ids+'/xh_id/'+xh_id, __("维修报告"), {area: ["95%", "85%"], maxmin: true, moveOut: false});
             });
             //移除记录
             $(document).on('click', '.btnmove', function () {