20250108 调整

application/admin/controller/student/Collection.php

@@ -68,6 +68,7 @@ class Collection extends Backend
         ->join('real_exam r','z.exam_collection_id=r.exam_collection_id','left')
         ->where('z.exam_collection_type=3 and z.exam_collection_state=2 and r.endtime=0 and r.user_id='.$this->auth->id)->find();
 
+//        halt($this->model->getLastSql());
         if(empty($isset)){
             //提示页面，没有开始的考试
             return $this->view->fetch('tishi');
@@ -133,6 +134,11 @@ class Collection extends Backend
             }
             $info['sim_text'] = $sim_text;
         }
+        if(!empty($info['starttime']))
+        {
+            echo "<script>location.href='/ZQOtIMLKud.php/student/collection/examing/ids/".$info['exam_id']."'</script>";
+            die();
+        }
         if ($this->request->isPost()) {
 //            $exam_collection_id = $this->request->post('exam_collection_id');
 //            if(empty($info->starttime)){
@@ -163,9 +169,9 @@ class Collection extends Backend
 
             $result = false;
             $score = 100;
-            $fault_one_score = 0;
-            $fault_two_score = 0;
-            $fault_three_score = 0;
+            $fault_one_score = 25;
+            $fault_two_score = 25;
+            $fault_three_score = 25;
             $xianxian_score = 0;
             $yuanyin_socre= 0;
             $buwei_score= 0;
@@ -182,35 +188,24 @@ class Collection extends Backend
 
                 $info = $this->exam_model->where(['exam_id'=>$ids])->find();
 
-                //更新考试关联表，计算得分 mx_real_exam_fault
-//                $fault_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
-//                foreach ($fault_list as $it)
-//                {
-//                    $update['sim_fault_answer_value'] ='0000000'.rand(1,2);
-//                    if($update['sim_fault_answer_value']==$it['sim_fault_question_value']){
-//                        $update['answer_right'] = 1;
-//                    }else{
-//                        $update['answer_right'] = 2;
-//                    }
-//                    Db::name('real_exam_fault')->where('ref_id',$it['ref_id'])->update($update);
-//                }
-//                unset($it);
-
                 //计算得分，故障是否有扣分  扣分制
                 $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1,'answer_right'=>['>',0]])->select();
-                if($fault_right_list[0]['answer_right']==2){
-                    $fault_one_score = 25;
-                }
-                if($fault_right_list[1]['answer_right']==2){
-                    $fault_two_score = 25;
-                }
-                if($fault_right_list[2]['answer_right']==2){
-                    $fault_three_score = 25;
+                if(!empty($fault_right_list)){
+                    if($fault_right_list[0]['answer_right']==1){
+                        $fault_one_score = 0;
+                    }
+                    if($fault_right_list[1]['answer_right']==1){
+                        $fault_two_score = 0;
+                    }
+                    if($fault_right_list[2]['answer_right']==1){
+                        $fault_three_score = 0;
+                    }
                 }
                 $xianxian_score = rand(1,3);
                 $yuanyin_socre= rand(1,3);
                 $buwei_score= rand(1,3);
                 $fangfa_score= rand(1,3);
+
 //                if(empty($params['other_jielun'])){
 //                    $jielun_score = rand(1,3);
 //                }
@@ -259,6 +254,12 @@ class Collection extends Backend
             $row->exam_status = 4;
             $row->save();
         }
+        if(empty($row->other_replace)){
+            $row->other_replace = '[{"fault_id":"","request_status":"0"}]';
+        }
+        if(empty($row->other_report)){
+            $row->other_report = '[{"xx_id":"","yy_id":"","bw_id":"","pc_id":""}]';
+        }
 
         //还未开始考试
         $row->limit_duration = $this->model->where(['exam_collection_id'=>$row['exam_collection_id']])->value('limit_duration');
@@ -275,7 +276,7 @@ class Collection extends Backend
         $this->view->assign('row', $row);
 
         $departmentdata = [];
-        $departmentdata = Fault::where(['replace_part'=>1,'sim_type'=>$row->sim_type])->select();
+        $departmentdata = Fault::where(['replace_part'=>1,'sim_type'=>$row->sim_type])->order('fault_id asc')->select();
 
         //更换件数据
         $this->view->assign('departmentdata', $departmentdata);

application/admin/controller/student/Exam.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\student;
 use app\common\controller\Backend;
 use app\common\model\Config as ConfigModel;
 use think\Db;
+use app\admin\model\department\Department;
 
 /**
  * sim-考试表/成绩总分
@@ -32,6 +33,7 @@ class Exam extends Backend
         }
         $this->assignconfig("groupIds", $groupIds[0]);
         $this->whereExtend['exam_collection_type'] = 3;
+        $this->whereExtend['endtime'] = ['>',0];
     }
 
 
@@ -54,6 +56,7 @@ class Exam extends Backend
         $row['user_nickname'] = $rows->user_nickname;
         $row['user_username'] = $rows->user_username;
         $row['user_depart_id'] = $rows->user_depart_id;
+        $row['user_depart_name'] = Department::where('id',$rows->user_depart_id)->value('name');
         $row['start_time'] = $rows->start_time;
         $row['end_time'] = $rows->end_time;
 

application/admin/controller/teacher/Collection.php

@@ -73,6 +73,10 @@ class Collection extends Backend
         Db::startTrans();
         try {
             $depart_ids = $params['depart_ids'];
+            if($params['question_setting_method']==3 && !empty($params['fault_name'])){
+                $params['question_name'] = $params['fault_name'];
+                unset($params['fault_name']);
+            }
             $result = $this->model->allowField(true)->save($params);
             foreach(explode(',',$depart_ids) as $item){
                 if(!empty($item)){
@@ -183,6 +187,10 @@ class Collection extends Backend
         Db::startTrans();
         try {
             $depart_ids = $params['depart_ids'];
+            if($params['question_setting_method']==3 && !empty($params['fault_name'])){
+                $params['question_name'] = $params['fault_name'];
+                unset($params['fault_name']);
+            }
             $result = $row->allowField(true)->save($params);
 
             Db::name('real_exam_collection_dept')->where(['exam_collection_id'=>$row->exam_collection_id])->delete();
@@ -289,6 +297,8 @@ class Collection extends Backend
         }
         if(!empty($values['exam_collection_state'])){
             if($values['exam_collection_state']==2){
+                //触发Java端后台的接口数据，
+                // /dev-api/sim/real-exam-collection/teacher/exam/open/{examcollectionId}  $ids  put
                 $state_count = $this->model->where(['exam_collection_state'=>$values['exam_collection_state'],'exam_collection_type'=>3])->count();
                 if($state_count>0){
                     $this->error('已有启用的考试，请先关闭原来的考试');
@@ -384,4 +394,45 @@ class Collection extends Backend
         $result = $row->allowField(true)->save($params);
         $this->success('开始成功');
     }
+
+
+    public function del($ids = null)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__("Invalid parameters"));
+        }
+        $ids = $ids ?: $this->request->post("ids");
+        if (empty($ids)) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $pk = $this->model->getPk();
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            $this->model->where($this->dataLimitField, 'in', $adminIds);
+        }
+        $list = $this->model->where($pk, 'in', $ids)->select();
+
+        $count = 0;
+        Db::startTrans();
+        try {
+            //删除考试集合  mx_real_exam_collection
+            foreach ($list as $item) {
+                if($item['yikao_count']>0){
+                    $this->error('已有学生参加考试，无法删除');
+                }
+                $count += $item->delete();
+            }
+            //删除学员考试 mx_real_exam
+            //删除学员考试故障表 mx_real_exam_fault
+            //删除考试关联区队表 mx_real_exam_collection_dept
+            Db::commit();
+        } catch (PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($count) {
+            $this->success();
+        }
+        $this->error(__('No rows were deleted'));
+    }
 }

application/admin/controller/teacher/Exams.php

@@ -2,11 +2,13 @@
 
 namespace app\admin\controller\teacher;
 
+use app\admin\model\department\Department;
 use app\common\controller\Backend;
 use think\Db;
 use think\exception\PDOException;
 use think\exception\ValidateException;
 use app\admin\model\teacher\ExamsScore;
+use app\admin\model\Fault;
 /**
  * sim-考试表/成绩总分
  *
@@ -40,6 +42,34 @@ class Exams extends Backend
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
 
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)->where($this->whereExtend)
+            ->order($sort, $order)
+            ->paginate($limit);
+        //最高分 最低分 平均分
+        $select = $this->model->where($where)->where($this->whereExtend)->field('count(*) as count,sum(total_score) as totalscore,min(total_score) as min,max(total_score) as max')->select();
+        $pingfen  = bcdiv($select[0]['totalscore'],$select[0]['count']);
+
+
+        $defen = ['max'=>$select[0]['max'],'min'=>$select[0]['min'],'pingfen'=>$pingfen];
+        $result = ['total' => $list->total(), 'rows' => $list->items(),'defen'=>$defen];
+        return json($result);
+    }
+
+
+
     public function edit($ids = null)
     {
         $row = Db::name('real_exam_score')->where('exam_id', $ids)->find();
@@ -51,6 +81,13 @@ class Exams extends Backend
         $row['user_nickname'] = $rows->user_nickname;
         $row['user_username'] = $rows->user_username;
         $row['is_sure'] = $rows->is_sure;
+
+
+        $fault_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
+        $row['fault_name_one'] = Fault::where('fault_id',$fault_list[0]['fault_id'])->value('name');
+        $row['fault_name_two'] = Fault::where('fault_id',$fault_list[1]['fault_id'])->value('name');
+        $row['fault_name_three'] = Fault::where('fault_id',$fault_list[2]['fault_id'])->value('name');
+
         if (false === $this->request->isPost()) {
             $this->view->assign('row', $row);
             return $this->view->fetch();
@@ -64,7 +101,7 @@ class Exams extends Backend
         Db::startTrans();
         try {
             //是否采用模型验证
-            $params['total'] = 100-$params['fault_one_score']-$params['fault_two_score']-$params['fault_three_score']-$params['xianxian_score']-$params['yuanyin_socre']-$params['buwei_score']-$params['fangfa_score']-$params['overtime_score']-$params['jielun_score'];
+            $params['total'] = 100-$params['fault_one_score']-$params['fault_two_score']-$params['fault_three_score']-$params['xianxian_score']-$params['yuanyin_socre']-$params['buwei_score']-$params['fangfa_score']-$params['overtime_score'];
             $result = Db::name('real_exam_score')->where('id', $row['id'])->update($params);
 
             $rows->total_score = $params['total'];
@@ -92,6 +129,7 @@ class Exams extends Backend
         $row['user_nickname'] = $rows->user_nickname;
         $row['user_username'] = $rows->user_username;
         $row['user_depart_id'] = $rows->user_depart_id;
+        $row['user_depart_name'] = Department::where('id',$rows->user_depart_id)->value('name');
         $row['start_time'] = $rows->start_time;
         $row['end_time'] = $rows->end_time;
 

application/admin/lang/zh-cn.php

@@ -27,7 +27,7 @@ return [
     'Move'                                                  => '移动',
     'Name'                                                  => '名称',
     'Status'                                                => '状态',
-    'Weigh'                                                 => '权重',
+    'Weigh'                                                 => '排序',
     'Operate'                                               => '操作',
     'Warning'                                               => '温馨提示',
     'Default'                                               => '默认',

application/admin/lang/zh-cn/teacher/collection.php

@@ -5,7 +5,7 @@ return [
     'Sim_type'                => '模拟器类型',
     'Question_setting_method' => '出题方式',//:[1]-系统随机,[2]-教师自选,[3]任务自选
     'Exam_collection_type'    => '考试类型',//:[1]-练习,[2]-自主练习,[3]-考试
-    'Exam_collection_state'   => '考试集合状态',//:[0]-初始化,[2]-打开,[3]-关闭
+    'Exam_collection_state'   => '是否开启考试',//:[0]-初始化,[2]-打开,[3]-关闭
     'Exam_collection_name'    => '考试名称',
     'Task_id'                 => '任务ID',
     'Limit_duration'          => '考试时长',

application/admin/model/teacher/Collection.php

@@ -66,7 +66,7 @@ class Collection extends Model
 
     public function getYikaoCountAttr($value, $data)
     {
-        return Exams::where(['exam_collection_id'=>$data['exam_collection_id'],'exam_collection_type'=>3,'endtime'=>['>',0]])->count();
+        return Exams::where(['exam_collection_id'=>$data['exam_collection_id'],'exam_collection_type'=>3,'starttime'=>['>',0]])->count();
     }
 
 

application/admin/view/department/admin/index.html

@@ -106,7 +106,7 @@
                     <div class="tab-pane fade active in" id="one">
                         <div class="widget-body no-padding">
                             <div id="toolbar" class="toolbar">
-                                {:build_toolbar('refresh,add,delete')}
+                                {:build_toolbar('refresh,add,edit,delete')}
                                 <div class="dropdown btn-group {:$auth->check('department/admin/multi')?'':'hide'}">
                                     <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                                     <ul class="dropdown-menu text-left" role="menu">

application/admin/view/index/login.html

@@ -6,7 +6,7 @@
         body{
             background-image: url(/assets/img/login-background.jpg);
             /*background-size: 100%;*/
-            background-position-y:90%
+            background-position-y:55%
         }
         .container {
             background-color: #ffffff;

application/admin/view/student/collection/examing.html

@@ -111,16 +111,16 @@
                     </div>
                     <div class="box-body box-profile">
                         <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
-                        <div class="col-xs-12 col-sm-12">
+                        <div class="col-xs-12 col-sm-12" style="text-align: center">
                             <div class="form-group">
-                                <label  style=" width: 10%;" class="control-label col-xs-3 col-sm-3">{:__('更换件列表')}:</label>
+                                <label  style=" width: 10%;" class="control-label col-xs-3 col-sm-3">{:__('申请更换件')}:</label>
                                 <div class="col-xs-9 col-sm-9">
                                     <dl class="fieldlist" data-name="row[other_replace]" data-template="other_suppliertpl">
                                         <dd>
                                             <ins style="width: 550px;">更换件类型</ins>
                                             <ins style="width: 430px;">状态</ins>
                                         </dd>
-                                        <dd>
+                                        <dd style="margin-right: 87%">
                                             <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>
                                         </dd>
                                         <textarea name="row[other_replace]" class="form-control hide other_replace" cols="30" rows="5">{$row.other_replace}</textarea>
@@ -130,15 +130,11 @@
                                         <dd class="form-inline">
                                             <select class="form-control" name="unwin[<%=index%>][fault_id]" style="width: 550px;">
                                                 {foreach name="departmentdata" item="vo"}
+                                                <option value="" >请选择</option>
                                                 <option value="{$vo.fault_id}" <%if(row.fault_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.replace_name}</option>
                                                 {/foreach}
                                             </select>
-                                            <select class="form-control" name="unwin[<%=index%>][request_status]" style="width: 430px;">
-                                                <option value="0" <%if(row["request_status"]==0){%> selected <%}%>>未申请</option>
-                                                <option value="1" <%if(row["request_status"]==1){%> selected <%}%>>已申请</option>
-                                                <option value="2" <%if(row["request_status"]==2){%> selected <%}%>>已处理</option>
-                                                <option value="3" <%if(row["request_status"]==3){%> selected <%}%>>已驳回</option>
-                                            </select>
+                                            <input type="text" class="form-control" readonly name="unwin[<%=index%>][request_status]" value="<%if(row["request_status"]==1){%>已申请<%}else if(row["request_status"]==2){ %>已送达<%}else if(row["request_status"]==3){%>驳回<%}else{%>未申请<%}%>" style="width: 430px;">
                                             <span class="btn btn-sm btn-danger btn-remove" title="移除"><i class="fa fa-times"></i></span>
                                             <span class="btn btn-sm btn-success btn-replace" title="保存"><i class="fa fa-check"></i></span>
                                         </dd>
@@ -146,18 +142,18 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-sm-12">
+                        <div class="col-xs-12 col-sm-12" style="text-align: center">
                             <div class="form-group">
                                 <label  style=" width: 10%;" class="control-label col-xs-3 col-sm-3">{:__('维修报告列表')}:</label>
                                 <div class="col-xs-9 col-sm-9">
                                     <dl class="fieldlist" data-name="row[other_report]" data-template="other_suppliertpl1">
-                                        <dd>
+                                        <dd >
                                             <ins style="width: 250px;">故障现象</ins>
                                             <ins style="width: 250px;">可能原因</ins>
                                             <ins style="width: 250px;">故障部位</ins>
                                             <ins style="width: 250px;">排除方法</ins>
                                         </dd>
-                                        <dd>
+                                        <dd style="margin-right: 87%">
                                             <a href="javascript:;" class="btn btn-sm btn-info btn-append"><i class="fa fa-plus"></i> 追加</a>
                                         </dd>
                                         <textarea name="row[other_report]" class="form-control hide" cols="30" rows="5">{$row.other_report}</textarea>
@@ -167,21 +163,25 @@
                                         <dd class="form-inline">
 
                                             <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 250px;">
+                                                <option value="" >请选择</option>
                                                 {foreach name="xianxiang" item="vo"}
                                                 <option value="{$vo.fault_id}" <%if(row.xx_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
                                                 {/foreach}
                                             </select>
                                             <select class="form-control" name="unwin[<%=index%>][yy_id]" style="width: 250px;">
+                                                <option value="" >请选择</option>
                                                 {foreach name="yuanyin" item="vo"}
                                                 <option value="{$vo.fault_id}" <%if(row.yy_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
                                                 {/foreach}
                                             </select>
                                             <select class="form-control" name="unwin[<%=index%>][bw_id]" style="width: 250px;">
+                                                <option value="" >请选择</option>
                                                 {foreach name="buwei" item="vo"}
                                                 <option value="{$vo.fault_id}" <%if(row.bw_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
                                                 {/foreach}
                                             </select>
                                             <select class="form-control" name="unwin[<%=index%>][pc_id]" style="width: 250px;">
+                                                <option value="" >请选择</option>
                                                 {foreach name="paichu" item="vo"}
                                                 <option value="{$vo.fault_id}" <%if(row.pc_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
                                                 {/foreach}

application/admin/view/student/exam/view.html

@@ -41,7 +41,7 @@
                 <td style="width:15%">姓名</td>
                 <td style="width:15%">{$row.user_nickname|htmlentities}</td>
                 <td style="width:15%">区队</td>
-                <td style="width:15%">{$row.user_depart_id|htmlentities}</td>
+                <td style="width:15%">{$row.user_depart_name|htmlentities}</td>
             </tr>
             <tr>
                 <td>考试开始时间</td>

application/admin/view/teacher/collection/add.html

@@ -63,14 +63,15 @@
             <div class="btn btn-info btn-task" style="display: none">自选任务编辑</div>
         </div>
 
-        <div class="form-group col-sm-6 tasks" style="display:none;">
-            <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('任务名称')}:</label>
+        <div class="form-group col-sm-6 tasks" style="display:none;left: 48%">
+            <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('故障题目')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-task_name" readonly class="form-control" name="row[task_name]" type="text">
+                <input id="c-task_name" readonly class="form-control" name="row[task_name]" type="hidden">
+                <input id="c-fault_name" readonly class="form-control" name="row[fault_name]" type="text">
             </div>
         </div>
 
-        <div class="form-group col-sm-6 questions" style="display:none;">
+        <div class="form-group col-sm-6 questions" style="display:none;left: 48%">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('故障名称')}:</label>
             <div class="col-xs-12 col-sm-7">
                 <input id="c-question_name" readonly  class="form-control" name="row[question_name]" type="text">
@@ -108,7 +109,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
         </div>
     </div>
 </form>

application/admin/view/teacher/collection/edit.html

@@ -57,17 +57,18 @@
             <div class="btn btn-info btn-task" {if $row.question_setting_method neq 3}style="display: none"{/if} >自选任务编辑</div>
         </div>
 
-        <div class="form-group col-sm-6 questions" {if $row.question_setting_method neq 2}style="display: none"{/if}>
+        <div class="form-group col-sm-6 questions" {if $row.question_setting_method neq 2}style="display: none" {else} style="left: 48%" {/if}>
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('故障名称')}:</label>
             <div class="col-xs-12 col-sm-7">
                 <input id="c-question_name" readonly  class="form-control" name="row[question_name]" type="text" value="{$row.question_name|htmlentities}">
             </div>
         </div>
 
-        <div class="form-group col-sm-6 tasks" {if $row.question_setting_method neq 3}style="display:none;" {/if}>
-            <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('任务名称')}:</label>
+        <div class="form-group col-sm-6 tasks" {if $row.question_setting_method neq 3}style="display:none;" {else} style="left: 48%"  {/if}>
+            <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('故障题目')}:</label>
             <div class="col-xs-12 col-sm-7">
-                <input id="c-task_name" readonly class="form-control" name="row[task_name]" type="text"  value="{$row.task_name|htmlentities}">
+                <input id="c-task_name" readonly class="form-control" name="row[task_name]" type="hidden"  value="{$row.task_name|htmlentities}">
+                <input id="c-fault_name" readonly class="form-control" name="row[fault_name]" type="text"  value="{$row.question_name|htmlentities}">
             </div>
         </div>
 
@@ -104,7 +105,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
         </div>
     </div>
 </form>

application/admin/view/teacher/exams/edit.html

@@ -61,49 +61,66 @@
                 <table class="new_table">
                     <thead>
                     <tr style="height: 3.5rem">
-                        <td >评分标准</td>
-                        <td >扣分</td>
+                        <td>评分标准</td>
+                        <td>扣分</td>
+                        <td>题目</td>
                     </tr>
                     </thead>
                     <tbody class="task_list">
                     <tr>
-                        <td colspan="2">一.排除故障(75分)</td>
+                        <td colspan="3">一.排除故障(75分)</td>
                     </tr>
                     <tr>
-                        <td>故障一未排除扣25分</td><td><input type="text" name="row[fault_one_score]" value="{$row.fault_one_score|htmlentities}"></td>
+                        <td>故障一未排除扣25分</td>
+                        <td><input type="text" name="row[fault_one_score]" value="{$row.fault_one_score|htmlentities}"></td>
+                        <td>{$row.fault_name_one|htmlentities}</td>
                     </tr>
                     <tr>
-                        <td>故障二未排除扣25分</td><td><input type="text" name="row[fault_two_score]" value="{$row.fault_two_score|htmlentities}"></td>
+                        <td>故障二未排除扣25分</td>
+                        <td><input type="text" name="row[fault_two_score]" value="{$row.fault_two_score|htmlentities}"></td>
+                        <td>{$row.fault_name_two|htmlentities}</td>
                     </tr>
                     <tr>
-                        <td>故障三未排除扣25分</td><td><input type="text" name="row[fault_three_score]" value="{$row.fault_three_score|htmlentities}"></td>
+                        <td>故障三未排除扣25分</td>
+                        <td><input type="text" name="row[fault_three_score]" value="{$row.fault_three_score|htmlentities}"></td>
+                        <td>{$row.fault_name_three|htmlentities}</td>
                     </tr>
                     <tr>
-                        <td colspan="2">二.维修报告表(15分)</td>
+                        <td colspan="3">二.维修报告表(15分)</td>
                     </tr>
                     <tr>
-                        <td>故障现象少写或错写1条扣1分</td><td><input type="text" name="row[xianxian_score]" value="{$row.xianxian_score|htmlentities}"></td>
+                        <td>故障现象少写或错写1条扣1分</td>
+                        <td><input type="text" name="row[xianxian_score]" value="{$row.xianxian_score|htmlentities}"></td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>可能原因少写或错写1条扣1分</td><td><input type="text" name="row[yuanyin_score]" value="{$row.yuanyin_score|htmlentities}"></td>
+                        <td>可能原因少写或错写1条扣1分</td>
+                        <td><input type="text" name="row[yuanyin_score]" value="{$row.yuanyin_score|htmlentities}"></td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>故障部位少写或错写1条扣1分</td><td><input type="text" name="row[buwei_score]" value="{$row.buwei_score|htmlentities}"></td>
+                        <td>故障部位少写或错写1条扣1分</td>
+                        <td><input type="text" name="row[buwei_score]" value="{$row.buwei_score|htmlentities}"></td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>排除方法少写或错写1条扣1分</td><td><input type="text" name="row[fangfa_score]" value="{$row.fangfa_score|htmlentities}"></td>
+                        <td>排除方法少写或错写1条扣1分</td>
+                        <td><input type="text" name="row[fangfa_score]" value="{$row.fangfa_score|htmlentities}"></td>
+                        <td></td>
                     </tr>
 <!--                    <tr>-->
 <!--                        <td>修复结论错扣2分</td><td><input type="text" name="row[jielun_score]" value="{$row.jielun_score|htmlentities}"></td>-->
 <!--                    </tr>-->
                     <tr>
-                        <td colspan="2">三.维修时间(10分)</td>
+                        <td colspan="3">三.维修时间(10分)</td>
                     </tr>
                     <tr>
-                        <td>按每超过1分钟扣1分的比例扣分</td><td><input type="text" name="row[overtime_score]" value="{$row.overtime_score|htmlentities}"></td>
+                        <td>按每超过1分钟扣1分的比例扣分</td>
+                        <td colspan="2"><input type="text" name="row[overtime_score]" value="{$row.overtime_score|htmlentities}"></td>
+
                     </tr>
                     <tr>
-                        <td colspan="2" style="height: 3.5rem">总得分:{$row.total|htmlentities}</td>
+                        <td colspan="3" style="height: 3.5rem">总得分:{$row.total|htmlentities}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -116,7 +133,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
         </div>
     </div>
     {/if}

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

@@ -28,13 +28,13 @@
         <div class="tableTitle success" style="font-size: 16px;margin: 10px 0">成绩分析</div>
         <table style="width: 100%" class="table table-striped table-bordered table-hover table-nowrap panel-success">
             <tbody>
-            <tr class="success">
-                <td>平均成绩</td>
-                <td>111</td>
-                <td>最高成绩</td>
-                <td>222</td>
-                <td>最低成绩</td>
-                <td>3333</td>
+            <tr class="">
+                <td style="width: 10%">平均成绩</td>
+                <td class="pingfen_total"></td>
+                <td style="width: 10%">最高成绩</td>
+                <td class="max_total"></td>
+                <td style="width: 10%">最低成绩</td>
+                <td class="min_total"></td>
             </tr>
             </tbody>
         </table>
@@ -42,12 +42,12 @@
         <div class="tableTitle success" style="font-size: 16px;margin: 10px 0">错误率统计</div>
         <table style="width: 100%" class="table table-striped table-bordered table-hover table-nowrap panel-success">
             <tbody>
-            <tr class="success" style="text-align: center">
+            <tr style="text-align: center">
                 <td colspan="2">模拟器A</td>
                 <td colspan="2">模拟器B</td>
                 <td colspan="2">模拟器C</td>
             </tr>
-            <tr class="success">
+            <tr style="text-align: center">
                 <td>故障名称</td>
                 <td>错误率</td>
                 <td>故障名称</td>
@@ -55,7 +55,7 @@
                 <td>故障名称</td>
                 <td>错误率</td>
             </tr>
-            <tr class="success">
+            <tr style="text-align: center">
                 <td>111</td>
                 <td>111</td>
                 <td>222</td>
@@ -63,7 +63,7 @@
                 <td>333</td>
                 <td>333</td>
             </tr>
-            <tr class="success">
+            <tr style="text-align: center">
                 <td>111</td>
                 <td>111</td>
                 <td>222</td>

application/admin/view/teacher/exams/view.html

@@ -41,7 +41,7 @@
                 <td style="width:15%">姓名</td>
                 <td style="width:15%">{$row.user_nickname|htmlentities}</td>
                 <td style="width:15%">区队</td>
-                <td style="width:15%">{$row.user_depart_id|htmlentities}</td>
+                <td style="width:15%">{$row.user_depart_name|htmlentities}</td>
             </tr>
             <tr>
                 <td>考试开始时间</td>

application/admin/view/teacher/info/add.html

@@ -33,7 +33,7 @@
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>

application/admin/view/teacher/info/edit.html

@@ -40,7 +40,7 @@
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>

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

@@ -12,7 +12,7 @@
 <!--                        <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-warning btn-start btn-disabled disabled {:$auth->check('teacher/practice/start')?'':'hide'}" title="{:__('开始练习')}" ><i class="fa fa-play-circle"></i> {:__('开始练习')}</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>-->
 
 
 

application/admin/view/teacher/task/add.html

@@ -56,7 +56,7 @@
             <div class="col-xs-12 col-sm-8">
                 <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="" style="width: 80%">
             </div>
-            <button type="submit" class="btn btn-primary">{:__('提交')}</button>
+            <button type="submit" class="btn btn-success">{:__('提交')}</button>
         </div>
 
 

application/admin/view/teacher/task/edit.html

@@ -54,7 +54,7 @@
                 <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}" style="width: 80%">
             </div>
 
-            <button type="submit" class="btn btn-primary">{:__('提交')}</button>
+            <button type="submit" class="btn btn-success">{:__('提交')}</button>
         </div>
     </div>
     <input class="form-control fault_ids" name="row[fault_id]" type="hidden" value="{$row.fault_id|htmlentities}" data-rule="required">

public/assets/css/backend.css

@@ -1228,7 +1228,8 @@ table.table-nowrap thead > tr > th {
   background-color: #ecf0f1;
   height: auto;
   min-height: 53px;
-  text-align: inherit !important;
+  /*text-align: inherit !important;*/
+  text-align: center !important;
 }
 .layui-layer-fast .layui-layer-confirm {
   position: absolute;

public/assets/js/addons.js

@@ -1,28 +1,28 @@
 define([], function () {
     require.config({
-        paths: {
-            'editable': '../libs/bootstrap-table/dist/extensions/editable/bootstrap-table-editable.min',
-            'x-editable': '../addons/editable/js/bootstrap-editable.min',
+    paths: {
+        'editable': '../libs/bootstrap-table/dist/extensions/editable/bootstrap-table-editable.min',
+        'x-editable': '../addons/editable/js/bootstrap-editable.min',
+    },
+    shim: {
+        'editable': {
+            deps: ['x-editable', 'bootstrap-table']
         },
-        shim: {
-            'editable': {
-                deps: ['x-editable', 'bootstrap-table']
-            },
-            // "x-editable": {
-            //     deps: ["css!../addons/editable/css/bootstrap-editable.css"],
-            // }
+        "x-editable": {
+            deps: ["css!../addons/editable/css/bootstrap-editable.css"],
         }
-    });
-    if ($("table.table").size() > 0) {
-        require(['editable', 'table'], function (Editable, Table) {
-            $.fn.bootstrapTable.defaults.onEditableSave = function (field, row, oldValue, $el) {
-                var data = {};
-                data["row[" + field + "]"] = row[field];
-                Fast.api.ajax({
-                    url: this.extend.edit_url + "/ids/" + row[this.pk],
-                    data: data
-                });
-            };
-        });
     }
+});
+if ($("table.table").size() > 0) {
+    require(['editable', 'table'], function (Editable, Table) {
+        $.fn.bootstrapTable.defaults.onEditableSave = function (field, row, oldValue, $el) {
+            var data = {};
+            data["row[" + field + "]"] = row[field];
+            Fast.api.ajax({
+                url: this.extend.edit_url + "/ids/" + row[this.pk],
+                data: data
+            });
+        };
+    });
+}
 });

public/assets/js/backend/department/admin.js

@@ -122,20 +122,46 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // }
             columnss.push(
                 {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
-                    // buttons: [
-                    //     {
-                    //         name: 'principal',
-                    //         text: __('Principal'),
-                    //         title: __('Principal set'),
-                    //         icon: 'fa fa-street-view',
-                    //         classname: 'btn btn-xs btn-danger btn-dialog',
-                    //         url: 'department/admin/principal',
-                    //     },
-                    // ],
-                    formatter: function (value, row, index) {
-                        return Table.api.formatter.operate.call(this, value, row, index);
-                    }});
+                {field: 'operate', title: __('Operate'), table: table,
+                    // events: Table.api.events.operate,
+                    formatter: Table.api.formatter.buttons,
+                    buttons: [
+                        // {
+                        //     name: 'principal',
+                        //     text: __('Principal'),
+                        //     title: __('Principal set'),
+                        //     icon: 'fa fa-street-view',
+                        //     classname: 'btn btn-xs btn-danger btn-dialog',
+                        //     url: 'department/admin/principal',
+                        // },
+                        {
+                            name: 'dispatch',
+                            text: '编辑',
+                            icon: 'fa fa-pencil',
+                            title: '编辑',
+                            classname: 'btn btn-success btn-xs btn-magic btn-dialog',
+                            url: 'department/admin/edit',
+                        },{
+                            name: 'dispatch',
+                            text: '删除',
+                            icon: 'fa fa-trash',
+                            title: '删除',
+                            classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
+                            url: 'department/admin/del',
+                            confirm: '确定要删除吗？',
+                            success: function (data, ret) {
+                                $(".btn-refresh").trigger("click");
+                            },
+                            error: function (data, ret) {
+                                Layer.alert(ret.msg);
+                                return false;
+                            }
+                        }
+                    ],
+                    // formatter: function (value, row, index) {
+                    //     return Table.api.formatter.operate.call(this, value, row, index);
+                    // }
+                });
 
             // 初始化表格
             table.bootstrapTable({
@@ -145,6 +171,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 //固定右侧列数
                 fixedRightNumber: 1,
+                singleSelect : true, //
             });
 
             // 为表格绑定事件

public/assets/js/backend/department/index.js

@@ -85,7 +85,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             table: table,
                             width: 160,
                             events: Table.api.events.operate,
-                            formatter: Table.api.formatter.operate,
+                            formatter: Table.api.formatter.buttons,
                             buttons: [
                                 {
                                     name: 'add',
@@ -94,6 +94,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     icon: 'fa fa-plus',
                                     url: 'department/index/add/parent_id/{ids}'
                                 },
+                                {
+                                    name: 'dispatch',
+                                    text: '编辑',
+                                    icon: 'fa fa-pencil',
+                                    title: '编辑',
+                                    classname: 'btn btn-success btn-xs btn-magic btn-dialog',
+                                    url: 'department/index/edit',
+                                },{
+                                    name: 'dispatch',
+                                    text: '删除',
+                                    icon: 'fa fa-trash',
+                                    title: '删除',
+                                    classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
+                                    url: 'department/index/del',
+                                    confirm: '确定要删除吗？',
+                                    success: function (data, ret) {
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    }
+                                }
                                 // {
                                 //     name: 'index',
                                 //     text: __('Employee'),

public/assets/js/backend/student/exam.js

@@ -57,7 +57,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'user_id', title: __('User_id')},
                         // {field: 'seat_id', title: __('Seat_id')},
                         // {field: 'sim_id', title: __('Sim_id')},
-                        {field: 'exam_status', title: __('Exam_status'),searchList: {"0":"未登录","1":"已登录","2":"模拟器检查并下发故障中","3":"模拟器正常","4":"答题中","5":"已交卷","6":"计算成绩中","7":"获取到成绩报告","80":"教师标记缺考","81":"登录未开始答题","90":"模拟器异常结束"},formatter: Table.api.formatter.simexamstatus},
+                        // {field: 'exam_status', title: __('Exam_status'),searchList: {"0":"未登录","1":"已登录","2":"模拟器检查并下发故障中","3":"模拟器正常","4":"答题中","5":"已交卷","6":"计算成绩中","7":"获取到成绩报告","80":"教师标记缺考","81":"登录未开始答题","90":"模拟器异常结束"},formatter: Table.api.formatter.simexamstatus},
                         {field: 'total_score', title: __('Total_score')},
                         // {field: 'deduction_total_score', title: __('Deduction_total_score')},
                         {field: 'starttime', title: __('Start_time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},

public/assets/js/backend/teacher/collection.js

@@ -51,7 +51,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'qudui_count', title: __('区队数量'), operate: false},
                         {field: 'xueyuan_count', title: __('应考人数'), operate: false},
                         {field: 'yikao_count', title: __('已考人数'), operate: false},
-                        // {field: 'createtime', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false,formatter: Table.api.formatter.datetime},
+                        {field: 'createtime', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false,formatter: Table.api.formatter.datetime},
                         // {field: 'update_by', title: __('Update_by'), operate: 'LIKE'},
                         // {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         // {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
@@ -61,7 +61,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             buttons: [
                                 {
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '编辑',
                                     icon: 'fa fa-pencil',
                                     title: '编辑',
                                     classname: 'btn btn-success btn-xs btn-magic btn-dialog',
@@ -70,7 +70,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 },
                                 {
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '进入考试',
                                     icon: 'fa fa-hand-pointer-o',
                                     title: '进入考试',
                                     visible: function (rr) {
@@ -82,22 +82,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     classname: 'btn btn-info btn-xs btn-magic btn-addtabs',
                                     url: 'teacher/exams/persent',
                                 },
-                                // {
-                                //     name: 'dispatch',
-                                //     text: '',
-                                //     icon: 'fa fa-trash',
-                                //     title: '删除',
-                                //     classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
-                                //     url: 'teacher/collection/del',
-                                //     confirm: '确定要删除吗？',
-                                //     success: function (data, ret) {
-                                //         $(".btn-refresh").trigger("click");
-                                //     },
-                                //     error: function (data, ret) {
-                                //         Layer.alert(ret.msg);
-                                //         return false;
-                                //     }
-                                // }
+                                {
+                                    name: 'dispatch',
+                                    text: '删除',
+                                    icon: 'fa fa-trash',
+                                    title: '删除',
+                                    classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
+                                    url: 'teacher/collection/del',
+                                    confirm: '确定要删除吗？',
+                                    success: function (data, ret) {
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    }
+                                }
                             ],
                         }
                     ]
@@ -150,7 +150,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {
                             field: 'operate', title: __('Operate'), width: 85, events: {
                                 'click .btn-chooseone': function (e, value, row, index) {
-                                    Fast.api.close({url: row.url, multiple: multiple,task_id:row.task_id,task_name:row.name});
+                                    Fast.api.close({url: row.url, multiple: multiple,task_id:row.task_id,task_name:row.name,fault_name:row.fault_name});
                                 },
                             }, formatter: function () {
                                 return '<a href="javascript:;" class="btn btn-danger btn-chooseone btn-xs"><i class="fa fa-check"></i> ' + __('Choose') + '</a>';
@@ -327,6 +327,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     $(".question_ids").val(0);
                     $(".task_id").val(0);
                     $("#c-task_name").val('');
+                    $("#c-fault_name").val('');
                     $("#c-question_name").val('');
                     $(".tasks,.questions").css('display','none')
                 });
@@ -351,6 +352,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 $(".tasks").css('display','none')
                                 $(".task_id").val(0);
                                 $("#c-task_name").val('');
+                                $("#c-fault_name").val('');
                             }
                         }
                     });
@@ -369,10 +371,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         moveOut: false,
                         offset: ['40px'],
                         callback: function(value) {
+                            console.log(value);
                             if (value.task_id) {
                                 $(".tasks").css('display','block')
                                 $(".task_id").val(value.task_id);
                                 $("#c-task_name").val(value.task_name);
+                                $("#c-fault_name").val(value.fault_name);
                                 $(".questions").css('display','none')
                                 $(".question_ids").val(0);
                                 $("#c-question_name").val('');

public/assets/js/backend/teacher/exams.js

@@ -18,6 +18,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
 
             var table = $("#table");
 
+            table.on('load-success.bs.table', function (e, data) {
+                //这里可以获取从服务端获取的JSON数据
+                //这里我们手动设置顶部的企业总数
+                $(".pingfen_total").text(data.defen.pingfen);
+                $(".max_total").text(data.defen.max);
+                $(".min_total").text(data.defen.min);
+            });
+
+
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -62,7 +71,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                             buttons: [
                                 {
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '编辑',
                                     icon: 'fa fa-pencil',
                                     title: '编辑',
                                     classname: 'btn btn-success btn-xs btn-magic btn-dialog',

public/assets/js/backend/teacher/info.js

@@ -39,12 +39,43 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'mobile', title: __('Mobile')},
                         {field: 'status', title: __("Status"), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
-                                if(row.id == Config.admin.id){
-                                    return '';
+                        {
+                            field: 'operate', title: __('Operate'), table: table,
+                            formatter: Table.api.formatter.buttons,
+                            buttons: [
+                                {
+                                    name: 'dispatch',
+                                    text: '编辑',
+                                    icon: 'fa fa-pencil',
+                                    title: '编辑',
+                                    classname: 'btn btn-success btn-xs btn-magic btn-dialog',
+                                    url: 'teacher/info/edit',
+                                }, {
+                                    name: 'dispatch',
+                                    text: '删除',
+                                    icon: 'fa fa-trash',
+                                    title: '删除',
+                                    classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
+                                    url: 'teacher/info/del',
+                                    confirm: '确定要删除吗？',
+                                    success: function (data, ret) {
+                                        $(".btn-refresh").trigger("click");
+                                    },
+                                    error: function (data, ret) {
+                                        Layer.alert(ret.msg);
+                                        return false;
+                                    }
                                 }
-                                return Table.api.formatter.operate.call(this, value, row, index);
-                            }}
+                            ],
+
+                            // events: Table.api.events.operate,
+                            // formatter: function (value, row, index) {
+                            //     if(row.id == Config.admin.id){
+                            //         return '';
+                            //     }
+                            //     return Table.api.formatter.operate.call(this, value, row, index);
+                            // }}
+                        }
                     ]
                 ]
             });

public/assets/js/backend/teacher/task.js

@@ -52,7 +52,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             buttons: [
                                 {
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '编辑',
                                     icon: 'fa fa-pencil',
                                     title: '编辑',
                                     classname: 'btn btn-success btn-xs btn-magic btn-dialog',
@@ -60,7 +60,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'teacher/task/edit',
                                 },{
                                     name: 'dispatch',
-                                    text: '',
+                                    text: '删除',
                                     icon: 'fa fa-trash',
                                     title: '删除',
                                     classname: 'btn btn-danger btn-xs btn-magic btn-ajax',

public/assets/js/require-table.js

@@ -131,7 +131,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                         return __('Common search');
                     },
                     formatCommonSubmitButton: function () {
-                        return __('Submit');
+                        return __('搜索');
                     },
                     formatCommonResetButton: function () {
                         return __('Reset');
@@ -818,7 +818,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                     function randomGradient() {
                         var color1 = `#${Math.floor(Math.random() * 16777215).toString(16).padStart(6, '0')}`;
                         var color2 = `#${Math.floor(Math.random() * 16777215).toString(16).padStart(6, '0')}`;
-                        return `linear-gradient(45deg, ${color1}, ${color2})`;
+                        return '#444c69';//`linear-gradient(45deg, ${color1}, ${color2})`;
                     }
 
                     // 将逗号分隔的内容转换为带渐变背景的按钮
@@ -830,7 +830,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                                 background: ${gradient};
                                 color: white;
                                 border: none;
-                                padding: 5px 10px;
+                                /*padding: 5px 10px;*/
                                 border-radius: 4px;
                                 white-space: nowrap;
                                 font-size: 12px;