20250209 优化调整

application/admin/controller/student/Practice.php

@@ -170,7 +170,7 @@ class Practice extends Backend
         if ($this->request->isPost()) {
             //先请求接口判断，再进行处理
             if(Env::get('app.is_fault')){
-                $url = config('site.url_type').'/sim/real-exam/student/exam/submit/'.$ids;
+                $url = config('site.url_type').'/sim/real-exam/student/exercise/submit/'.$ids;
                 // /dev-api/sim/real-exam/student/exam/submit/{examId}
                 $ret = json_decode(send_get($url),true);
                 // halt($ret);

application/admin/controller/teacher/Exams.php

@@ -297,7 +297,7 @@ class Exams extends Backend
                         $sim_state = '在线';
                         break;
                     case '2':
-                        $sim_state = '模拟器离线';
+                        $sim_state = '离线';
                         break;
                     default:
                         $sim_state = '';
@@ -316,8 +316,10 @@ class Exams extends Backend
             if(!empty($exam)){
                 $user_username = $exam['user_username']??'';
                 $user_nickname = $exam['user_nickname']??'';
-                if($exam['exam_status']==4){
-                    $exam_status= '答题中';
+                if($exam['exam_status']==1){
+                    $exam_status= '已登录未开始考试';
+                }else if($exam['exam_status']==4){
+                    $exam_status= '已开始考试';
                 }else if($exam['exam_status']==5){
                     $exam_status= '已交卷';
                 }

application/admin/library/Auth.php

@@ -78,6 +78,7 @@ class Auth extends \fast\Auth
                 $admin->seat_id = 1;
                 //$admin->sim_id = 11;
             }
+            Db::name('real_exam')->where(['user_username'=>$username,'exam_status'=>0])->update(['exam_status'=>1]);
         }
         Session::set("admin", $admin->toArray());
         Session::set("admin.safecode", $this->getEncryptSafecode($admin));

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

@@ -37,6 +37,8 @@
         opacity: 0;
     }
     .panel-heading{font-size: 18px}
+    #layui-layer1{width: 200px !important}
+    .layui-layer-loading2{width: 300px !important;padding-left:40px;line-height:35px}
 </style>
 <div class="row animated fadeInRight">
     <div class="col-md-12">

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

@@ -21,14 +21,31 @@
         background-color: #CCE8EB;
         width: 100px;
     }
-     .djs{
+
+    .new_table1 {
+        border-collapse: collapse;
+        margin: 0 auto;
+        text-align: center;
+        width: 100%;
+        font-size: 12px;
+    }
+
+    .new_table1 td{
+        border: 1px solid #cad9ea;
+        color: #666;
+        height: 3.5em;
+/*        padding-left: 1% !important;*/
+    }
+
+
+    .djs{
          margin-right: 5%;
          text-align: center;
          line-height:8px;
          font-size:20px;
          margin-top: 50px;
          margin-bottom:3%
-     }
+    }
 </style>
 
 <div class="row">
@@ -93,40 +110,49 @@
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
                     </tr>
-                    <tr>
-                        <td style="width:5%">序号</td>
-                        <td style="width:15%">故障现象</td>
-                        <td style="width:20%">可能原因</td>
-                        <td style="width:10%">故障部位</td>
-                        <td style="width:35%">排除方法</td>
-                    </tr>
-                    {if $other_report}
-                    {volist name="other_report" id="vo2"}
-                    <tr style="height: 60px">    
-                        <td>{++$key}</td>
-                        <td>{$vo2.xx_name|htmlentities}</td>
-                        <td>{$vo2.yy_name|htmlentities}</td>
-                        <td>{$vo2.bw_name|htmlentities}</td>
-                        <td>{$vo2.pc_name|htmlentities}</td>
-                    </tr>
-                    {/volist}
-                    {/if}
+                    </table>
+
+                    <table class="new_table1">
+                        <tr>
+                            <td>序号</td>
+                            <td>故障现象</td>
+                            <td>可能原因</td>
+                            <td>故障部位</td>
+                            <td>排除方法</td>  
+                        </tr>
+                        {if $other_report}
+                        {volist name="other_report" id="vo2"}
+                        <tr style="height: 60px">    
+                            <td>{++$key}</td>
+                            <td>{$vo2.xx_name|htmlentities}</td>
+                            <td>{$vo2.yy_name|htmlentities}</td>
+                            <td>{$vo2.bw_name|htmlentities}</td>
+                            <td>{$vo2.pc_name|htmlentities}</td>
+                        </tr>
+                        {/volist}
+                        {else/}
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%"></td>
+                        </tr>
+                        {/if}
+                    </table>
+                    <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: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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -135,11 +161,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -148,11 +174,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -161,11 +187,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>

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

@@ -8,7 +8,6 @@
         width: 100%;
         font-size: 12px;
     }
-
     .new_table td,
     table th {
         border: 1px solid #cad9ea;
@@ -16,12 +15,24 @@
         height: 3.5em;
         padding-left: 1%;
     }
-
     .new_table thead th {
         background-color: #CCE8EB;
         width: 100px;
     }
+    .new_table1 {
+        border-collapse: collapse;
+        margin: 0 auto;
+        text-align: center;
+        width: 100%;
+        font-size: 12px;
+    }
 
+    .new_table1 td{
+        border: 1px solid #cad9ea;
+        color: #666;
+        height: 3.5em;
+/*        padding-left: 1% !important;*/
+    }
 
 
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
@@ -90,36 +101,44 @@
                         <tr>
                             <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
                         </tr>
-                        <tr>
-                            <td style="width:5%">序号</td>
-                            <td style="width:15%">故障现象</td>
-                            <td style="width:20%">可能原因</td>
-                            <td style="width:10%">故障部位</td>
-                            <td style="width:35%">排除方法</td>
-                        </tr>
-                        {if $other_report}
-                        {volist name="other_report" id="vo2"}
-                        <tr style="height: 60px">    
-                            <td>{++$key}</td>
-                            <td>{$vo2.xx_name|htmlentities}</td>
-                            <td>{$vo2.yy_name|htmlentities}</td>
-                            <td>{$vo2.bw_name|htmlentities}</td>
-                            <td>{$vo2.pc_name|htmlentities}</td>
-                        </tr>
-                        {/volist}
-                        {/if}
+                        </table>
+                        <table class="new_table1">
+                            <tr>
+                                <td>序号</td>
+                                <td>故障现象</td>
+                                <td>可能原因</td>
+                                <td>故障部位</td>
+                                <td>排除方法</td>  
+                            </tr>
+                            {if $other_report}
+                            {volist name="other_report" id="vo2"}
+                            <tr style="height: 60px">    
+                                <td>{++$key}</td>
+                                <td>{$vo2.xx_name|htmlentities}</td>
+                                <td>{$vo2.yy_name|htmlentities}</td>
+                                <td>{$vo2.bw_name|htmlentities}</td>
+                                <td>{$vo2.pc_name|htmlentities}</td>
+                            </tr>
+                            {/volist}
+                            {else/}
+                            <tr>
+                                <td colspan="5" style="text-align: left;padding-left: 1%"></td>
+                            </tr>
+                            {/if}
+                        </table>
+                        <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: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_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" }
@@ -132,11 +151,11 @@
                             <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_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;
+                                <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                                 {/volist}
                                 {/if}
                             </td>
@@ -145,11 +164,11 @@
                             <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_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;
+                                <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                                 {/volist}
                                 {/if}
                             </td>
@@ -158,11 +177,11 @@
                             <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_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;
+                                <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                                 {/volist}
                                 {/if}
                             </td>

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

@@ -22,7 +22,20 @@
         width: 100px;
     }
 
+    .new_table1 {
+        border-collapse: collapse;
+        margin: 0 auto;
+        text-align: center;
+        width: 100%;
+        font-size: 12px;
+    }
 
+    .new_table1 td{
+        border: 1px solid #cad9ea;
+        color: #666;
+        height: 3.5em;
+/*        padding-left: 1% !important;*/
+    }
 
     .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
         background-color: #17223f;
@@ -91,36 +104,44 @@
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
                     </tr>
-                    <tr>
-                        <td style="width:5%">序号</td>
-                        <td style="width:15%">故障现象</td>
-                        <td style="width:20%">可能原因</td>
-                        <td style="width:10%">故障部位</td>
-                        <td style="width:35%">排除方法</td>
-                    </tr>
-                    {if $other_report}
-                    {volist name="other_report" id="vo2"}
-                    <tr style="height: 60px">    
-                        <td>{++$key}</td>
-                        <td>{$vo2.xx_name|htmlentities}</td>
-                        <td>{$vo2.yy_name|htmlentities}</td>
-                        <td>{$vo2.bw_name|htmlentities}</td>
-                        <td>{$vo2.pc_name|htmlentities}</td>
-                    </tr>
-                    {/volist}
-                    {/if}
+                    </table>
+                    <table class="new_table1">
+                        <tr>
+                            <td>序号</td>
+                            <td>故障现象</td>
+                            <td>可能原因</td>
+                            <td>故障部位</td>
+                            <td>排除方法</td>  
+                        </tr>
+                        {if $other_report}
+                        {volist name="other_report" id="vo2"}
+                        <tr style="height: 60px">    
+                            <td>{++$key}</td>
+                            <td>{$vo2.xx_name|htmlentities}</td>
+                            <td>{$vo2.yy_name|htmlentities}</td>
+                            <td>{$vo2.bw_name|htmlentities}</td>
+                            <td>{$vo2.pc_name|htmlentities}</td>
+                        </tr>
+                        {/volist}
+                        {else/}
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%"></td>
+                        </tr>
+                        {/if}
+                    </table>
+                    <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: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_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" }
@@ -133,11 +154,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                             {/volist}
                             {/if}
                         </td>
@@ -146,11 +167,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                             {/volist}
                             {/if}
                         </td>
@@ -159,11 +180,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span>&nbsp;&nbsp;&nbsp;<br/>
                             {/volist}
                             {/if}
                         </td>

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

@@ -37,6 +37,8 @@
         opacity: 0;
     }
     .panel-heading{font-size: 18px}
+    #layui-layer1{width: 200px !important}
+    .layui-layer-loading2{width: 300px !important;padding-left:40px;line-height:35px}
 </style>
 <div class="row animated fadeInRight">
     <div class="col-md-12">

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

@@ -109,6 +109,10 @@
                                     <td>{$vo2.pc_name|htmlentities}</td>
                                 </tr>
                                 {/volist}
+                                {else/}
+                                <tr>
+                                    <td colspan="4" style="text-align: left;padding-left: 1%"></td>
+                                </tr>
                                 {/if}
                             </table>
                         </td>
@@ -120,7 +124,7 @@
                         <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/>
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -131,7 +135,7 @@
                         <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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -142,7 +146,7 @@
                         <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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -153,7 +157,7 @@
                         <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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -164,7 +168,6 @@
                     <tr>
                         <td>按每超过1分钟扣1分的比例扣分</td>
                         <td colspan="2"><input type="text" name="row[overtime_score]" value="{$row.overtime_score|htmlentities}"></td>
-
                     </tr>
                     <tr>
                         <td colspan="3" style="height: 3.5rem">总得分:{$row.total|htmlentities}</td>

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

@@ -21,7 +21,23 @@
         background-color: #CCE8EB;
         width: 100px;
     }
-     .djs{
+
+     .new_table1 {
+        border-collapse: collapse;
+        margin: 0 auto;
+        text-align: center;
+        width: 100%;
+        font-size: 12px;
+    }
+
+    .new_table1 td{
+        border: 1px solid #cad9ea;
+        color: #666;
+        height: 3.5em;
+/*        padding-left: 1% !important;*/
+    }
+
+    .djs{
          margin-right: 5%;
          text-align: center;
          line-height:8px;
@@ -94,40 +110,49 @@
                     <tr>
                         <td colspan="5" style="text-align: left;padding-left: 1%">学员答作答情况</td>
                     </tr>
-                    <tr>
-                        <td style="width:5%">序号</td>
-                        <td style="width:15%">故障现象</td>
-                        <td style="width:20%">可能原因</td>
-                        <td style="width:10%">故障部位</td>
-                        <td style="width:35%">排除方法</td>
-                    </tr>
-                    {if $other_report}
-                    {volist name="other_report" id="vo2"}
-                    <tr style="height: 60px">    
-                        <td>{++$key}</td>
-                        <td>{$vo2.xx_name|htmlentities}</td>
-                        <td>{$vo2.yy_name|htmlentities}</td>
-                        <td>{$vo2.bw_name|htmlentities}</td>
-                        <td>{$vo2.pc_name|htmlentities}</td>
-                    </tr>
-                    {/volist}
-                    {/if}
+                    </table>
+
+                    <table class="new_table1">
+                        <tr>
+                            <td>序号</td>
+                            <td>故障现象</td>
+                            <td>可能原因</td>
+                            <td>故障部位</td>
+                            <td>排除方法</td>  
+                        </tr>
+                        {if $other_report}
+                        {volist name="other_report" id="vo2"}
+                        <tr style="height: 60px">    
+                            <td>{++$key}</td>
+                            <td>{$vo2.xx_name|htmlentities}</td>
+                            <td>{$vo2.yy_name|htmlentities}</td>
+                            <td>{$vo2.bw_name|htmlentities}</td>
+                            <td>{$vo2.pc_name|htmlentities}</td>
+                        </tr>
+                        {/volist}
+                        {else/}
+                        <tr>
+                            <td colspan="5" style="text-align: left;padding-left: 1%"></td>
+                        </tr>
+                        {/if}
+                    </table>
+                    <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:10%">报告情况</td> -->
                         <td style="width:45%">扣分原因</td>
                     </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>{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/>
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -136,11 +161,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -149,11 +174,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -162,11 +187,11 @@
                         <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_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;
+                            <span class="text-danger">{$vo.cx_type}:{$vo.cx_name}</span><br/>
                             {/volist}
                             {/if}
                         </td>
@@ -178,10 +203,6 @@
                         <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
                         <td colspan="3">{$row.overtime_score|htmlentities}</td>
                     </tr>
-<!--                    <tr>-->
-<!--                        <td colspan="2">扣分小计</td>-->
-<!--                        <td colspan="2">超时</td>-->
-<!--                    </tr>-->
                     <tr>
                         <td colspan="2">五.成绩</td>
                         <td colspan="3">{$row.total|htmlentities}</td>

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

@@ -73,9 +73,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         into: function () {
             $(document).on('click', '.btn-startexam', function () {
                 // var index = Layer.load(0, {shade: false}); //0代表加载的风格，支持0-2
-                var index =  Layer.load(0, {
+                var index =  Layer.load(2, {
                     shade: [0.5,'#393D49'],
-                    // content: '考试加载中...', // 这里是加载的文字
+                    content: '正在检查模拟器并下发故障，请稍后...', // 这里是加载的文字
                 });
                 $(this).removeClass('btn-info');
                 $(this).addClass('btn-primary');

public/assets/js/backend/student/practice.js

@@ -90,20 +90,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             //     }
             // });
             $(document).on('click', '.btn-startexam', function () {
+                var index =  Layer.load(2, {
+                    shade: [0.5,'#393D49'],
+                    content: '正在检查模拟器并下发故障，请稍后...', // 这里是加载的文字
+                });
+                $(this).removeClass('btn-info');
+                $(this).addClass('btn-primary');
                 if(Config.is_fault){
-                    // $.ajax({
-                    //     url: Config.url_type+"/sim/real-exam/student/exam/start/"+Config.exam_id,
-                    //     type: 'get',
-                    //     success: function (data) {
-                    //         console.log(data);
-                    //         if(data.code==200){
-                    //             window.location.href = '/admin/student/collection/examing/ids/'+Config.exam_id;
-                    //         }else{
-                    //             Layer.alert(data.msg);
-                    //             return;
-                    //         }
-                    //     }
-                    // });
+                    $.ajax({
+                        url: Config.url_type+"/sim/real-exam/student/exercise/start/"+Config.exam_id,
+                        type: 'get',
+                        success: function (data) {
+                            console.log(data);
+                            if(data.code==200){
+                                window.location.href = '/admin/student/practice/examing/ids/'+Config.exam_id;
+                            }else{
+                                Layer.alert(data.msg);
+                                return;
+                            }
+                        }
+                    });
                 }else{
                     window.location.href = '/admin/student/practice/examing/ids/'+Config.exam_id;
                 }

public/assets/js/backend/teacher/collection.js

@@ -182,6 +182,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedRightNumber: 1,
                 searchFormVisible:false,
                 showExport:false,
+                pagination:false,
                 search:false,
                 columns: [
                     [
@@ -268,7 +269,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     fixedColumns: true,
                     fixedRightNumber: 1,
                     searchFormVisible:false,
-                    pageSize: 30,
+                    pagination:false,
                     Search:false,
                     columns: [
                         [

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

@@ -244,7 +244,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                         {field: 'seat_id', title: __('座号')},
                         {field: 'sim_state', title: __('模拟器状态'),
                             formatter: function(value, row,index) {
-                                return '<span class="text-success">'+value+'</span>';
+                                if(value=='在线'){
+                                    return '<span class="text-success">'+value+'</span>';
+                                }
+                                if(value=='离线'){
+                                    return '<span class="text-danger">'+value+'</span>';
+                                }
                             }
                         },
                         {field: 'user_username', title: __('学员学号')},

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

@@ -300,7 +300,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     fixedColumns: true,
                     fixedRightNumber: 1,
                     searchFormVisible:false,
-                    pageSize: 30,
+                    pagination:false,
                     Search:false,
                     columns: [
                         [