202508121 考试、训练、练习交接逻辑调整

application/admin/controller/student/Exercise.php

@@ -198,13 +198,13 @@ class Exercise extends Backend
         if ($this->request->isPost()) {
 
             //先请求接口判断，再进行处理
-            if(Env::get('app.is_fault')){
-                $url = config('site.url_type').'/sim/real-exam/student/self-exercise/submit/'.$ids.'?ip='.$this->auth->server_ip;
-                $ret = json_decode(send_get($url),true);
-                if($ret['code']!=200){
-                    $this->error($ret['msg']);
-                }
-            }
+//            if(Env::get('app.is_fault')){
+//                $url = config('site.url_type').'/sim/real-exam/student/self-exercise/submit/'.$ids.'?ip='.$this->auth->server_ip;
+//                $ret = json_decode(send_get($url),true);
+//                if($ret['code']!=200){
+//                    $this->error($ret['msg']);
+//                }
+//            }
 
             //计算分数，保存记录
             $params = $this->request->post('row/a');
@@ -632,6 +632,10 @@ class Exercise extends Backend
         $this->assignConfig('isloading',$isloading);
 
         $this->view->assign('row', $row);
+        $this->assignConfig('exam_id', $ids);
+        $this->assignConfig('url_type', config('site.url_type'));
+        $this->assignConfig('server_ip', $this->auth->server_ip);
+        $this->assignConfig('is_fault', Env::get('app.is_fault'));
         return $this->view->fetch();
     }
 

application/admin/controller/student/Practice.php

@@ -150,15 +150,15 @@ class Practice extends Backend
         }
         if ($this->request->isPost()) {
             //先请求接口判断，再进行处理
-            if(Env::get('app.is_fault')){
-                $url = config('site.url_type').'/sim/real-exam/student/exercise/submit/'.$ids.'?ip='.$this->auth->server_ip;
-                // /dev-api/sim/real-exam/student/exam/submit/{examId}
-                $ret = json_decode(send_get($url),true);
-                // halt($ret);
-                if($ret['code']!=200){
-                    $this->error($ret['msg']);
-                }
-            }
+//            if(Env::get('app.is_fault')){
+//                $url = config('site.url_type').'/sim/real-exam/student/exercise/submit/'.$ids.'?ip='.$this->auth->server_ip;
+//                // /dev-api/sim/real-exam/student/exam/submit/{examId}
+//                $ret = json_decode(send_get($url),true);
+//                // halt($ret);
+//                if($ret['code']!=200){
+//                    $this->error($ret['msg']);
+//                }
+//            }
 
             //计算分数，保存记录
             $params = $this->request->post('row/a');
@@ -608,6 +608,11 @@ class Practice extends Backend
         $this->assignConfig('timer',$timer);
         $this->assignConfig('isloading',$isloading);
         $this->view->assign('row', $row);
+
+        $this->assignConfig('exam_id', $ids);
+        $this->assignConfig('url_type', config('site.url_type'));
+        $this->assignConfig('server_ip', $this->auth->server_ip);
+        $this->assignConfig('is_fault', Env::get('app.is_fault'));
         return $this->view->fetch();
     }
 

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

@@ -301,16 +301,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             type: 'get',
                         }, function (data) {
                             console.log(data);
-                            if(data.code==200 ){
+                            if(data.code==200){
                                 $("#update-form").submit();
                             }else{
+                                Layer.closeAll();
                                 Layer.alert(data.msg);
                             }
                         });
                     }else{
                         $("#update-form").submit();
                     }
-                    Layer.closeAll();
                 });
             });
 

public/assets/js/backend/student/exercise.js

@@ -175,11 +175,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             $(document).on('click', '.btn-jiaojuan', function () {
+                // Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
+                //     icon: 3,
+                //     title: '提示'
+                // }, function (index) {
+                //     $("#update-form").submit();
+                // });
                 Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
                     icon: 3,
                     title: '提示'
                 }, function (index) {
-                    $("#update-form").submit();
+                    if(Config.is_fault){
+                        Fast.api.ajax({
+                            url: Config.url_type+"/sim/real-exam/student/exam/submit/"+Config.exam_id+"?ip="+Config.server_ip,
+                            type: 'get',
+                        }, function (data) {
+                            console.log(data);
+                            if(data.code==200){
+                                $("#update-form").submit();
+                            }else{
+                                Layer.closeAll();
+                                Layer.alert(data.msg);
+                            }
+                        });
+                    }else{
+                        $("#update-form").submit();
+                    }
                 });
             });
 

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

@@ -148,7 +148,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             if(Config.is_fault){
                 var index =  Layer.load(2, {
                     shade: [0.5,'#393D49'],
-                    content: '正在刷新检查模拟器，请稍后...', // 这里是加载的文字
+                    content: '正在刷新检查模拟器，请稍后...', // 这里是加载的文字pro
                 });
                 $.ajax({
                     url: Config.url_type+"/sim/real-exam/student/refresh-sim-state?userId="+Config.user_id+"&ip="+Config.server_ip,
@@ -299,11 +299,32 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             $(document).on('click', '.btn-jiaojuan', function () {
+                // Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
+                //     icon: 3,
+                //     title: '提示'
+                // }, function (index) {
+                //     $("#update-form").submit();
+                // });
                 Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
                     icon: 3,
                     title: '提示'
                 }, function (index) {
-                    $("#update-form").submit();
+                    if(Config.is_fault){
+                        Fast.api.ajax({
+                            url: Config.url_type+"/sim/real-exam/student/exam/submit/"+Config.exam_id+"?ip="+Config.server_ip,
+                            type: 'get',
+                        }, function (data) {
+                            console.log(data);
+                            if(data.code==200){
+                                $("#update-form").submit();
+                            }else{
+                                Layer.closeAll();
+                                Layer.alert(data.msg);
+                            }
+                        });
+                    }else{
+                        $("#update-form").submit();
+                    }
                 });
             });