贾小兵 1 mese fa
parent
commit
66d67aaba1

+ 2 - 1
application/admin/controller/student/Collection.php

@@ -121,7 +121,7 @@ class Collection extends Backend
             if(empty($sim)){
                 $this->error('未找到模拟器,不可考试');
             }
-            $this->exam_model->where('exam_id',$info['exam_id'])->update(['seat_id'=>$this->auth->seat_id,'sim_id'=>$sim['sim_id']]);
+//            $this->exam_model->where('exam_id',$info['exam_id'])->update(['seat_id'=>$this->auth->seat_id,'sim_id'=>$sim['sim_id']]);
             $info['seat_id'] = $this->auth->seat_id;
             $sim_text = '';
             if(!empty($sim)){
@@ -159,6 +159,7 @@ class Collection extends Backend
         $this->view->assign('row', $row);
         $this->assignConfig('exam_id', $info['exam_id']);
         $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();
     }

+ 3 - 3
application/admin/controller/student/Exercise.php

@@ -80,8 +80,8 @@ class Exercise extends Backend
                     'exam_collection_name' => $params['exam_collection_name'],
                     'exam_collection_type' =>$params['exam_collection_type'],
                     'sim_type' => $params['sim_type'],
-                    'seat_id' =>$this->auth->seat_id,
-                    'sim_id' =>$sim['sim_id'],
+                    'seat_id' =>0,
+                    'sim_id' =>0,
                     'exam_status'=>4,
                     'start_time'=>date('Y-m-d H:i:s'),
                     'starttime'=>time(),
@@ -137,7 +137,7 @@ class Exercise extends Backend
             if ($count) {
                 //先请求接口判断,再进行处理
                 if(Env::get('app.is_fault')){
-                    $url = config('site.url_type').'/sim/real-exam/student/self-exercise/start/'.$count;
+                    $url = config('site.url_type').'/sim/real-exam/student/self-exercise/start/'.$count.'?ip='.$this->auth->server_ip;
                     $ret = json_decode(send_get($url),true);
                     if($ret['code']!=200){
                         $this->error($ret['msg']);

+ 2 - 1
application/admin/controller/student/Practice.php

@@ -105,7 +105,7 @@ class Practice extends Backend
             if(empty($sim)){
                 $this->error('未找到模拟器,不可训练');
             }
-            $this->exam_model->where('exam_id',$info['exam_id'])->update(['seat_id'=>$this->auth->seat_id,'sim_id'=>$sim['sim_id']]);
+//            $this->exam_model->where('exam_id',$info['exam_id'])->update(['seat_id'=>$this->auth->seat_id,'sim_id'=>$sim['sim_id']]);
             $info['seat_id'] = $this->auth->seat_id;
             $sim_text = '';
             if(!empty($sim)){
@@ -143,6 +143,7 @@ class Practice extends Backend
         $this->view->assign('info', $info);
         $this->assignConfig('url_type', config('site.url_type'));
         $this->assignConfig('is_fault', Env::get('app.is_fault'));
+        this->assignConfig('server_ip', $this->auth->server_ip);
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

+ 2 - 1
public/assets/js/backend/student/collection.js

@@ -81,7 +81,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 $(this).addClass('btn-primary');
                 if(Config.is_fault){
                     $.ajax({
-                        url: Config.url_type+"/sim/real-exam/student/exam/start/"+Config.exam_id,
+                        ///sim/real-exam/student/exam/start/15?ip=192.168.1.110
+                        url: Config.url_type+"/sim/real-exam/student/exam/start/"+Config.exam_id+"?ip="+Config.server_ip,
                         type: 'get',
                         success: function (data) {
                             console.log(data);

+ 1 - 1
public/assets/js/backend/student/practice.js

@@ -98,7 +98,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 $(this).addClass('btn-primary');
                 if(Config.is_fault){
                     $.ajax({
-                        url: Config.url_type+"/sim/real-exam/student/exercise/start/"+Config.exam_id,
+                        url: Config.url_type+"/sim/real-exam/student/exercise/start/"+Config.exam_id+"?ip="+Config.server_ip,
                         type: 'get',
                         success: function (data) {
                             console.log(data);