20250123 调整

application/admin/controller/student/Collection.php

@@ -182,21 +182,28 @@ class Collection extends Backend
             $fault_two_score = 25;
             $fault_three_score = 25;
 
+            //故障现象
             $xianxian_score = 0;
-            $yuanyin_socre= 0;
+            $xianxian_arr = [];
+            $xianxian_content = [];
+
+            //故障部位
             $buwei_score= 0;
-            $fangfa_score= 0;
+            $buwei_arr = [];
+            $buwei_content = [];
 
-            $xianxian_arr = [];
+            //可能原因
+            $yuanyin_socre= 0;
             $yuanyin_arr = [];
-            $buwei_arr = [];
-            $fangfa_arr = [];
-            $jielun_score = 0;
+            $yuanyin_content = [];
 
+            //排除方法
+            $fangfa_score= 0;
+            $fangfa_arr = [];
+            $fangfa_content = [];
 
             Db::startTrans();
             try {
-
                 //更新考试结束时间
                 $row->end_time = date('Y-m-d H:i:s');
                 $row->endtime = time();
@@ -206,7 +213,6 @@ class Collection extends Backend
 
                 $info = $this->exam_model->where(['exam_id'=>$ids])->find();
 
-
                 //更新故障是否正确
                 $fault_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
                 if(!empty($fault_list)){
@@ -225,7 +231,6 @@ class Collection extends Backend
                     }
                 }
 
-
                 //计算得分，故障是否有扣分  扣分制
                 $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1,'answer_right'=>['>',0]])->select();
                 if(!empty($fault_right_list)){
@@ -239,74 +244,204 @@ class Collection extends Backend
                         $fault_three_score = 0;
                     }
 
-                    //根据故障部位,查找故障现象
+                    //根据故障部位 数组
                     $fault_arr = [$fault_right_list[0]['fault_id'],$fault_right_list[1]['fault_id'],$fault_right_list[2]['fault_id']];
+                    //查找故障现象 数组
                     $partent_fault_id = Fault::where(['fault_id'=>['in',$fault_arr]])->column('parent_fault_id');
 
-                    //故障保存的是部位,需要查找故障现象
-                    $other_report = json_decode($params['other_report'],true);
-                    if(count($other_report)<3){
-                        $xianxian_score = 15-5*count($other_report)+$xianxian_score;
-                        $buwei_score = 3-1*count($other_report)+$buwei_score;
-                        $yuanyin_socre = 3-1*count($other_report)+$yuanyin_socre;
-                        $fangfa_score = 3-1*count($other_report)+$fangfa_score;
+                    $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;
+                        }
                     }
 
-					foreach ($other_report as $key => $em){
-                        //故障现象
-                        if(!in_array($em['xx_id'],$partent_fault_id)){
-                            $xianxian_score = 5+$xianxian_score;
+                    $other_report = json_decode($params['other_report'],true);
+                    if(!empty($other_report)){
+                        foreach ($other_report as $key => $em){
+                            //故障现象
                             $xianxian_arr[] = $em['xx_id'];
+
+                            //故障部位
+                            $buwei_arr[] = $em['bw_id'];
                         }
+                        //可能原因
+                        //排除方法
+                    }
+                    echo "<pre>";
+                    print_r($fault_arr);
+                    echo "<pre>";
+                    print_r($buwei_arr);
+
+                    $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(!empty($em['bw_id'])){
-                            $report_xx_id = Report::where(['bw_id'=>['in',$em['bw_id']]])->column('xx_id');
-                            if(!in_array($em['xx_id'],$report_xx_id)){ //现象不对,直接扣分
-                                $buwei_score = 1+$buwei_score;
-                                $buwei_arr[] = $em['bw_id'];
-                            }else{
-                                //现象正确,判断是不是正确的选项
-                                foreach (explode(',',$em['bw_id']) as $s => $bs){
-                                    if(!in_array($bs,$fault_arr)){
-                                        $buwei_score = 1+$buwei_score;
-                                        $buwei_arr[] = $bs;
-                                    }
+                    //故障现象  判断数量是否一致,
+                    if(count($partent_fault_id)!=count($xianxian_arr)){
+                        //少写
+                        $xianxian_arr_count = count($xianxian_arr) ;
+                        $xianxian_score = (3-1*$xianxian_arr_count)+$xianxian_score;
+                        //计算故障现象分数
+                        if($xianxian_arr_count==1){
+                            $count = count(array_keys($partent_fault_id, $xianxian_arr[0])); // 更准确的方法是使用下面
+                            $xianxian_score = $count>1? 1*$count+$xianxian_score:(3-1*$count)+$xianxian_score;
+                        }
+                        if($xianxian_arr_count==2){
+                            foreach ($partent_fault_id as $k1 =>$t){
+                                if(!in_array($t,$xianxian_arr)){
+                                    //错写
+                                    $xianxian_score = 1+$xianxian_score;
+                                    echo "错写:".$t."@@@@".$xianxian_score."<br/>";
                                 }
                             }
-                        }else{
-                            //部位为空 +1
-                            $buwei_score = 1+ $buwei_score;
+                            foreach ($xianxian_arr as $k2 =>$t2){
+                                if(!in_array($t2,$partent_fault_id)){
+                                    //多写
+                                    $xianxian_score = 1+$xianxian_score;
+                                    echo "多写:".$t2."@@@@".$xianxian_score."<br/>";
+                                }
+                            }
+                        }
+                        echo "<pre>";
+                        echo $xianxian_score;
+                        die('asdfasdf');
+                    }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){
+                            //错写
+                            $xianxian_score = 1+$xianxian_score;
+                            $xianxian_content[] = [
+                                'cx_id'=>$xxValue,
+                                'cx_type'=>'错写',
+                                'cx_name'=>Fault::where(['fault_id'=>$xxValue])->value('name'),
+                            ];
+                            //多写
+                            $xianxian_score = 1+$xianxian_score;
+                            $xianxian_content[] = [
+                                'cx_id'=>$xxValue,
+                                'cx_type'=>'多写',
+                                'cx_name'=>Fault::where(['fault_id'=>$xxValue])->value('name'),
+                            ];
+//                            echo "多写:".$xxValue."####".$xianxian_score."<br/>";
                         }
+                    }
 
 
-                        //可能原因
-                        if(!empty($em['yy_id'])){
-                            $report_bw_id = Report::where(['yy_id'=>['in',$em['yy_id']]])->column('bw_id');
-                            if(!in_array($em['bw_id'],$report_bw_id)){ //现象不对,直接扣分
-                                $yuanyin_socre = 1+$yuanyin_socre;
-                                $yuanyin_arr[] = $em['yy_id'];
-                            }else{
+                    //故障部位 数量不相同
+                    if(count($fault_arr)!=count($buwei_arr)){
 
-                            }
-                        }else{
-                            //部位为空 +1
-                            $yuanyin_socre = 1+$yuanyin_socre;
-                        }
+                    }else{ //数量相同
+                        halt('数量相同');
+                    }
 
-                        //排除方法
-                        if(!empty($em['pc_id'])){
-                            $report_pc_id = Report::where(['pc_id'=>['in',$em['pc_id']]])->column('bw_id');
-                            if(!in_array($em['bw_id'],$report_pc_id)){ //现象不对,直接扣分
-                                $fangfa_score = 1+$fangfa_score;
-                                $fangfa_arr[] = $em['pc_id'];
-                            }else{
 
-                            }
-                        }else{
-                            $fangfa_score = 1+$fangfa_score;
-                        }
-					}
+//                    echo "<pre>";
+//                    echo $xianxian_score;
+//                    die();
+//                    if(count($other_report)<3){
+//                        $xianxian_score = 15-5*count($other_report)+$xianxian_score;
+//                        $buwei_score = 3-1*count($other_report)+$buwei_score;
+//                        $yuanyin_socre = 3-1*count($other_report)+$yuanyin_socre;
+//                        $fangfa_score = 3-1*count($other_report)+$fangfa_score;
+//                    }
+//					foreach ($other_report as $key => $em){
+//                        //故障现象
+//                        if(!in_array($em['xx_id'],$partent_fault_id)){
+//                            $xianxian_score = 5+$xianxian_score;
+//                            $xianxian_arr[] = $em['xx_id'];
+//                        }
+//
+//                        //故障部位
+//                        if(!empty($em['bw_id'])){
+//                            $report_xx_id = Report::where(['bw_id'=>['in',$em['bw_id']]])->column('xx_id');
+//                            if(!in_array($em['xx_id'],$report_xx_id)){ //现象不对,直接扣分
+//                                $buwei_score = 1+$buwei_score;
+//                                $buwei_arr[] = $em['bw_id'];
+//                            }else{
+//                                //现象正确,判断是不是正确的选项
+//                                foreach (explode(',',$em['bw_id']) as $s => $bs){
+//                                    if(!in_array($bs,$fault_arr)){
+//                                        $buwei_score = 1+$buwei_score;
+//                                        $buwei_arr[] = $bs;
+//                                    }
+//                                }
+//                            }
+//                        }else{
+//                            //部位为空 +1
+//                            $buwei_score = 1+ $buwei_score;
+//                        }
+//
+//
+//                        //可能原因
+//                        if(!empty($em['yy_id'])){
+//                            $report_bw_id = Report::where(['yy_id'=>['in',$em['yy_id']]])->column('bw_id');
+//                            if(!in_array($em['bw_id'],$report_bw_id)){ //现象不对,直接扣分
+//                                $yuanyin_socre = 1+$yuanyin_socre;
+//                                $yuanyin_arr[] = $em['yy_id'];
+//                            }else{
+//
+//                            }
+//                        }else{
+//                            //部位为空 +1
+//                            $yuanyin_socre = 1+$yuanyin_socre;
+//                        }
+//
+//                        //排除方法
+//                        if(!empty($em['pc_id'])){
+//                            $report_pc_id = Report::where(['pc_id'=>['in',$em['pc_id']]])->column('bw_id');
+//                            if(!in_array($em['bw_id'],$report_pc_id)){ //现象不对,直接扣分
+//                                $fangfa_score = 1+$fangfa_score;
+//                                $fangfa_arr[] = $em['pc_id'];
+//                            }else{
+//
+//                            }
+//                        }else{
+//                            $fangfa_score = 1+$fangfa_score;
+//                        }
+//					}
+
                 }
 //                echo "<pre>";
 //                print_r($buwei_arr);
@@ -318,13 +453,7 @@ class Collection extends Backend
                  if($weixiu_score>15){
                      $weixiu_score = 15;
                  }
-//                $xianxian_score = rand(1,3);
-//                $yuanyin_socre= rand(1,3);
-//                $buwei_score= rand(1,3);
-//                $fangfa_score= rand(1,3);
-//                if(empty($params['other_jielun'])){
-//                    $jielun_score = rand(1,3);
-//                }
+
                 //是否超时
                 $overtime_fen = intval((time()-$info['endtime']) / 60);
                 if($overtime_fen>=10){
@@ -344,13 +473,13 @@ class Collection extends Backend
                 $params['fault_three_score'] = $fault_three_score;//得分;
 
                 $params['xianxian_score'] = $xianxian_score;//得分;
-                $params['xianxian_content'] = !empty($xianxian_arr) ? json_encode($xianxian_arr):'';//错题;
-                $params['yuanyin_socre'] = $yuanyin_socre;//得分;
-                $params['yuanyin_content'] = !empty($yuanyin_arr) ? json_encode($yuanyin_arr) : '';//错题;
-                $params['buwei_score'] = $buwei_score;//得分;
-                $params['buwei_content'] = !empty($buwei_arr) ? json_encode($buwei_arr) :'';//错题;
-                $params['fangfa_score'] = $fangfa_score;//得分;
-                $params['fangfa_content'] = !empty($fangfa_arr) ? json_encode($fangfa_arr):'';//错题;
+                $params['xianxian_content'] = json_encode($xianxian_content);//错题;
+//                $params['yuanyin_socre'] = $yuanyin_socre;//得分;
+//                $params['yuanyin_content'] = !empty($yuanyin_arr) ? json_encode($yuanyin_arr) : '';//错题;
+//                $params['buwei_score'] = $buwei_score;//得分;
+//                $params['buwei_content'] = !empty($buwei_arr) ? json_encode($buwei_arr) :'';//错题;
+//                $params['fangfa_score'] = $fangfa_score;//得分;
+//                $params['fangfa_content'] = !empty($fangfa_arr) ? json_encode($fangfa_arr):'';//错题;
 //                $params['jielun_score'] = $jielun_score;//得分;
                 $params['overtime_score'] = $overtime_score;//得分;
                 Db::name('real_exam_score')->insert($params);
@@ -367,7 +496,6 @@ class Collection extends Backend
             }
             $this->success('交卷成功,待老师确认成绩','/ZQOtIMLKud.php/student/exam/index');
         }
-
         if(empty($row->starttime)){
             $row->start_time = date('Y-m-d H:i:s');
             $row->starttime = time();
@@ -381,6 +509,7 @@ class Collection extends Backend
         }
         $row->other_report_text = !empty($row->other_report) ? json_decode($row->other_report,true) : [];
 
+        $other_report_count = !empty($row->other_report) ? count(json_decode($row->other_report,true)) :0;
         //还未开始考试
         $row->limit_duration = $this->model->where(['exam_collection_id'=>$row['exam_collection_id']])->value('limit_duration');
         if(empty($row->starttime)){
@@ -393,6 +522,7 @@ class Collection extends Backend
         $this->assignConfig('ids',$ids);
         $this->assignConfig('timer',$timer);
         $this->assignConfig('isloading',$isloading);
+        $this->assignConfig('other_report_count',$other_report_count);
         $this->view->assign('row', $row);
 
         $departmentdata = [];

application/admin/controller/student/Exam.php

@@ -67,35 +67,33 @@ 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');
 
-        if($row['xianxian_score']>0 && empty($row['xianxian_content']))
+        $row['xianxian_content_name'] = '';
+        if(!empty($row['xianxian_content']))
         {
-            $row['xianxian_content_name'] = '未选择';
-        }else{
-            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
-            $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
-        }
-        if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
-        {
-            $row['yuanyin_content_name'] = '未选择';
-        }else{
-            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
-            $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
-        }
-
-        if($row['buwei_score']>0 &&empty($row['buwei_content']))
-        {
-            $row['buwei_content_name'] = '未选择';
-        }else{
-            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
-            $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
-        }
-        if($row['fangfa_score']>0 && empty($row['fangfa_content']))
-        {
-            $row['fangfa_content_name'] = '未选择';
-        }else{
-            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
-            $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
+            $row['xianxian_content_name'] = json_decode($row['xianxian_content'],true);
         }
+//        if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
+//        {
+//            $row['yuanyin_content_name'] = '未选择';
+//        }else{
+//            $yuanyin = Report::where(['yy_id'=>['in',json_decode($row['yuanyin_content'],true)]])->group('yy_name')->column('yy_name');
+//            $row['yuanyin_content_name'] = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
+//        }
+//
+//        if($row['buwei_score']>0 &&empty($row['buwei_content']))
+//        {
+//            $row['buwei_content_name'] = '未选择';
+//        }else{
+//            $buwei = Report::where(['bw_id'=>['in',json_decode($row['buwei_content'],true)]])->group('bw_name')->column('bw_name');
+//            $row['buwei_content_name'] = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
+//        }
+//        if($row['fangfa_score']>0 && empty($row['fangfa_content']))
+//        {
+//            $row['fangfa_content_name'] = '未选择';
+//        }else{
+//            $fangfa = Report::where(['pc_id'=>['in',json_decode($row['fangfa_content'],true)]])->group('pc_name')->column('pc_name');
+//            $row['fangfa_content_name'] = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
+//        }
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

application/admin/controller/student/Exercise.php

@@ -337,10 +337,7 @@ class Exercise extends Backend
             $isloading = 0;
             $row->other_replace = '[{"fault_id":"","request_status":"0"}]';
         }
-
-        if(empty($row->other_report)){
-            $row->other_report = '[{"xx_id":"","yy_id":"","bw_id":"","pc_id":""}]';
-        }
+        $row->other_report_text = !empty($row->other_report) ? json_decode($row->other_report,true) : [];
 
         $row->limit_duration = $this->model->where(['exam_collection_id'=>$row['exam_collection_id']])->value('limit_duration');
         if(empty($row->starttime)){

application/admin/controller/student/Practice.php

@@ -361,9 +361,8 @@ class Practice extends Backend
             $isloading = 0;
             $row->other_replace = '[{"fault_id":"","request_status":"0"}]';
         }
-        if(empty($row->other_report)){
-            $row->other_report = '[{"xx_id":"","yy_id":"","bw_id":"","pc_id":""}]';
-        }
+
+        $row->other_report_text = !empty($row->other_report) ? json_decode($row->other_report,true) : [];
 
         //还未开始练习
         $row->limit_duration = $this->model->where(['exam_collection_id'=>$row['exam_collection_id']])->value('limit_duration');

application/admin/controller/teacher/Exams.php

@@ -224,12 +224,10 @@ 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');
 
-        if($row['xianxian_score']>0 && empty($row['xianxian_content']))
+        $row['xianxian_content_name'] = '';
+        if(!empty($row['xianxian_content']))
         {
-            $row['xianxian_content_name'] = '未选择';
-        }else{
-            $xianxian = Report::where(['xx_id'=>['in',json_decode($row['xianxian_content'],true)]])->group('xx_name')->column('xx_name');
-            $row['xianxian_content_name'] = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
+            $row['xianxian_content_name'] = json_decode($row['xianxian_content'],true);
         }
         if($row['yuanyin_socre']>0 && empty($row['yuanyin_content']))
         {

application/admin/model/teacher/Exams.php

@@ -81,35 +81,34 @@ class Exams extends Model
     public function getXianxiangNamesAttr($value, $data)
     {
         $xianxian_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('xianxian_content');
-        $xianxian = Report::where(['xx_id'=>['in',json_decode($xianxian_content,true)]])->group('xx_name')->column('xx_name');
-        $xianxiang_name = !empty($xianxian) ? implode(',',$xianxian) :'不存在或未选择';
-        return $xianxiang_name;
+        $xianxiang_name = !empty($xianxian_content) ? json_decode($xianxian_content,true):'';
+        return $xianxiang_name??'';
     }
     //原因
     public function getYuanyinNamesAttr($value, $data)
     {
-        $yuanyin_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('yuanyin_content');
-        $yuanyin = Report::where(['xx_id'=>['in',json_decode($yuanyin_content,true)]])->group('yy_name')->column('yy_name');
-        $yuanyin_name = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
-        return $yuanyin_name;
+//        $yuanyin_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('yuanyin_content');
+//        $yuanyin = Report::where(['xx_id'=>['in',json_decode($yuanyin_content,true)]])->group('yy_name')->column('yy_name');
+//        $yuanyin_name = !empty($yuanyin) ? implode(',',$yuanyin) :'不存在或未选择';
+        return $yuanyin_name??'';
     }
 
     //部位
     public function getBuweiNamesAttr($value, $data)
     {
-        $buwei_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('buwei_content');
-        $buwei = Report::where(['xx_id'=>['in',json_decode($buwei_content,true)]])->group('bw_name')->column('bw_name');
-        $buwei_name = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
-        return $buwei_name;
+//        $buwei_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('buwei_content');
+//        $buwei = Report::where(['xx_id'=>['in',json_decode($buwei_content,true)]])->group('bw_name')->column('bw_name');
+//        $buwei_name = !empty($buwei) ? implode(',',$buwei) :'不存在或未选择';
+        return $buwei_name??'';
     }
 
     //方法
     public function getFangfaNamesAttr($value, $data)
     {
-        $fangfa_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('fangfa_content');
-        $fangfa = Report::where(['xx_id'=>['in',json_decode($fangfa_content,true)]])->group('pc_name')->column('pc_name');
-        $fangfa_name = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
-        return $fangfa_name;
+//        $fangfa_content = Db::name('real_exam_score')->where('exam_id',$data['exam_id'])->value('fangfa_content');
+//        $fangfa = Report::where(['xx_id'=>['in',json_decode($fangfa_content,true)]])->group('pc_name')->column('pc_name');
+//        $fangfa_name = !empty($fangfa) ? implode(',',$fangfa) :'不存在或未选择';
+        return $fangfa_name??'';
     }
 
 

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

@@ -115,13 +115,13 @@
                                 <!--定义模板，模板语法使用Art-Template模板语法 <span class="btn btn-sm btn-success btn-replace" title="保存"><i class="fa fa-check"></i></span>-->
                                 <script type="text/html" id="other_suppliertpl">
                                     <dd class="form-inline">
-                                        <select class="form-control" name="unwin[<%=index%>][fault_id]" style="width: 600px;">
+                                        <select class="form-control" name="unwin[<%=index%>][fault_id]" style="width: 50%;">
                                             <option value="" >请选择</option>
                                             {foreach name="departmentdata" item="vo"}
                                             <option value="{$vo.fault_id}" <%if(row.fault_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.replace_name}</option>
                                             {/foreach}
                                         </select>
-                                        <input type="text" class="form-control" readonly name="unwin[<%=index%>][request_status]" value="<%if(row["request_status"]==1){%>已申请<%}else if(row["request_status"]==2){ %>已送达<%}else if(row["request_status"]==3){%>驳回<%}else{%>未申请<%}%>" style="width: 430px;">
+                                        <input type="text" class="form-control" readonly name="unwin[<%=index%>][request_status]" value="<%if(row["request_status"]==1){%>已申请<%}else if(row["request_status"]==2){ %>已送达<%}else if(row["request_status"]==3){%>驳回<%}else{%>未申请<%}%>" style="width: 41%;">
                                         <span class="btn btn-sm btn-danger btn-remove" title="移除"><i class="fa fa-times"></i></span>
                                     </dd>
                                 </script>

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

@@ -97,12 +97,18 @@
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
                     </tr>
-                    <tr>
+                    <tr style="height: 60px;">
                         <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>{$row.xianxian_content_name|htmlentities}</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>

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

@@ -56,8 +56,9 @@
         border-collapse: collapse;
         margin: 0 auto;
         text-align: center;
-        width: 100%;
+        width: 94%;
         font-size: 12px;
+        margin-left:0px;
     }
 
     .new_table td,
@@ -72,22 +73,6 @@
         width: 100px;
     }
 
-    .span_show {
-        float: left;
-        margin-left: 15px;
-        font-size: 11px;
-        color: #0a84ff;
-        cursor: pointer;
-    }
-
-    .span_hide {
-        float: left;
-        margin-left: 15px;
-        font-size: 11px;
-        color: #0a84ff;
-        cursor: pointer;
-    }
-
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
         background-color: #17223f;
         color: #ffffff;
@@ -148,36 +133,72 @@
                             <div class="form-group">
                                 <label  style=" width: 10%;" class="control-label col-xs-3 col-sm-3 addRedStar">{:__('维修报告列表')}:</label>
                                 <div class="col-xs-9 col-sm-9">
-                                    <dl class="fieldlist" data-name="row[other_report]" data-template="other_suppliertpl1" id="second-fieldlist">
-                                        <dd>
-                                            <ins style="width: 250px;">故障现象</ins>
-                                            <ins style="width: 250px;">可能原因</ins>
-                                            <ins style="width: 250px;">故障部位</ins>
-                                            <ins style="width: 250px;">排除方法</ins>
+                                    <table class="new_table">
+                                        <thead>
+                                        <tr>
+                                            <td>故障现象</td>
+                                            <td>可能原因</td>
+                                            <td>故障部位</td>
+                                            <td>排除方法</td>
+                                            <td>操作</td>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        {if $row.other_report_text}
+                                        {foreach name="row.other_report_text" item="vo"}
+                                        <tr>
+                                            <td>{$vo.xx_name}</td>
+                                            <td>{$vo.yy_name}</td>
+                                            <td>{$vo.bw_name}</td>
+                                            <td>{$vo.pc_name}</td>
+                                            <td>
+                                                <span class="btn btn-xs btn-success btnedit" title="编辑" xh_id="{$vo.xh_id}"><i class="fa fa-pencil"></i> 编辑</span>
+                                                <span class="btn btn-xs btn-danger btnmove" title="移除" xh_id="{$vo.xh_id}"><i class="fa fa-times"></i> 移除</span>
+                                            </td>
+                                        </tr>
+                                        {/foreach}
+                                        {else/}
+                                        <tr>
+                                            <td colspan="5">暂无记录</td>
+                                        </tr>
+                                        {/if}
+                                        </tbody>
+                                    </table>
+                                    <a href="javascript:;" style="margin-top:8px" class="btn btn-sm btn-info btn-addlog">添加维修报告记录</a>
+                                </div>
 
-                                        </dd>
-                                        <dd>
-                                            <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>
-                                        </dd>
-                                        <textarea name="row[other_report]" class="form-control hide other_report" cols="30" rows="5" data-rule="required">{$row.other_report}</textarea>
-                                    </dl>
-                                    <!--定义模板，模板语法使用Art-Template模板语法-->
-                                    <script type="text/html" id="other_suppliertpl1">
-                                        <dd class="form-inline">
-                                            <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 260px;">
-                                                <option value="" >请选择</option>
-                                                {foreach name="xianxiang" item="vo"}
-                                                <option value="{$vo.fault_id}" <%if(row.xx_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
-                                                {/foreach}
-                                            </select>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][yy_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"2","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.yy_id%>"/>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][bw_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"3","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.bw_id%>"/>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][pc_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"4","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.pc_id%>"/>
+                                <textarea name="row[other_report]" style="margin-top:9px" class="form-control hide other_report" cols="30" rows="5">{$row.other_report}</textarea>
+<!--                                <div class="col-xs-9 col-sm-9">-->
+<!--                                    <dl class="fieldlist" data-name="row[other_report]" data-template="other_suppliertpl1" id="second-fieldlist">-->
+<!--                                        <dd>-->
+<!--                                            <ins style="width: 250px;">故障现象</ins>-->
+<!--                                            <ins style="width: 250px;">可能原因</ins>-->
+<!--                                            <ins style="width: 250px;">故障部位</ins>-->
+<!--                                            <ins style="width: 250px;">排除方法</ins>-->
 
-                                            <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
-                                        </dd>
-                                    </script>
-                                </div>
+<!--                                        </dd>-->
+<!--                                        <dd>-->
+<!--                                            <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>-->
+<!--                                        </dd>-->
+<!--                                        <textarea name="row[other_report]" class="form-control hide other_report" cols="30" rows="5" data-rule="required">{$row.other_report}</textarea>-->
+<!--                                    </dl>-->
+<!--                                    &lt;!&ndash;定义模板，模板语法使用Art-Template模板语法&ndash;&gt;-->
+<!--                                    <script type="text/html" id="other_suppliertpl1">-->
+<!--                                        <dd class="form-inline">-->
+<!--                                            <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 260px;">-->
+<!--                                                <option value="" >请选择</option>-->
+<!--                                                {foreach name="xianxiang" item="vo"}-->
+<!--                                                <option value="{$vo.fault_id}" <%if(row.xx_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>-->
+<!--                                                {/foreach}-->
+<!--                                            </select>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][yy_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"2","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.yy_id%>"/>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][bw_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"3","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.bw_id%>"/>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][pc_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"4","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.pc_id%>"/>-->
+
+<!--                                            <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>-->
+<!--                                        </dd>-->
+<!--                                    </script>-->
+<!--                                </div>-->
                             </div>
                         </div>
                     </div>

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

@@ -56,8 +56,9 @@
         border-collapse: collapse;
         margin: 0 auto;
         text-align: center;
-        width: 100%;
+        width: 94%;
         font-size: 12px;
+        margin-left:0px;
     }
 
     .new_table td,
@@ -72,22 +73,6 @@
         width: 100px;
     }
 
-    .span_show {
-        float: left;
-        margin-left: 15px;
-        font-size: 11px;
-        color: #0a84ff;
-        cursor: pointer;
-    }
-
-    .span_hide {
-        float: left;
-        margin-left: 15px;
-        font-size: 11px;
-        color: #0a84ff;
-        cursor: pointer;
-    }
-
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
         background-color: #17223f;
         color: #ffffff;
@@ -111,7 +96,7 @@
                 </div>
                 <div class="box-body box-profile">
                     <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
-                        <div class="col-xs-12 col-sm-12" style="text-align: center">
+                        <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>
                                 <div class="col-xs-9 col-sm-9">
@@ -142,40 +127,76 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-sm-12" style="text-align: center">
+                        <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>
 
                                 <div class="col-xs-9 col-sm-9">
-                                    <dl class="fieldlist" data-name="row[other_report]" data-template="other_suppliertpl1" id="second-fieldlist">
-                                        <dd >
-                                            <ins style="width: 250px;">故障现象</ins>
-                                            <ins style="width: 250px;">可能原因</ins>
-                                            <ins style="width: 250px;">故障部位</ins>
-                                            <ins style="width: 250px;">排除方法</ins>
-                                        </dd>
-                                        <dd style="margin-right: 87%">
-                                            <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>
-                                        </dd>
-                                        <!--                                        hide-->
-                                        <textarea name="row[other_report]" class="form-control hide other_report" cols="30" rows="5">{$row.other_report}</textarea>
-                                    </dl>
-                                    <script type="text/html" id="other_suppliertpl1">
-                                        <dd class="form-inline">
-                                            <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 260px;">
-                                                <option value="" >请选择</option>
-                                                {foreach name="xianxiang" item="vo"}
-                                                <option value="{$vo.fault_id}" <%if(row.xx_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
-                                                {/foreach}
-                                            </select>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][yy_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"2","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.yy_id%>"/>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][bw_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"3","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.bw_id%>"/>
-                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][pc_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"4","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.pc_id%>"/>
-
-                                            <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
-                                        </dd>
-                                    </script>
+                                    <table class="new_table">
+                                        <thead>
+                                        <tr>
+                                            <td>故障现象</td>
+                                            <td>可能原因</td>
+                                            <td>故障部位</td>
+                                            <td>排除方法</td>
+                                            <td>操作</td>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        {if $row.other_report_text}
+                                        {foreach name="row.other_report_text" item="vo"}
+                                        <tr>
+                                            <td>{$vo.xx_name}</td>
+                                            <td>{$vo.yy_name}</td>
+                                            <td>{$vo.bw_name}</td>
+                                            <td>{$vo.pc_name}</td>
+                                            <td>
+                                                <span class="btn btn-xs btn-success btnedit" title="编辑" xh_id="{$vo.xh_id}"><i class="fa fa-pencil"></i> 编辑</span>
+                                                <span class="btn btn-xs btn-danger btnmove" title="移除" xh_id="{$vo.xh_id}"><i class="fa fa-times"></i> 移除</span>
+                                            </td>
+                                        </tr>
+                                        {/foreach}
+                                        {else/}
+                                        <tr>
+                                            <td colspan="5">暂无记录</td>
+                                        </tr>
+                                        {/if}
+                                        </tbody>
+                                    </table>
+                                    <a href="javascript:;" style="margin-top:8px" class="btn btn-sm btn-info btn-addlog">添加维修报告记录</a>
                                 </div>
+
+                                <textarea name="row[other_report]" style="margin-top:9px" class="form-control hide other_report" cols="30" rows="5">{$row.other_report}</textarea>
+<!--                                <div class="col-xs-9 col-sm-9">-->
+<!--                                    <dl class="fieldlist" data-name="row[other_report]" data-template="other_suppliertpl1" id="second-fieldlist">-->
+<!--                                        <dd >-->
+<!--                                            <ins style="width: 250px;">故障现象</ins>-->
+<!--                                            <ins style="width: 250px;">可能原因</ins>-->
+<!--                                            <ins style="width: 250px;">故障部位</ins>-->
+<!--                                            <ins style="width: 250px;">排除方法</ins>-->
+<!--                                        </dd>-->
+<!--                                        <dd style="margin-right: 87%">-->
+<!--                                            <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>-->
+<!--                                        </dd>-->
+<!--                                        &lt;!&ndash;                                        hide&ndash;&gt;-->
+<!--                                        <textarea name="row[other_report]" class="form-control hide other_report" cols="30" rows="5">{$row.other_report}</textarea>-->
+<!--                                    </dl>-->
+<!--                                    <script type="text/html" id="other_suppliertpl1">-->
+<!--                                        <dd class="form-inline">-->
+<!--                                            <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 260px;">-->
+<!--                                                <option value="" >请选择</option>-->
+<!--                                                {foreach name="xianxiang" item="vo"}-->
+<!--                                                <option value="{$vo.fault_id}" <%if(row.xx_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>-->
+<!--                                                {/foreach}-->
+<!--                                            </select>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][yy_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"2","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.yy_id%>"/>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][bw_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"3","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.bw_id%>"/>-->
+<!--                                            <input style="width: 250px;" type="text" name="<%=unwin%>[<%=index%>][pc_id]" class="form-control selectpage" data-source="fault/selectpage" data-multiple="true" data-primary-key="fault_id"  data-field="name" data-params='{"custom[fault_type]":"4","custom[sim_type]":"{$row.sim_type}"}' value="<%=row.pc_id%>"/>-->
+
+<!--                                            <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>-->
+<!--                                        </dd>-->
+<!--                                    </script>-->
+<!--                                </div>-->
                             </div>
                         </div>
                         <div class="form-group" style="text-align: center">

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

@@ -97,12 +97,18 @@
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
                     </tr>
-                    <tr>
+                    <tr style="height: 60px">
                         <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>{$row.xianxian_content_name|htmlentities}</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>

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);
+                // }
 
             });
 
@@ -162,6 +162,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             //追加记录
             $(document).on('click', '.btn-addlog', function () {
                 var ids = Config.ids;
+                var other_report_count = Config.other_report_count;
+                if(other_report_count==3){
+                    Layer.alert('维修报告最多允许增加三条');
+                    return false;
+                }
                 Fast.api.open('student/collection/addreport/ids/'+ids, __("维修报告"), {area: ["99%", "70%"], maxmin: true, moveOut: false});
             });
             //编辑记录

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

@@ -255,10 +255,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                         },
                         {field: 'total_score', title: __('考试成绩')},
                         {field: 'fault_names', title: __('出题题目'),formatter: Table.api.formatter.faultname},
-                        {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.faultname},
-                        {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.faultname},
-                        {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.faultname},
-                        {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.faultname},
+                        {field: 'xianxiang_names', title: __('故障现象'),formatter: Table.api.formatter.answerName},
+                        {field: 'yuanyin_names', title: __('可能原因'),formatter: Table.api.formatter.answerName},
+                        {field: 'buwei_names', title: __('故障部位'),formatter: Table.api.formatter.answerName},
+                        {field: 'fangfa_names', title: __('排除方法'),formatter: Table.api.formatter.answerName},
                         {field: 'operate', title: __('Operate'), table: table1,
                             events: Table.api.events.operate,
                             // formatter: Table.api.formatter.operate
@@ -359,6 +359,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
 
             $("button[name=commonSearch]").css('display','none');
 
+            //定时刷新
+            setInterval(function() {
+                table.bootstrapTable('refresh');
+                table1.bootstrapTable('refresh');
+                table2.bootstrapTable('refresh');
+            }, 30000);
+
         },
         add: function () {
             Controller.api.bindevent();