20250206 调整

application/admin/controller/teacher/Exams.php

@@ -143,34 +143,25 @@ 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']))
+        $row['yuanyin_content_name'] = '';
+        if(!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) :'不存在或未选择';
+            $row['yuanyin_content_name'] = json_decode($row['yuanyin_content'],true);
         }
-
-        if($row['buwei_score']>0 &&empty($row['buwei_content']))
+        $row['buwei_content_name'] = '';
+        if(!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) :'不存在或未选择';
+            $row['buwei_content_name'] = json_decode($row['buwei_content'],true);
         }
-        if($row['fangfa_score']>0 && empty($row['fangfa_content']))
+        $row['fangfa_content_name'] = '';
+        if(!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['fangfa_content_name'] = json_decode($row['fangfa_content'],true);
         }
 
         if (false === $this->request->isPost()) {

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

@@ -91,7 +91,13 @@
                     <tr>
                         <td>故障现象少写或错写1条扣1分</td>
                         <td><input type="text" name="row[xianxian_score]" value="{$row.xianxian_score|htmlentities}"></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>可能原因少写或错写1条扣1分</td>
@@ -101,16 +107,19 @@
                     <tr>
                         <td>故障部位少写或错写1条扣1分</td>
                         <td><input type="text" name="row[buwei_score]" value="{$row.buwei_score|htmlentities}"></td>
-                        <td>{$row.buwei_content_name|htmlentities}</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;
+                            {/volist}
+                            {/if}
+                        </td>
                     </tr>
                     <tr>
                         <td>排除方法少写或错写1条扣1分</td>
                         <td><input type="text" name="row[fangfa_score]" value="{$row.fangfa_score|htmlentities}"></td>
                         <td>{$row.fangfa_content_name|htmlentities}</td>
                     </tr>
-<!--                    <tr>-->
-<!--                        <td>修复结论错扣2分</td><td><input type="text" name="row[jielun_score]" value="{$row.jielun_score|htmlentities}"></td>-->
-<!--                    </tr>-->
                     <tr>
                         <td colspan="3">三.维修时间(10分)</td>
                     </tr>