application/admin/controller/teacher/Exams.php

@@ -356,7 +356,7 @@ class Exams extends Backend
         if(!$row){
             $this->error(__('No Results were found'));
         }
-        $list = $this->model->where(['seat_id'=>$row->seat_id,'exam_collection_id'=>$row->exam_collection_id])->order('starttime asc')->select();
+        $list = $this->model->where(['seat_id'=>$row->seat_id,'exam_collection_id'=>$row->exam_collection_id])->order('starttime desc')->select();
         $this->view->assign('list', $list);
         return $this->view->fetch();
     }

application/admin/controller/teacher/Practice.php

@@ -43,6 +43,9 @@ class Practice extends Backend
         $this->assign('sim_question_setting_method', ConfigModel::getSimQuestionList());
 
         $this->whereExtend['exam_collection_type'] = 1;
+
+        $this->assignConfig('is_fault', Env::get('app.is_fault'));
+        $this->assignConfig('url_type', config('site.url_type'));
     }
 
 
@@ -286,17 +289,19 @@ class Practice extends Backend
         $count = 0;
         Db::startTrans();
         try {
-            if(Env::get('app.is_fault')){
-                $url = config('site.url_type').'/sim/real-exam-collection/teacher/ref/'.$ids;
-                $ret = json_decode(send_delete($url),true);
-                if($ret['code']!=200){
-                    $this->error($ret['msg']);
-                }else{
-                    $count = 1;
-                }
-            }else{
-                $count =1;
-            }
+
+            $count =1;
+//            if(Env::get('app.is_fault')){
+//                $url = config('site.url_type').'/sim/real-exam-collection/teacher/ref/'.$ids;
+//                $ret = json_decode(send_delete($url),true);
+//                if($ret['code']!=200){
+//                    $this->error($ret['msg']);
+//                }else{
+//                    $count = 1;
+//                }
+//            }else{
+//                $count =1;
+//            }
             //删除考试集合  real_exam_collection
 //            foreach ($list as $item) {
 ////                if($item['yikao_count']>0){

application/admin/view/teacher/practice/index.html

@@ -1,3 +1,6 @@
+<style>
+    .layui-layer-loading2{width: 300px !important;padding-left:40px;line-height:35px}
+</style>
 <div class="panel panel-default panel-intro">
     {:build_heading()}
 
@@ -9,7 +12,7 @@
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('teacher/collection/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}训练</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('teacher/practice/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}训练</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('teacher/practice/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}训练</a>
+                        <a href="javascript:;" class="btn btn-danger btn-dels btn-disabled disabled {:$auth->check('teacher/practice/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}训练</a>
 
 
 <!--                        <a href="javascript:;" class="btn btn-warning btn-start btn-disabled disabled {:$auth->check('teacher/practice/start')?'':'hide'}" title="{:__('开始训练')}" ><i class="fa fa-play-circle"></i> {:__('开始训练')}</a>-->

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

@@ -163,6 +163,67 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                     Layer.close(index);
                 });
             });
+
+            //删除训练
+            $(document).on('click', '.btn-dels', function () {
+                var ids = Table.api.selectedids(table);
+                var tishi = '<div class="mui-popup-text" style="text-align: center;">';
+                tishi +='<span style="text-align:center;font-size:18px;font-weight:550;">安全提示</span><br/></div>';
+                tishi += '<div class="mui-popup-text" style="text-align: left;">';
+                tishi +='<span style="text-align:left;"> 确定删除选中的1项?<br/> 如确定删除，请在文本框输入【确认删除】，点击确定进行删除</span><br/>';
+                tishi +='<span style="text-align:left;"> <input type="text" class="qd_text form-control" placeholder="确认删除"></span><br/>';
+                tishi +='</div>';
+                Layer.confirm(tishi, {btn: ['取消', '确定'], title: "提示"}, function () {
+                    $(".layui-layer,.layui-layer-shade").css('display','none');
+                },function(){
+                    var qd_text = $(".qd_text").val();
+                    if(qd_text!='确认删除'){
+                        layer.alert('请输入【确认删除】再操作');
+                        return false;
+                    }
+                    var indexnew =  Layer.load(2, {
+                        shade: [0.5,'#393D49'],
+                        content: '正在删除训练中，请稍后...', // 这里是加载的文字
+                    });
+                    if(Config.is_fault){
+                        $.ajax({
+                            type:'post',
+                            url:Config.url_type+'/sim/real-exam-collection/teacher/exercise/close/'+ids,
+                            success:function(data){
+                                if(data.code==200){
+                                    Layer.close(indexnew);
+                                    table.bootstrapTable('refresh');
+                                }else{
+                                    Layer.close(indexnew);
+                                    Layer.alert(data.msg);
+                                }
+                            },
+                            error:function(){
+                                layer.alert("操作失败");
+                                return;
+                            }
+                        })
+                    }else{
+                        $.ajax({
+                            type:'post',
+                            url:'teacher/practice/del/ids/'+ids,
+                            success:function(data){
+                                if(data.code==1){
+                                    Layer.close(indexnew);
+                                    table.bootstrapTable('refresh');
+                                }else{
+                                    Layer.close(indexnew);
+                                    Layer.alert(data.msg);
+                                }
+                            },
+                            error:function(){
+                                layer.alert("操作失败");
+                                return;
+                            }
+                        })
+                    }
+                });
+            });
         },
         persent: function () {
             Table.api.init({