20250212 优化调整

application/admin/controller/student/Collection.php

@@ -197,6 +197,9 @@ class Collection extends Backend
             $fangfa_arr = [];
             $fangfa_content = [];
 
+
+            $other_content = [];
+
             Db::startTrans();
             try {
                 //更新考试结束时间
@@ -261,6 +264,7 @@ class Collection extends Backend
                         $xianxian_arr[] = $em['xx_id'];
                     }
                     foreach ($partent_fault_id as $k1 =>$t){
+                        $kscore = 0;
                         if(!in_array($t,$xianxian_arr)){
                             $xianxian_score = 5+$xianxian_score;
                             $xianxian_content[] = [
@@ -268,23 +272,29 @@ class Collection extends Backend
                                 'cx_id'=>$t,
                                 'cx_type'=>'故障现象少写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t])->value('name'),
+                                'cx_score'=>-5,
+                            ];
+
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>-5,
                             ];
                         }else{
                             // echo "存在里面".$t."###".$k1."<br/>";
+                            $t1= $t;
                             $jian = '';
                             foreach ($other_report as $ky => $item) {
                                 if ($item['xx_id'] == $t) {
                                    $jian = $ky;
                                 }
                             }
-                            // echo $jian."<br/>";
-
                             // 故障部位算分 start
                             //获取故障部位 
                             $buweiarr = Fault::where(['parent_fault_id'=>$t,'sim_type'=>$info['sim_type'],'fault_type'=>['in',[3,30]],'fault_state'=>0])
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['bw_id'],$buweiarr)){
                                 $buwei_score = 1+$buwei_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['bw_id'],
@@ -299,6 +309,7 @@ class Collection extends Backend
                             foreach($intersection as $kk =>$va){
                                 if($other_report[$jian]['bw_id']!=$va){
                                     $buwei_score = 1+$buwei_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va,
@@ -315,6 +326,7 @@ class Collection extends Backend
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['pc_id'],$paichuarr)){
                                 $fangfa_score = 1+$fangfa_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['pc_id'],
@@ -328,6 +340,7 @@ class Collection extends Backend
                             foreach($intersection1 as $kk1 =>$va1){
                                 if($other_report[$jian]['pc_id']!=$va1){
                                     $fangfa_score = 1+$fangfa_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va1,
@@ -345,6 +358,7 @@ class Collection extends Backend
                             foreach (explode(',',$other_report[$jian]['yy_id']) as $key => $value) {
                                 if(!in_array($value,$yuanyinarr)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$value,
@@ -360,6 +374,7 @@ class Collection extends Backend
                             foreach($yuanyinarr as $kk2 =>$va2){
                                 if(!in_array($va2,$intersection22)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va2,
@@ -371,17 +386,42 @@ class Collection extends Backend
                             }
                             unset($va2);
                             // 可能原因算分 end
+                        
+                            if($kscore>5){
+                               $kscore = '-5';
+                            }else if($kscore>0){
+                                $kscore = '-'.$kscore;
+                            }else{
+                               $kscore=0; 
+                            }
+                            // echo $t1."####".$kscore."<br/>";
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>$kscore,
+                            ];
                         }
                     }
                     unset($em);
+
+                    // echo "<pre>";
+                    // print_r($xianxian_content);
+                    
+                    // echo "<pre>";
+                    // print_r($other_content);
+                    // die();
                 }else{
                     foreach ($partent_fault_id as $key => $em){
                         $xianxian_score = 5+$xianxian_score;
                         $xianxian_content[] = [
                             'gzxz_id'=>$em,
                             'cx_id'=>$em,
-                            'cx_type'=>'故障现象少写',
-                            'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_type'=>'未作答',
+                            // 'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_name'=>'',
+                        ];
+                        $other_content[] = [
+                            'gzxz_id'=>$em,
+                            'cx_score'=>-5,
                         ];
                     }
                     unset($em);
@@ -393,6 +433,8 @@ class Collection extends Backend
                 // echo "可能原因得分:".$yuanyin_socre."<br/>";
                 // echo "<pre>";
                 // print_r($xianxian_content);
+                // echo "<pre>";
+                // print_r($other_content);
                 // die();
                 
                 // $other_report = json_decode($params['other_report'],true);
@@ -554,6 +596,8 @@ class Collection extends Backend
                 $params['fangfa_score'] = $fangfa_score;//得分;
                 $params['fangfa_content'] = json_encode($fangfa_content);//错题;
 
+                $params['other_jielun'] = json_encode($other_content);//每个答题的得分
+
                 $params['overtime_score'] = $overtime_score;//得分;
                 Db::name('real_exam_score')->insert($params);
 

application/admin/controller/student/Exam.php

@@ -67,6 +67,13 @@ class Exam extends Backend
         $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');
 
+        $row['fault_score'] = 75-$row['fault_one_score']-$row['fault_two_score']-$row['fault_three_score'];
+
+        $report_score = 15-$row['xianxian_score']-$row['yuanyin_socre']-$row['buwei_score']-$row['fangfa_score'];
+        $row['report_score'] = $report_score>0?$report_score:0; 
+
+        $row['weixiu_score'] = 10-$row['overtime_score']??0; 
+
         $row['xianxian_content_name'] = '';
         if(!empty($row['xianxian_content']))
         {
@@ -88,6 +95,7 @@ class Exam extends Backend
             $row['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
         $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
+        $other_jielun = !empty($row['other_jielun']) ? json_decode($row['other_jielun'],true):[];
         
         $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
         //根据故障部位 数组
@@ -100,7 +108,8 @@ class Exam extends Backend
             $arr1[] = [
                 'gzxz_id' => $value,
                 'xianxian_content' => $row['xianxian_content_name'],
-                'other_report' => $other_report
+                'other_report' => $other_report,
+                'other_jielun' => $other_jielun,
             ];
         }
         $this->view->assign('other_report', $other_report);

application/admin/controller/student/Exercise.php

@@ -96,10 +96,10 @@ class Exercise extends Backend
                 $fault_list = Fault::where(['sim_type' => $params['sim_type'], 'fault_state' => 0,'fault_type'=>3])->select();
                 foreach ($fault_list as $key=> $item1){
                     // $fault_key = [1,5,7];//array_rand($fault_list, 3);
-                    $fault_key1 = rand(0, 1);
-                    $fault_key2 = rand(2, 3);
-                    $fault_key3 = rand(4, 5);
-                    $fault_key = [$fault_key1,$fault_key2,$fault_key3];
+                    // $fault_key1 = rand(0, 1);
+                    // $fault_key2 = rand(2, 3);
+                    // $fault_key3 = rand(4, 5);
+                    $fault_key = [1,3,5];
                     $flag = 0;
                     if(!empty($fault_key) && in_array($key,$fault_key)){
                         $flag = 1;
@@ -181,6 +181,7 @@ class Exercise extends Backend
             $fangfa_arr = [];
             $fangfa_content = [];
 
+            $other_content = [];
 
             Db::startTrans();
             try {
@@ -252,6 +253,7 @@ class Exercise extends Backend
                         $xianxian_arr[] = $em['xx_id'];
                     }
                     foreach ($partent_fault_id as $k1 =>$t){
+                        $kscore = 0;
                         if(!in_array($t,$xianxian_arr)){
                             $xianxian_score = 5+$xianxian_score;
                             $xianxian_content[] = [
@@ -259,23 +261,29 @@ class Exercise extends Backend
                                 'cx_id'=>$t,
                                 'cx_type'=>'故障现象少写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t])->value('name'),
+                                'cx_score'=>-5,
+                            ];
+
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>-5,
                             ];
                         }else{
                             // echo "存在里面".$t."###".$k1."<br/>";
+                            $t1= $t;
                             $jian = '';
                             foreach ($other_report as $ky => $item) {
                                 if ($item['xx_id'] == $t) {
                                    $jian = $ky;
                                 }
                             }
-                            // echo $jian."<br/>";
-
                             // 故障部位算分 start
                             //获取故障部位 
                             $buweiarr = Fault::where(['parent_fault_id'=>$t,'sim_type'=>$info['sim_type'],'fault_type'=>['in',[3,30]],'fault_state'=>0])
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['bw_id'],$buweiarr)){
                                 $buwei_score = 1+$buwei_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['bw_id'],
@@ -290,6 +298,7 @@ class Exercise extends Backend
                             foreach($intersection as $kk =>$va){
                                 if($other_report[$jian]['bw_id']!=$va){
                                     $buwei_score = 1+$buwei_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va,
@@ -306,6 +315,7 @@ class Exercise extends Backend
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['pc_id'],$paichuarr)){
                                 $fangfa_score = 1+$fangfa_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['pc_id'],
@@ -319,6 +329,7 @@ class Exercise extends Backend
                             foreach($intersection1 as $kk1 =>$va1){
                                 if($other_report[$jian]['pc_id']!=$va1){
                                     $fangfa_score = 1+$fangfa_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va1,
@@ -336,6 +347,7 @@ class Exercise extends Backend
                             foreach (explode(',',$other_report[$jian]['yy_id']) as $key => $value) {
                                 if(!in_array($value,$yuanyinarr)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$value,
@@ -351,6 +363,7 @@ class Exercise extends Backend
                             foreach($yuanyinarr as $kk2 =>$va2){
                                 if(!in_array($va2,$intersection22)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va2,
@@ -362,17 +375,42 @@ class Exercise extends Backend
                             }
                             unset($va2);
                             // 可能原因算分 end
+                        
+                            if($kscore>5){
+                               $kscore = '-5';
+                            }else if($kscore>0){
+                                $kscore = '-'.$kscore;
+                            }else{
+                               $kscore=0; 
+                            }
+                            // echo $t1."####".$kscore."<br/>";
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>$kscore,
+                            ];
                         }
                     }
                     unset($em);
+
+                    // echo "<pre>";
+                    // print_r($xianxian_content);
+                    
+                    // echo "<pre>";
+                    // print_r($other_content);
+                    // die();
                 }else{
                     foreach ($partent_fault_id as $key => $em){
                         $xianxian_score = 5+$xianxian_score;
                         $xianxian_content[] = [
                             'gzxz_id'=>$em,
                             'cx_id'=>$em,
-                            'cx_type'=>'故障现象少写',
-                            'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_type'=>'未作答',
+                            // 'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_name'=>'',
+                        ];
+                        $other_content[] = [
+                            'gzxz_id'=>$em,
+                            'cx_score'=>-5,
                         ];
                     }
                     unset($em);
@@ -541,6 +579,8 @@ class Exercise extends Backend
 
                 $params['fangfa_score'] = $fangfa_score;//得分;
                 $params['fangfa_content'] = json_encode($fangfa_content);//错题;
+
+                $params['other_jielun'] = json_encode($other_content);//每个答题的得分
 //                
                 $params['overtime_score'] = $overtime_score;//得分;
                 Db::name('real_exam_score')->insert($params);
@@ -620,6 +660,13 @@ class Exercise extends Backend
         $row['fault_name_two'] = !empty($fault_list[1]['fault_id']) ? Fault::where('fault_id',$fault_list[1]['fault_id'])->value('name'):'';
         $row['fault_name_three'] = !empty($fault_list[2]['fault_id']) ? Fault::where('fault_id',$fault_list[2]['fault_id'])->value('name'):'';
 
+        $row['fault_score'] = 75-$row['fault_one_score']-$row['fault_two_score']-$row['fault_three_score'];
+
+        $report_score = 15-$row['xianxian_score']-$row['yuanyin_socre']-$row['buwei_score']-$row['fangfa_score'];
+        $row['report_score'] = $report_score>0?$report_score:0; 
+
+        $row['weixiu_score'] = 10-$row['overtime_score']??0; 
+
         $row['xianxian_content_name'] = '';
         if(!empty($row['xianxian_content']))
         {
@@ -642,6 +689,8 @@ class Exercise extends Backend
         }
 
         $other_report = !empty($row['other_report']) ? json_decode($row['other_report'],true):[];
+        $other_jielun = !empty($row['other_jielun']) ? json_decode($row['other_jielun'],true):[];
+
         $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
         //根据故障部位 数组
         $fault_arr = [$fault_right_list[0]['fault_id'],$fault_right_list[1]['fault_id'],$fault_right_list[2]['fault_id']];
@@ -653,7 +702,9 @@ class Exercise extends Backend
             $arr1[] = [
                 'gzxz_id' => $value,
                 'xianxian_content' => $row['xianxian_content_name'],
-                'other_report' => $other_report
+                'other_report' => $other_report,
+                'other_jielun' => $other_jielun,
+
             ];
         }
         $this->view->assign('other_report', $other_report);

application/admin/controller/student/Practice.php

@@ -208,6 +208,7 @@ class Practice extends Backend
             $fangfa_arr = [];
             $fangfa_content = [];
 
+            $other_content = [];
 
             Db::startTrans();
             try {
@@ -277,6 +278,7 @@ class Practice extends Backend
                         $xianxian_arr[] = $em['xx_id'];
                     }
                     foreach ($partent_fault_id as $k1 =>$t){
+                        $kscore = 0;
                         if(!in_array($t,$xianxian_arr)){
                             $xianxian_score = 5+$xianxian_score;
                             $xianxian_content[] = [
@@ -284,23 +286,29 @@ class Practice extends Backend
                                 'cx_id'=>$t,
                                 'cx_type'=>'故障现象少写',
                                 'cx_name'=>Fault::where(['fault_id'=>$t])->value('name'),
+                                'cx_score'=>-5,
+                            ];
+
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>-5,
                             ];
                         }else{
                             // echo "存在里面".$t."###".$k1."<br/>";
+                            $t1= $t;
                             $jian = '';
                             foreach ($other_report as $ky => $item) {
                                 if ($item['xx_id'] == $t) {
                                    $jian = $ky;
                                 }
                             }
-                            // echo $jian."<br/>";
-
                             // 故障部位算分 start
                             //获取故障部位 
                             $buweiarr = Fault::where(['parent_fault_id'=>$t,'sim_type'=>$info['sim_type'],'fault_type'=>['in',[3,30]],'fault_state'=>0])
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['bw_id'],$buweiarr)){
                                 $buwei_score = 1+$buwei_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['bw_id'],
@@ -315,6 +323,7 @@ class Practice extends Backend
                             foreach($intersection as $kk =>$va){
                                 if($other_report[$jian]['bw_id']!=$va){
                                     $buwei_score = 1+$buwei_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va,
@@ -331,6 +340,7 @@ class Practice extends Backend
                             ->column('fault_id');
                             if(!in_array($other_report[$jian]['pc_id'],$paichuarr)){
                                 $fangfa_score = 1+$fangfa_score;
+                                $kscore = 1+$kscore;
                                 $xianxian_content[] = [
                                     'gzxz_id'=>$t,
                                     'cx_id'=>$other_report[$jian]['pc_id'],
@@ -344,6 +354,7 @@ class Practice extends Backend
                             foreach($intersection1 as $kk1 =>$va1){
                                 if($other_report[$jian]['pc_id']!=$va1){
                                     $fangfa_score = 1+$fangfa_score;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va1,
@@ -361,6 +372,7 @@ class Practice extends Backend
                             foreach (explode(',',$other_report[$jian]['yy_id']) as $key => $value) {
                                 if(!in_array($value,$yuanyinarr)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$value,
@@ -376,6 +388,7 @@ class Practice extends Backend
                             foreach($yuanyinarr as $kk2 =>$va2){
                                 if(!in_array($va2,$intersection22)){
                                     $yuanyin_socre = 1+$yuanyin_socre;
+                                    $kscore = 1+$kscore;
                                     $xianxian_content[] = [
                                         'gzxz_id'=>$t,
                                         'cx_id'=>$va2,
@@ -387,17 +400,42 @@ class Practice extends Backend
                             }
                             unset($va2);
                             // 可能原因算分 end
+                        
+                            if($kscore>5){
+                               $kscore = '-5';
+                            }else if($kscore>0){
+                                $kscore = '-'.$kscore;
+                            }else{
+                               $kscore=0; 
+                            }
+                            // echo $t1."####".$kscore."<br/>";
+                            $other_content[] = [
+                                'gzxz_id'=>$t,
+                                'cx_score'=>$kscore,
+                            ];
                         }
                     }
                     unset($em);
+
+                    // echo "<pre>";
+                    // print_r($xianxian_content);
+                    
+                    // echo "<pre>";
+                    // print_r($other_content);
+                    // die();
                 }else{
                     foreach ($partent_fault_id as $key => $em){
                         $xianxian_score = 5+$xianxian_score;
                         $xianxian_content[] = [
                             'gzxz_id'=>$em,
                             'cx_id'=>$em,
-                            'cx_type'=>'故障现象少写',
-                            'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_type'=>'未作答',
+                            // 'cx_name'=>Fault::where(['fault_id'=>$em])->value('name'),
+                            'cx_name'=>'',
+                        ];
+                        $other_content[] = [
+                            'gzxz_id'=>$em,
+                            'cx_score'=>-5,
                         ];
                     }
                     unset($em);
@@ -566,6 +604,7 @@ class Practice extends Backend
                 $params['fangfa_score'] = $fangfa_score;//得分;
                 $params['fangfa_content'] = json_encode($fangfa_content);//错题;
 
+                $params['other_jielun'] = json_encode($other_content);//每个答题的得分
 
                 $params['overtime_score'] = $overtime_score;//得分;
                 Db::name('real_exam_score')->insert($params);
@@ -657,6 +696,11 @@ class Practice extends Backend
         $row['fault_name_two'] = !empty($fault_list[1]['fault_id']) ? Fault::where('fault_id',$fault_list[1]['fault_id'])->value('name'):'';
         $row['fault_name_three'] = !empty($fault_list[2]['fault_id']) ? Fault::where('fault_id',$fault_list[2]['fault_id'])->value('name'):'';
 
+        $row['fault_score'] = 75-$row['fault_one_score']-$row['fault_two_score']-$row['fault_three_score'];
+
+        $report_score = 15-$row['xianxian_score']-$row['yuanyin_socre']-$row['buwei_score']-$row['fangfa_score'];
+        $row['report_score'] = $report_score>0?$report_score:0; 
+
         $row['xianxian_content_name'] = '';
         if(!empty($row['xianxian_content']))
         {
@@ -678,6 +722,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):[];
+        $other_jielun = !empty($row['other_jielun']) ? json_decode($row['other_jielun'],true):[];
+        
         $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
         //根据故障部位 数组
         $fault_arr = [$fault_right_list[0]['fault_id'],$fault_right_list[1]['fault_id'],$fault_right_list[2]['fault_id']];
@@ -689,7 +735,8 @@ class Practice extends Backend
             $arr1[] = [
                 'gzxz_id' => $value,
                 'xianxian_content' => $row['xianxian_content_name'],
-                'other_report' => $other_report
+                'other_report' => $other_report,
+                'other_jielun' => $other_jielun,
             ];
         }
         $this->view->assign('other_report', $other_report);

application/admin/controller/teacher/Exams.php

@@ -239,6 +239,13 @@ class Exams extends Backend
         $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');
 
+        $row['fault_score'] = 75-$row['fault_one_score']-$row['fault_two_score']-$row['fault_three_score'];
+
+        $report_score = 15-$row['xianxian_score']-$row['yuanyin_socre']-$row['buwei_score']-$row['fangfa_score'];
+        $row['report_score'] = $report_score>0?$report_score:0; 
+
+        $row['weixiu_score'] = 10-$row['overtime_score']??0; 
+
         $row['xianxian_content_name'] = '';
         if(!empty($row['xianxian_content']))
         {
@@ -260,6 +267,7 @@ 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):[];
+        $other_jielun = !empty($row['other_jielun']) ? json_decode($row['other_jielun'],true):[];
         
         $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
         //根据故障部位 数组
@@ -272,7 +280,8 @@ class Exams extends Backend
             $arr1[] = [
                 'gzxz_id' => $value,
                 'xianxian_content' => $row['xianxian_content_name'],
-                'other_report' => $other_report
+                'other_report' => $other_report,
+                'other_jielun' => $other_jielun,
             ];
         }
         $this->view->assign('other_report', $other_report);

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

@@ -81,31 +81,31 @@
                         <td style="width:45%">题目</td>
                     </tr>
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)(本题得分:{$row.fault_score??0})</td>
                     </tr>
                     <tr>
                         <td>1</td>
                         <td>故障一未排除扣25分</td>
-                        <td>{$row.fault_one_score|htmlentities}</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>-{$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>3</td>
                         <td>故障三未排除扣25分</td>
-                        <td>{$row.fault_three_score|htmlentities}</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 colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)(本题得分:{$row.report_score??0})</td>
                     </tr>
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
@@ -119,44 +119,61 @@
                             <td style="width:25%">可能原因</td>
                             <td>故障部位</td>
                             <td>排除方法</td>  
-                            <td style="width:25%">扣分原因</td>  
+                            <td style="width:20%">扣分原因</td> 
+                            <td>扣分情况</td>  
                         </tr>
                         {volist name="partent_fault_id" id="vo2"}
                         <tr style="height: 60px">    
                             <td>{++$key}</td>
-                            {if $vo2.other_report}
+                            <td>
                                 {volist name="vo2.other_report" id="vo21"}
                                     {if $vo2.gzxz_id eq $vo21.xx_id}
-                                        <td>{$vo21.xx_name|htmlentities}</td>
-                                        <td>{$vo21.yy_name|htmlentities}</td>
-                                        <td>{$vo21.bw_name|htmlentities}</td>
-                                        <td>{$vo21.pc_name|htmlentities}</td>
-                                    {else}
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
+                                        {$vo21.xx_name|htmlentities}
                                     {/if}
                                 {/volist}
-                            {else}
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                            {/if}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.yy_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.bw_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.pc_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
                             <td>
                             {volist name="vo2.xianxian_content" id="vo22"}
                                 {if $vo2.gzxz_id eq $vo22.gzxz_id}
-                                    <span class="text-danger">{$vo22.cx_type}:{$vo22.cx_name}</span><br/>
+                                    <span class="text-danger">{$vo22.cx_type}&nbsp;&nbsp;&nbsp;{$vo22.cx_name}</span><br/>
+                                {/if}
+                            {/volist}
+                            </td>
+                            <td>
+                            {volist name="vo2.other_jielun" id="vo23"}
+                                {if $vo2.gzxz_id eq $vo23.gzxz_id}
+                                    {$vo23.cx_score??''}<br/>
                                 {/if}
                             {/volist}
                             </td>
                         </tr>
                         {/volist}
                         <tr>
-                            <td colspan="6" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
+                            <td colspan="7" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
                         </tr>
                     </table>
+
                     <table class="new_table">
                     {if false}
                     <tr>
@@ -220,7 +237,7 @@
                     </tr>
                     {/if}
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)(本题得分:{$row.weixiu_score??0})</td>
                     </tr>
                     <tr>
                         <td colspan="2">按没超过1分钟扣1分的比例扣分</td>

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

@@ -72,7 +72,7 @@
                             <td style="width:45%">题目</td>
                         </tr>
                         <tr>
-                            <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)(本题得分:{$row.fault_score??0})</td>
                         </tr>
                         <tr>
                             <td>1</td>
@@ -96,7 +96,7 @@
                             <td>{$row.fault_name_three|htmlentities}</td>
                         </tr>
                         <tr>
-                            <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)(本题得分:{$row.report_score??0})</td>
                         </tr>
                         <tr>
                             <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
@@ -109,31 +109,40 @@
                             <td style="width:25%">可能原因</td>
                             <td>故障部位</td>
                             <td>排除方法</td>  
-                            <td style="width:25%">扣分原因</td>  
+                            <td style="width:20%">扣分原因</td>  
+                            <td>扣分情况</td> 
                         </tr>
                         {volist name="partent_fault_id" id="vo2"}
                         <tr style="height: 60px">    
                             <td>{++$key}</td>
-                            {if $vo2.other_report}
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.xx_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
                                 {volist name="vo2.other_report" id="vo21"}
                                     {if $vo2.gzxz_id eq $vo21.xx_id}
-                                        <td>{$vo21.xx_name|htmlentities}</td>
-                                        <td>{$vo21.yy_name|htmlentities}</td>
-                                        <td>{$vo21.bw_name|htmlentities}</td>
-                                        <td>{$vo21.pc_name|htmlentities}</td>
-                                    {else}
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
+                                        {$vo21.yy_name|htmlentities}
                                     {/if}
                                 {/volist}
-                            {else}
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                            {/if}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.bw_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.pc_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
                             <td>
                             {volist name="vo2.xianxian_content" id="vo22"}
                                 {if $vo2.gzxz_id eq $vo22.gzxz_id}
@@ -141,10 +150,17 @@
                                 {/if}
                             {/volist}
                             </td>
+                            <td>
+                            {volist name="vo2.other_jielun" id="vo23"}
+                                {if $vo2.gzxz_id eq $vo23.gzxz_id}
+                                    {$vo23.cx_score??''}<br/>
+                                {/if}
+                            {/volist}
+                            </td>                            
                         </tr>
                         {/volist}
                         <tr>
-                            <td colspan="6" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
+                            <td colspan="7" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
                         </tr>
                         </table>
                         <table class="new_table">
@@ -210,7 +226,7 @@
                         </tr>
                         {/if}
                         <tr>
-                            <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)(本题得分:{$row.weixiu_score??0})</td>
                         </tr>
                         <tr>
                             <td colspan="2">按没超过1分钟扣1分的比例扣分</td>

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

@@ -8,7 +8,6 @@
         width: 100%;
         font-size: 12px;
     }
-
     .new_table td,
     table th {
         border: 1px solid #cad9ea;
@@ -16,12 +15,10 @@
         height: 3.5em;
         padding-left: 1%;
     }
-
     .new_table thead th {
         background-color: #CCE8EB;
         width: 100px;
     }
-
     .new_table1 {
         border-collapse: collapse;
         margin: 0 auto;
@@ -37,6 +34,7 @@
 /*        padding-left: 1% !important;*/
     }
 
+
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
         background-color: #17223f;
         color: #ffffff;
@@ -47,13 +45,13 @@
         border-bottom: 1.5px solid #17223f;
         margin-bottom: 10px;
     }
-     .djs{
-         margin-right: 5%;
-         text-align: right;
-         line-height:8px;
-         font-size:20px;
-         margin-top: 50px;
-     }
+    .djs{
+        margin-right: 5%;
+        text-align: right;
+        line-height:8px;
+        font-size:20px;
+        margin-top: 50px;
+    }
     .df {
         color:red;
     }
@@ -63,80 +61,88 @@
     <div class="djs">得分成绩/满分成绩: <span class="df">{$row.total|htmlentities}</span>/100</div>
     <div class="col-lg-12" style="margin: 10px 10px 0 10px">
         <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
-        <div class="tab-content" style="margin-top:5px;margin-right: 20px">
-            <div class="tab-pane tab_log1" style="display: block">
-                <table class="new_table">
-                    <tr>
-                        <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%">一.故障排除(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>故障三未排除扣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 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>
-                    </table>
-                    <table class="new_table1">
+            <div class="tab-content" style="margin-top:5px;margin-right: 20px">
+                <div class="tab-pane tab_log1" style="display: block">
+                    <table class="new_table">
+                        <tr>
+                            <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%">一.故障排除(75分)(本题得分:{$row.fault_score??0})</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>故障三未排除扣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 colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)(本题得分:{$row.report_score??0})</td>
+                        </tr>
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
+                        </tr>
+                        </table>
+                        <table class="new_table1">
+                            <tr>
                             <td>序号</td>
                             <td>故障现象</td>
                             <td style="width:25%">可能原因</td>
                             <td>故障部位</td>
                             <td>排除方法</td>  
-                            <td style="width:25%">扣分原因</td>  
+                            <td style="width:20%">扣分原因</td>  
+                            <td>扣分情况</td> 
                         </tr>
                         {volist name="partent_fault_id" id="vo2"}
                         <tr style="height: 60px">    
                             <td>{++$key}</td>
-                            {if $vo2.other_report}
+                            <td>
                                 {volist name="vo2.other_report" id="vo21"}
                                     {if $vo2.gzxz_id eq $vo21.xx_id}
-                                        <td>{$vo21.xx_name|htmlentities}</td>
-                                        <td>{$vo21.yy_name|htmlentities}</td>
-                                        <td>{$vo21.bw_name|htmlentities}</td>
-                                        <td>{$vo21.pc_name|htmlentities}</td>
-                                    {else}
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
+                                        {$vo21.xx_name|htmlentities}
                                     {/if}
                                 {/volist}
-                            {else}
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                            {/if}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.yy_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.bw_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
+                            <td>
+                                {volist name="vo2.other_report" id="vo21"}
+                                    {if $vo2.gzxz_id eq $vo21.xx_id}
+                                        {$vo21.pc_name|htmlentities}
+                                    {/if}
+                                {/volist}
+                            </td>
                             <td>
                             {volist name="vo2.xianxian_content" id="vo22"}
                                 {if $vo2.gzxz_id eq $vo22.gzxz_id}
@@ -144,92 +150,99 @@
                                 {/if}
                             {/volist}
                             </td>
+                            <td>
+                            {volist name="vo2.other_jielun" id="vo23"}
+                                {if $vo2.gzxz_id eq $vo23.gzxz_id}
+                                    {$vo23.cx_score??''}<br/>
+                                {/if}
+                            {/volist}
+                            </td>                            
                         </tr>
                         {/volist}
                         <tr>
-                            <td colspan="6" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
+                            <td colspan="7" style="text-align:left;padding-left:1%;font-weight:600;">故障现象少写或错写1条扣5分；可能原因少写或错写1条扣1分；故障部位少写或错写1条扣1分；排除方法少写或错写1条扣1分。</td>
+                        </tr>
+                        </table>
+                        <table class="new_table">
+                        {if false}
+                        <tr>
+                            <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>1</td>
+                            <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>
+                                {if $row.xianxian_content_name}
+                                {volist name="row.xianxian_content_name" id="vo" }
+                                <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
+                                {/volist}
+                                {/if}
+                            </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>
+                                {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;<br/>
+                                {/volist}
+                                {/if}
+                            </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>
+                                {if $row.buwei_content_name}
+                                {volist name="row.buwei_content_name" id="vo" }
+                                <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
+                                {/volist}
+                                {/if}
+                            </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>
+                                {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;<br/>
+                                {/volist}
+                                {/if}
+                            </td>
+                        </tr>
+                        {/if}
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)(本题得分:{$row.weixiu_score??0})</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
+                            <td colspan="3">{$row.overtime_score|htmlentities}</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">五.成绩</td>
+                            <td colspan="3">{$row.total|htmlentities}</td>
                         </tr>
                     </table>
-                    <table class="new_table">
-                    {if false}
-                    <tr>
-                        <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>1</td>
-                        <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>
-                            {if $row.xianxian_content_name}
-                            {volist name="row.xianxian_content_name" id="vo" }
-                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
-                            {/volist}
-                            {/if}
-                        </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>
-                            {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;<br/>
-                            {/volist}
-                            {/if}
-                        </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>
-                            {if $row.buwei_content_name}
-                            {volist name="row.buwei_content_name" id="vo" }
-                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
-                            {/volist}
-                            {/if}
-                        </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>
-                            {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;<br/>
-                            {/volist}
-                            {/if}
-                        </td>
-                    </tr>
-                    {/if}
-                    <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
-                        <td colspan="3">{$row.overtime_score|htmlentities}</td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">五.成绩</td>
-                        <td colspan="3">{$row.total|htmlentities}</td>
-                    </tr>
-                </table>
-            </div>
+                </div>
 
-        </div>
-        <div class="form-group" style="text-align: center;margin-top: 5%">
-            <button type="submit" class="btn btn-info" style="text-align: center;width: 10%">{:__('结束')}</button>
-        </div>
+            </div>
+            <div class="form-group" style="text-align: center;margin-top: 5%">
+                <button type="submit" class="btn btn-info" style="text-align: center;width: 10%">{:__('结束')}</button>
+            </div>
         </form>
     </div>
 </div>

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

@@ -113,31 +113,40 @@
                         <td style="width:25%">可能原因</td>
                         <td>故障部位</td>
                         <td>排除方法</td>  
-                        <td style="width:25%">扣分原因</td>  
+                        <td style="width:20%">扣分原因</td>  
+                        <td>扣分情况</td>  
                     </tr>
                     {volist name="partent_fault_id" id="vo2"}
                     <tr style="height: 60px">    
                         <td>{++$key}</td>
-                        {if $vo2.other_report}
+                        <td>
+                            {volist name="vo2.other_report" id="vo21"}
+                                {if $vo2.gzxz_id eq $vo21.xx_id}
+                                    {$vo21.xx_name|htmlentities}
+                                {/if}
+                            {/volist}
+                        </td>
+                        <td>
+                            {volist name="vo2.other_report" id="vo21"}
+                                {if $vo2.gzxz_id eq $vo21.xx_id}
+                                    {$vo21.yy_name|htmlentities}
+                                {/if}
+                            {/volist}
+                        </td>
+                        <td>
+                            {volist name="vo2.other_report" id="vo21"}
+                                {if $vo2.gzxz_id eq $vo21.xx_id}
+                                    {$vo21.bw_name|htmlentities}
+                                {/if}
+                            {/volist}
+                        </td>
+                        <td>
                             {volist name="vo2.other_report" id="vo21"}
                                 {if $vo2.gzxz_id eq $vo21.xx_id}
-                                    <td>{$vo21.xx_name|htmlentities}</td>
-                                    <td>{$vo21.yy_name|htmlentities}</td>
-                                    <td>{$vo21.bw_name|htmlentities}</td>
-                                    <td>{$vo21.pc_name|htmlentities}</td>
-                                {else}
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
+                                    {$vo21.pc_name|htmlentities}
                                 {/if}
                             {/volist}
-                        {else}
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                        {/if}
+                        </td>
                         <td>
                         {volist name="vo2.xianxian_content" id="vo22"}
                             {if $vo2.gzxz_id eq $vo22.gzxz_id}
@@ -145,6 +154,13 @@
                             {/if}
                         {/volist}
                         </td>
+                        <td>
+                        {volist name="vo2.other_jielun" id="vo23"}
+                                {if $vo2.gzxz_id eq $vo23.gzxz_id}
+                                    {$vo23.cx_score??''}<br/>
+                                {/if}
+                            {/volist}
+                        </td>
                     </tr>
                     {/volist}
                     <tr>

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

@@ -80,7 +80,7 @@
                         <td style="width:45%">题目</td>
                     </tr>
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">一.故障排除(75分)(本题得分:{$row.fault_score??0})</td>
                     </tr>
                     <tr>
                         <td>1</td>
@@ -105,7 +105,7 @@
                     </tr>
                     
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)(本题得分:{$row.report_score??0})</td>
                     </tr>
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
@@ -116,11 +116,11 @@
                         <tr>
                             <td>序号</td>
                             <td>故障现象</td>
-                            <td style="width:20%">可能原因</td>
+                            <td style="width:25%">可能原因</td>
                             <td>故障部位</td>
                             <td>排除方法</td>  
                             <td style="width:20%">扣分原因</td>  
-                            <!-- <td>扣分情况</td>   -->
+                            <td>扣分情况</td>  
                         </tr>
                         {volist name="partent_fault_id" id="vo2"}
                         <tr style="height: 60px">    
@@ -161,11 +161,11 @@
                             {/volist}
                             </td>
                             <td>
-                            <!-- {volist name="vo2.xianxian_content" id="vo22"}
-                                {if $vo2.gzxz_id eq $vo22.gzxz_id}
-                                    {$vo22.cx_score??''}<br/>
+                            {volist name="vo2.other_jielun" id="vo23"}
+                                {if $vo2.gzxz_id eq $vo23.gzxz_id}
+                                    {$vo23.cx_score??''}<br/>
                                 {/if}
-                            {/volist} -->
+                            {/volist}
                             </td>
                         </tr>
                         {/volist}
@@ -237,7 +237,7 @@
                     </tr>
                     {/if}
                     <tr>
-                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">三.维修时间(10分)(本题得分:{$row.weixiu_score??0})</td>
                     </tr>
                     <tr>
                         <td colspan="2">按没超过1分钟扣1分的比例扣分</td>

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

@@ -2,7 +2,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
 
     var Controller = {
         index: function () {
-            $('.btn-edit').data('area',['55%','95%']);
+            $('.btn-edit').data('area',['70%','95%']);
             // 初始化表格参数配置
             Table.api.init({
                 extend: {
@@ -133,7 +133,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
             $(document).on('click', '.btn-view', function () {
                 var ids = Table.api.selectedids(table);
                 var title = '成绩详情';
-                Fast.api.open(Fast.api.fixurl("teacher/exams/view/ids/"+ids), title, { area: ["60%", "95%"] });
+                Fast.api.open(Fast.api.fixurl("teacher/exams/view/ids/"+ids), title, { area: ["75%", "95%"] });
             });
         },
         persent: function () {
@@ -284,7 +284,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                                     icon: 'fa fa-eye',
                                     title: '成绩详情',
                                     classname: 'btn btn-info btn-xs btn-magic btn-dialog',
-                                    extend: 'data-area=\'["55%","95%"]\'',
+                                    extend: 'data-area=\'["75%","95%"]\'',
                                     visible: function (row) {
                                         if(row.total_score>0){
                                             return true;
@@ -344,7 +344,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                                     icon: 'fa fa-eye',
                                     title: '成绩详情',
                                     classname: 'btn btn-info btn-xs btn-magic btn-dialog',
-                                    extend: 'data-area=\'["55%","95%"]\'',
+                                    extend: 'data-area=\'["75%","95%"]\'',
                                     url: 'teacher/exams/view',
                                 }
                             ],