Selaa lähdekoodia

20250316 调整

贾小兵 1 kuukausi sitten
vanhempi
commit
9444fface3

+ 8 - 0
application/admin/controller/student/Collection.php

@@ -148,6 +148,14 @@ class Collection extends Backend
             }
 //            模拟器状态 0:可用初始化 1:在线 2:模拟器离线 3:网关离线 4:硬件故障异常 5:手动禁用
             $info['sim_text'] = $sim_text;
+            if(Env::get('app.is_fault')){
+                $url = config('site.url_type').'/sim/real-exam/student/refresh-sim-state?ip='.$this->auth->server_ip;
+                $ret = json_decode(send_get($url),true);
+                if($ret['code']!=200){
+                    $sim_text = $ret['msg'];
+                }
+            }
+            $info['sim_text'] = $sim_text;
             $info['sim_type_text'] = $sim_type_text;
         }
         if(!empty($info['starttime']))

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

@@ -143,7 +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->assignConfig('server_ip', $this->auth->server_ip);
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }

+ 1 - 1
application/admin/view/teacher/collection/add.html

@@ -8,7 +8,7 @@
         <div class="form-group col-sm-12">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-exam_collection_name" data-rule="required" class="form-control" name="row[exam_collection_name]" type="text">
+                <input id="c-exam_collection_name" data-rule="required;length(1~40)" class="form-control" name="row[exam_collection_name]" type="text">
             </div>
         </div>
 

+ 1 - 1
application/admin/view/teacher/collection/edit.html

@@ -3,7 +3,7 @@
         <div class="form-group col-sm-12">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-exam_collection_name" {if $row.starttime>0} readonly {/if} data-rule="required" class="form-control" name="row[exam_collection_name]" value="{$row.exam_collection_name|htmlentities}" type="text">
+                <input id="c-exam_collection_name" {if $row.starttime>0} readonly {/if} data-rule="required;length(1~40)" class="form-control" name="row[exam_collection_name]" value="{$row.exam_collection_name|htmlentities}" type="text">
             </div>
         </div>
 

+ 1 - 1
application/admin/view/teacher/practice/add.html

@@ -8,7 +8,7 @@
         <div class="form-group col-sm-12">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-exam_collection_name" data-rule="required" class="form-control" name="row[exam_collection_name]" type="text">
+                <input id="c-exam_collection_name" data-rule="required;length(1~40)" class="form-control" name="row[exam_collection_name]" type="text">
             </div>
         </div>
 

+ 1 - 1
application/admin/view/teacher/practice/edit.html

@@ -3,7 +3,7 @@
         <div class="form-group col-sm-12">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-exam_collection_name" {if $row.starttime>0} readonly {/if} data-rule="required" class="form-control" name="row[exam_collection_name]" value="{$row.exam_collection_name|htmlentities}" type="text">
+                <input id="c-exam_collection_name" {if $row.starttime>0} readonly {/if} data-rule="required;length(1~40)" class="form-control" name="row[exam_collection_name]" value="{$row.exam_collection_name|htmlentities}" type="text">
             </div>
         </div>