202508121 考试交接逻辑调整

application/admin/controller/student/Collection.php

@@ -166,13 +166,13 @@ class Collection extends Backend
         }
         if ($this->request->isPost()) {
             //先请求接口判断，再进行处理
-            if(Env::get('app.is_fault')){
-                $url = config('site.url_type').'/sim/real-exam/student/exam/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/exam/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');
 
@@ -626,6 +626,10 @@ class Collection extends Backend
         $paichu = Fault::where(['fault_type'=>4,'sim_type'=>$row->sim_type])->select();
         $this->view->assign('paichu', $paichu);
 
+        $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

@@ -284,11 +284,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             $(document).on('click', '.btn-jiaojuan', function () {
-                Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
-                    icon: 3,
-                    title: '提示'
+                // Layer.confirm(__('确定交卷？<br/>交卷后无法再修改维修报告和进行维修。'), {
+                //     icon: 3,
+                //     title: '提示'
+                // }, function (index) {
+                //     Layer.close(index);
+                //     $("#update-form").submit();
+                // });
+                Layer.confirm("确定交卷？<br/>交卷后无法再修改维修报告和进行维修。", {
+                    type: 3,
+                    skin: '提示'
                 }, 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,
+                        }, function (data) {
+                            console.log(data);
+                            if(data.code==200 ){
+                                $("#update-form").submit();
+                            }else{
+                                Layer.close(index);
+                                Layer.alert(data.msg);
+                            }
+                        });
+                    }else{
+                        $("#update-form").submit();
+                    }
+
                 });
             });