20250102 调整

application/admin/controller/Fault.php

@@ -49,7 +49,7 @@ class Fault extends Backend
         ];
         $selectData = $this->model->where($where)->select();
         foreach ($selectData as $key => $value){
-            $children = $this->model->where(['parent_fault_id'=>$value['fault_id'],'fault_state'=>0])->select();
+            $children = $this->model->where(['parent_fault_id'=>$value['fault_id'],'fault_type' => 3,'fault_state'=>0])->select();
             $selectData[$key]['children'] = $children;
         }
         unset($value);

application/admin/controller/student/Collection.php

@@ -180,6 +180,7 @@ class Collection extends Backend
                 $row->end_time = date('Y-m-d H:i:s');
                 $row->endtime = time();
                 $row->exam_status = 5;
+                $row->other_report = $params['other_report'];
                 $result = $row->save();
 
                 $info = $this->exam_model->where(['exam_id'=>$ids])->find();
@@ -218,9 +219,9 @@ class Collection extends Backend
                 }
                 //是否超时
                 $overtime_fen = intval((time()-$info['endtime']) / 60);
-                if($overtime_fen>=5){
-                    $overtime_score = 5;
-                }else if($overtime_fen>0 && $overtime_fen<5){
+                if($overtime_fen>=10){
+                    $overtime_score = 10;
+                }else if($overtime_fen>0 && $overtime_fen<10){
                     $overtime_score = $overtime_fen ;
                 }else{
                     $overtime_score =0;
@@ -263,17 +264,14 @@ class Collection extends Backend
             $fen =  $row->limit_duration - intval((time()-$row->starttime) / 60);
             $timer = 60*$fen;
         }
-        $row->other_replace_arr = json_decode($row->other_replace,true)??[];
 
-        $this->assignConfig('other_replace_arr', $row->other_replace_arr);
-//        halt($row->other_replace_arr);
         $row->replace_list =Db::name('real_exam_comp_request')->where(['exam_id'=>$ids])->select();
         $this->assignConfig('ids',$ids);
         $this->assignConfig('timer',$timer);
         $this->view->assign('row', $row);
 
         $departmentdata = [];
-        $departmentdata = Fault::where(['replace_part'=>1])->select();
+        $departmentdata = Fault::where(['replace_part'=>1,'sim_type'=>$row->sim_type])->select();
 
         //更换件数据
         $this->view->assign('departmentdata', $departmentdata);
@@ -286,9 +284,10 @@ class Collection extends Backend
         $this->view->assign('yuanyin', $yuanyin);
         //故障部位
         $buwei = Fault::where(['fault_type'=>3,'sim_type'=>$row->sim_type])->select();
-        $this->view->assign('yuanyin', $yuanyin);
+        $this->view->assign('buwei', $buwei);
         //排除方法
         $paichu = Fault::where(['fault_type'=>4,'sim_type'=>$row->sim_type])->select();
+        $this->view->assign('paichu', $paichu);
 
         return $this->view->fetch();
     }
@@ -307,6 +306,7 @@ class Collection extends Backend
                             'exam_id'=>$ids,
                             'fault_id'=>$item['fault_id'],
                             'request_status'=>1,
+                            'fault_name'=>Db::name('fault')->where('fault_id',$item['fault_id'])->value('replace_name'),
                             'create_by_user_id'=>$this->auth->id,
                             'create_by'=>$this->auth->nickname,
                             'createtime'=>time(),
@@ -315,25 +315,18 @@ class Collection extends Backend
                             'update_time'=>date('Y-m-d H:i:s'),
                         ];
                         Db::name('real_exam_comp_request')->insert($add);
+                        $status = 1;
                     }else{
-                        $add = [
-                            'exam_id'=>$ids,
-                            'fault_id'=>$item['fault_id'],
-                            'fault_name'=>Db::name('fault')->where('fault_id',$item['fault_id'])->value('replace_name'),
-                            'request_status'=>$isreplace['request_status'],
-                            'create_by_user_id'=>$this->auth->id,
-                            'create_by'=>$this->auth->nickname,
-                            'createtime'=>time(),
-                            'updatetime'=>time(),
-                            'create_time'=>date('Y-m-d H:i:s'),
-                            'update_time'=>date('Y-m-d H:i:s'),
-                        ];
-                        Db::name('real_exam_comp_request')->where('rel_id',$isreplace['rel_id'])->update($add);
+                        $status = $isreplace['request_status'];
                     }
+                    $faultid_arr[] = [
+                        'fault_id'=>$item['fault_id'],
+                        'request_status'=>$status,
+                    ];
                 }
                 unset($item);
                 $row = $this->exam_model->get($ids);
-                $row-> other_replace = $params;
+                $row-> other_replace = json_encode($faultid_arr);
                 $result = $row->save();
             }
             $this->success('申请成功,待老师审批');

application/admin/controller/student/Exam.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\student;
 
 use app\common\controller\Backend;
 use app\common\model\Config as ConfigModel;
+use think\Db;
 
 /**
  * sim-考试表/成绩总分
@@ -30,6 +31,7 @@ class Exam extends Backend
             $this->whereExtend['user_id'] = $this->auth->id;
         }
         $this->assignconfig("groupIds", $groupIds[0]);
+        $this->whereExtend['exam_collection_type'] = 3;
     }
 
 
@@ -41,4 +43,21 @@ class Exam extends Backend
      */
 
 
+    public function view($ids = null)
+    {
+        $row = Db::name('real_exam_score')->where('exam_id', $ids)->find();
+        if (!$row) {
+            $this->error(__('未交卷'));
+        }
+        $rows = $this->model->get($ids);
+        $row['seat_id'] = $rows->seat_id;
+        $row['user_nickname'] = $rows->user_nickname;
+        $row['user_username'] = $rows->user_username;
+        $row['user_depart_id'] = $rows->user_depart_id;
+        $row['start_time'] = $rows->start_time;
+        $row['end_time'] = $rows->end_time;
+
+        $this->view->assign('row', $row);
+        return $this->view->fetch();
+    }
 }

application/admin/controller/teacher/Collection.php

@@ -8,6 +8,8 @@ use think\Db;
 use think\exception\PDOException;
 use think\exception\ValidateException;
 use app\admin\model\department\Department as DepartmentModel;
+use app\admin\model\teacher\Task;
+use app\admin\model\Fault;
 
 /**
  * sim-考试集合管理
@@ -55,6 +57,15 @@ class Collection extends Backend
         if(empty($params['depart_ids'])){
             $this->error('请选择区队名称');
         }
+        if(!empty($params['question_setting_method'])){
+            if($params['question_setting_method']==2 && empty($params['question_ids'])){
+                $this->error('出题方式为考题自选，请选择考题');
+            }
+            if($params['question_setting_method']==3 && empty($params['question_ids'])){
+                $this->error('出题方式为任务自选，请选择任务');
+            }
+        }
+
         $params = $this->preExcludeFields($params);
 
         if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
@@ -107,6 +118,14 @@ class Collection extends Backend
         if (empty($params)) {
             $this->error(__('Parameter %s can not be empty', ''));
         }
+        if(!empty($params['question_setting_method'])){
+            if($params['question_setting_method']==2 && empty($params['question_ids'])){
+                $this->error('出题方式为考题自选，请选择考题');
+            }
+            if($params['question_setting_method']==3 && empty($params['question_ids'])){
+                $this->error('出题方式为任务自选，请选择任务');
+            }
+        }
         $params = $this->preExcludeFields($params);
         $result = false;
         Db::startTrans();
@@ -178,4 +197,62 @@ class Collection extends Backend
         }
         $this->error(__('No rows were updated'));
     }
+
+    //选择考题
+    public function faults($type = null)
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            $this->assignConfig('sim_type', $type);
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $where_fault = [
+            'sim_type' => $type,
+            'fault_type' => 3,
+            'fault_state'=>0
+        ];
+        $list = Fault::where($where)->where($where_fault)
+            ->order($sort, $order)
+            ->paginate($limit);
+        foreach ($list as $k => $v){
+            $exam =  Fault::where(['fault_id'=>$v['parent_fault_id'],'fault_type'=>1])->find();
+            if(isset($exam)){
+                $v->parent_name = $exam['name'];
+            }else{
+                $v->parent_name = '';
+            }
+        }
+        unset($v);
+        unset($v);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+    //选择任务
+    public function task($type= null)
+    {
+
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            $this->assignConfig('sim_type', $type);
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = Task::where($where)->where('sim_type',$type)
+            ->order($sort, $order)
+            ->paginate($limit);
+        unset($v);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
 }

application/admin/controller/teacher/Exams.php

@@ -6,7 +6,7 @@ use app\common\controller\Backend;
 use think\Db;
 use think\exception\PDOException;
 use think\exception\ValidateException;
-
+use app\admin\model\teacher\ExamsScore;
 /**
  * sim-考试表/成绩总分
  *
@@ -25,6 +25,7 @@ class Exams extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\teacher\Exams;
+        $this->whereExtend['exam_collection_type'] = 3;
     }
 
 
@@ -59,7 +60,7 @@ class Exams extends Backend
         Db::startTrans();
         try {
             //是否采用模型验证
-            $params['total'] = 100-$params['fault_one_score']-$params['fault_two_score']-$params['fault_three_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']-$params['jielun_score'];
             $result = Db::name('real_exam_score')->where('id', $row['id'])->update($params);
 
             $rows->total_score = $params['total'];
@@ -78,10 +79,18 @@ class Exams extends Backend
 
     public function view($ids = null)
     {
-        $row = $this->model->get($ids);
-        if(!$row){
-            $this->error('未找到记录');
+        $row = Db::name('real_exam_score')->where('exam_id', $ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
         }
+        $rows = $this->model->get($ids);
+        $row['seat_id'] = $rows->seat_id;
+        $row['user_nickname'] = $rows->user_nickname;
+        $row['user_username'] = $rows->user_username;
+        $row['user_depart_id'] = $rows->user_depart_id;
+        $row['start_time'] = $rows->start_time;
+        $row['end_time'] = $rows->end_time;
+
         $this->view->assign('row', $row);
         return $this->view->fetch();
     }
@@ -106,7 +115,7 @@ class Exams extends Backend
         }
         [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         $list = Db::name('real_exam_comp_request')
-            ->where($where)->where($this->whereExtend)
+            ->where($where)
             ->order($sort, $order)
             ->paginate($limit);
         unset($v);
@@ -134,6 +143,36 @@ class Exams extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+
+    public function score()
+    {
+        //设置过滤方法
+        $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 = ExamsScore::where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+        foreach ($list as $k => $v){
+            $exam =  $this->model->where(['exam_id'=>$v['exam_id']])->find();
+            if($exam){
+                $v->seat_id = $exam['seat_id'];
+                $v->user_username = $exam['user_username'];
+                $v->user_nickname = $exam['user_nickname'];
+            }
+        }
+        unset($v);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+
+
     public function handle($type = null,$ids = null)
     {
         $row = Db::name('real_exam_comp_request')->where('rel_id',$ids)->find($ids);
@@ -148,7 +187,59 @@ class Exams extends Backend
             $request_status= 3;
         }
         Db::name('real_exam_comp_request')->where('rel_id',$ids)->update(['request_status'=>$request_status]);
+
+        //同步更新考试表json串
+        $exam_info  = $this->model->get($row['exam_id']);
+        if(!empty($exam_info)){
+            $other_replace = json_decode($exam_info['other_replace'],true)??[];
+            foreach ($other_replace as $k=>$v){
+                if($v['fault_id'] == $row['fault_id']){
+                    $other_replace[$k]['request_status'] = $request_status;
+                }
+            }
+            $exam_info->other_replace = json_encode($other_replace);
+            $exam_info->save();
+            unset($v);
+        }
         $this->success();
     }
 
+
+    //啦
+    public function editscore($ids = "")
+    {
+        $row = Db::name('real_exam_score')->where('exam_id', $ids)->find();
+        if (!$row) {
+            $this->error(__('No Results were found'));
+        }
+        $rows = $this->model->get($ids);
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            $result = Db::name('real_exam_score')->where('id', $row['id'])->update($params);
+
+            $info = Db::name('real_exam_score')->where('exam_id', $ids)->find();
+            $total =100-$info['fault_one_score']-$info['fault_two_score']-$info['fault_three_score']-$info['xianxian_score']-$info['yuanyin_socre']-$info['buwei_score']-$info['fangfa_score']-$info['overtime_score']-$info['jielun_score'];;
+
+
+            $rows->total_score = $total;
+            $rows->is_sure = 1;
+            $rows->save();
+            $result = Db::name('real_exam_score')->where('id', $row['id'])->update(['total'=>$total]);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
+    }
 }

application/admin/model/teacher/ExamsScore.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace app\admin\model\teacher;
+
+use think\Model;
+
+
+class ExamsScore extends Model
+{
+
+
+
+
+    // 表名
+    protected $name = 'real_exam_score';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = '';
+
+    // 追加属性
+    protected $append = [
+
+    ];
+
+
+    
+
+
+
+
+
+
+
+}

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

@@ -160,22 +160,32 @@
                                         <dd>
                                             <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" cols="30" rows="5" data-rule="required"></textarea>
+                                        <textarea name="row[other_report]" class="form-control" cols="30" rows="5" data-rule="required">{$row.other_report}</textarea>
                                     </dl>
                                     <!--定义模板，模板语法使用Art-Template模板语法-->
                                     <script type="text/html" id="other_suppliertpl1">
                                         <dd class="form-inline">
-                                            <input type="text" name="unwin[<%=index%>][xx_id]"
-                                                   class="form-control" value="<%=row['xx_id']%>" style="width: 250px;" >
-                                            <input type="text" name="unwin[<%=index%>][yy_id]"
-                                                   style="width: 250px;"
-                                                   class="form-control" value="<%=row['yy_id']%>" >
-                                            <input type="text" name="unwin[<%=index%>][bw_id]"
-                                                   style="width: 250px;"
-                                                   class="form-control" value="<%=row['bw_id']%>" >
-                                            <input type="text" name="unwin[<%=index%>][pc_id]"
-                                                   style="width: 250px;"
-                                                   class="form-control" value="<%=row['pc_id']%>" >
+
+                                            <select class="form-control" name="unwin[<%=index%>][xx_id]" style="width: 250px;">
+                                                {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;">
+                                                {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;">
+                                                {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;">
+                                                {foreach name="paichu" item="vo"}
+                                                <option value="{$vo.fault_id}" <%if(row.pc_id =='{$vo.fault_id}'){%> selected <% }%> >{$vo.name}</option>
+                                                {/foreach}
+                                            </select>
                                             <span class="btn btn-sm btn-danger btn-remove"><i class="fa fa-times"></i></span>
                                         </dd>
                                     </script>

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

@@ -10,6 +10,8 @@
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('teacher/exams/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/exams/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/exams/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-info btn-view btn-disabled disabled {:$auth->check('student/exam/view')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-eye"></i> {:__('成绩详情')}</a>
+
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('teacher/exams/edit')}"

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

@@ -0,0 +1,145 @@
+<link href="/assets/libs/font-awesome/css/font-awesome.min.css?v=Math.random()" rel="stylesheet">
+<link href="/assets/css/bootstrap.css?v=Math.random()" rel="stylesheet">
+<style type="text/css">
+    .new_table {
+        border-collapse: collapse;
+        margin: 0 auto;
+        text-align: left;
+        width: 100%;
+        font-size: 12px;
+    }
+
+    .new_table td,
+    table th {
+        border: 1px solid #cad9ea;
+        color: #666;
+        height: 3.5em;
+        padding-left: 1%;
+    }
+
+    .new_table thead th {
+        background-color: #CCE8EB;
+        width: 100px;
+    }
+     .djs{
+         margin-right: 5%;
+         text-align: center;
+         line-height:8px;
+         font-size:20px;
+         margin-top: 50px;
+         margin-bottom:3%
+     }
+</style>
+
+<div class="row">
+    <div class="djs">2025年装备维修评分标准</div>
+    <div class="col-lg-12" style="margin: 10px 10px 0 10px">
+        <table class="new_table">
+            <tr>
+                <td style="width:15%">考号</td>
+                <td style="width:15%">{$row.user_username|htmlentities}</td>
+                <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>
+            </tr>
+            <tr>
+                <td>考试开始时间</td>
+                <td>{$row.start_time|htmlentities}</td>
+                <td>考试结束时间</td>
+                <td>{$row.end_time|htmlentities}</td>
+                <td>成绩</td>
+                <td>{$row.total|htmlentities}</td>
+            </tr>
+        </table>
+        <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
+        <div class="tab-content" style="margin-top:5px;">
+            <div class="tab-pane tab_log1" style="display: block">
+                <table class="new_table">
+                    <tr>
+                        <td style="width:15%">序号</td>
+                        <td style="width:20%">评分标准</td>
+                        <td style="width:15%">扣分</td>
+                        <td style="width:15%">维修情况</td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>
+                    </tr>
+                    <tr>
+                        <td>1</td>
+                        <td>故障一未排除扣25分</td>
+                        <td>{$row.fault_one_score|htmlentities}</td>
+                        <td>{if $row.fault_one_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>2</td>
+                        <td>故障二未排除扣25分</td>
+                        <td>{$row.fault_two_score|htmlentities}</td>
+                        <td>{if $row.fault_two_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>2</td>
+                        <td>故障三未排除扣25分</td>
+                        <td>{$row.fault_three_score|htmlentities}</td>
+                        <td>{if $row.fault_three_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td style="width:15%">序号</td>
+                        <td style="width:20%">评分标准</td>
+                        <td style="width:15%">扣分</td>
+                        <td style="width:15%">报告情况</td>
+                    </tr>
+                    <tr>
+                        <td colspan="5" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>
+                    </tr>
+                    <tr>
+                        <td>1</td>
+                        <td>故障现象少写或错写1条扣1分</td>
+                        <td>{$row.xianxian_score|htmlentities}</td>
+                        <td>{if $row.xianxian_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>2</td>
+                        <td>可能原因少写或错写1条扣1分</td>
+                        <td>{$row.yuanyin_socre|htmlentities}</td>
+                        <td>{if $row.yuanyin_socre eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>3</td>
+                        <td>故障部位少写或错写1条扣1分</td>
+                        <td>{$row.buwei_score|htmlentities}</td>
+                        <td>{if $row.buwei_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>4</td>
+                        <td>排除方法少写或错写1条扣1分</td>
+                        <td>{$row.fangfa_score|htmlentities}</td>
+                        <td>{if $row.fangfa_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td>5</td>
+                        <td>修复结论错扣2分</td>
+                        <td>{$row.jielun_score|htmlentities}</td>
+                        <td>{if $row.jielun_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
+                        <td colspan="2">{$row.overtime_score|htmlentities}</td>
+                    </tr>
+<!--                    <tr>-->
+<!--                        <td colspan="2">扣分小计</td>-->
+<!--                        <td colspan="2">超时</td>-->
+<!--                    </tr>-->
+                    <tr>
+                        <td colspan="2">五.成绩</td>
+                        <td colspan="2">{$row.total|htmlentities}</td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        </form>
+    </div>
+</div>

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

@@ -5,6 +5,7 @@
         <input class="form-control" name="row[create_user_id]" type="hidden" value="{$auth->id}">
         <input class="form-control" name="row[create_by]" type="hidden" value="{$auth->nickname}">
         <input class="form-control depart_ids" name="row[depart_ids]" type="hidden" value="">
+        <input class="form-control question_ids" name="row[question_ids]" type="hidden" value="0">
         <div class="form-group col-sm-6">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
             <div class="col-xs-12 col-sm-7">
@@ -56,7 +57,9 @@
                 </select>
             </div>
             <button class="btn btn-info btn-sm" style="display: none">自选考题编辑</button>
+            <button class="btn btn-info btn-task" style="display: none">自选任务编辑</button>
         </div>
+
     </div>
     <div class="panel panel-default panel-intro">
         <div class="panel-body">

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

@@ -1,5 +1,6 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <div class="row">
+        <input class="form-control question_ids" name="row[question_ids]" type="hidden" value="{$row.question_ids|htmlentities}">
         <input class="form-control depart_ids" name="row[depart_ids]" type="hidden" value="{$row.depart_ids|htmlentities}">
         <div class="form-group col-sm-6">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Exam_collection_name')}:</label>
@@ -51,7 +52,8 @@
                     {/foreach}
                 </select>
             </div>
-            <button class="btn btn-info btn-sm" style="display: none">自选考题编辑</button>
+            <div class="btn btn-info btn-sm" {if $row.question_setting_method neq 2}style="display: none"{/if}>自选考题编辑</div>
+            <div class="btn btn-info btn-task" {if $row.question_setting_method neq 3}style="display: none"{/if}>自选任务编辑</div>
         </div>
     </div>
     <div class="panel panel-default panel-intro">

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

@@ -0,0 +1,23 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-danger btn-choose-multi" title="{:__('Refresh')}" ><i class="fa fa-check"></i> 选择</a>
+
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('teacher/collection/edit')}"
+                           data-operate-del="{:$auth->check('teacher/collection/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,21 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('teacher/collection/edit')}"
+                           data-operate-del="{:$auth->check('teacher/collection/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

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

@@ -55,12 +55,6 @@
             <input class="form-control" type="text" value="{$row.user_username|htmlentities}" readonly>
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('区队')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input class="form-control" type="text" value="{$row.user_depart_id|htmlentities}" readonly>
-        </div>
-    </div>
     <div class="col-lg-12" style="margin: 20px 10px 0 10px">
         <div class="tab-content">
             <div class="tab-pane tab_log1" style="display: block">

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

@@ -78,196 +78,4 @@
 
         </div>
     </div>
-<!--    <div class="col-lg-12" style="margin: 10px 10px 0 10px">-->
-<!--        <form id="update-form" role="form" data-toggle="validator" method="POST" action="">-->
-<!--            <div class="tab-content" style="margin-top:5px;">-->
-<!--                <div class="tab-pane tab_log1" style="display: block">-->
-<!--                    <table class="new_table">-->
-<!--                        <tr>-->
-<!--                            <td style="width:25%">座号</td>-->
-<!--                            <td>坐席1</td>-->
-<!--                            <td>坐席2</td>-->
-<!--                            <td>坐席3</td>-->
-<!--                            <td>坐席4</td>-->
-<!--                            <td>坐席5</td>-->
-<!--                            <td>坐席6</td>-->
-<!--                            <td>坐席7</td>-->
-<!--                            <td>坐席8</td>-->
-<!--                            <td>坐席9</td>-->
-<!--                            <td>坐席10</td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>姓名</td>-->
-<!--                            <td>{$examlist[0]['user_nickname']}</td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>学号</td>-->
-<!--                            <td>{$examlist[0]['user_username']}</td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td colspan="11" style="text-align: left;padding-left: 1%">一.故障排除(75分)</td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>故障一未排除扣25分</td>-->
-<!--                            <td><input type="text" name="row[0][fault_one_score]" value="{$examlist[0]['score']['fault_one_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>故障二未排除扣25分</td>-->
-<!--                            <td><input type="text" name="row[0][fault_two_score]" value="{$examlist[0]['score']['fault_two_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>故障三未排除扣25分</td>-->
-<!--                            <td><input type="text" name="row[0][fault_three_score]" value="{$examlist[0]['score']['fault_three_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td colspan="11" style="text-align: left;padding-left: 1%">二.修理报告表(15分)</td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>故障现象少写或错写1条扣1分</td>-->
-<!--                            <td><input type="text" name="row[0][xianxian_score]" value="{$examlist[0]['score']['xianxian_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>可能原因少写或错写1条扣1分</td>-->
-<!--                            <td><input type="text" name="row[0][yuanyin_socre]" value="{$examlist[0]['score']['yuanyin_socre']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>故障部位少写或错写1条扣1分</td>-->
-<!--                            <td><input type="text" name="row[0][buwei_score]" value="{$examlist[0]['score']['buwei_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>排除方法少写或错写1条扣1分</td>-->
-<!--                            <td><input type="text" name="row[0][fangfa_score]" value="{$examlist[0]['score']['fangfa_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>修复结论错扣2分</td>-->
-<!--                            <td><input type="text" name="row[0][jielun_score]" value="{$examlist[0]['score']['jielun_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td colspan="11" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>按没超过1分钟扣1分的比例扣分</td>-->
-<!--                            <td><input type="text" name="row[0][overtime_score]" value="{$examlist[0]['score']['overtime_score']}"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                            <td><input type="text"></td>-->
-<!--                        </tr>-->
-<!--                        <tr>-->
-<!--                            <td>总分</td>-->
-<!--                            <td>{$examlist[0]['total_score']}</td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                            <td></td>-->
-<!--                        </tr>-->
-<!--                    </table>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group layer-footer" style="margin-top: 3%;text-align: center">-->
-<!--                <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-info">{:__('确认成绩并结束本批次考试')}</button>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </form>-->
-<!--    </div>-->
 </div>

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

@@ -32,24 +32,24 @@
 </style>
 
 <div class="row">
-    <div class="djs">20 年 装备维修评分标准</div>
+    <div class="djs">2025年装备维修评分标准</div>
     <div class="col-lg-12" style="margin: 10px 10px 0 10px">
         <table class="new_table">
             <tr>
-                <td>考号</td>
-                <td>88888</td>
-                <td>姓名</td>
-                <td>88888</td>
-                <td>区队</td>
-                <td>1111</td>
+                <td style="width:15%">考号</td>
+                <td style="width:15%">{$row.user_username|htmlentities}</td>
+                <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>
             </tr>
             <tr>
-                <td>规定考试时间</td>
-                <td>50</td>
-                <td>实际作业时间</td>
-                <td>23</td>
+                <td>考试开始时间</td>
+                <td>{$row.start_time|htmlentities}</td>
+                <td>考试结束时间</td>
+                <td>{$row.end_time|htmlentities}</td>
                 <td>成绩</td>
-                <td>36</td>
+                <td>{$row.total|htmlentities}</td>
             </tr>
         </table>
         <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
@@ -68,20 +68,20 @@
                     <tr>
                         <td>1</td>
                         <td>故障一未排除扣25分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.fault_one_score|htmlentities}</td>
+                        <td>{if $row.fault_one_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>故障二未排除扣25分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.fault_two_score|htmlentities}</td>
+                        <td>{if $row.fault_two_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>故障三未排除扣25分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.fault_three_score|htmlentities}</td>
+                        <td>{if $row.fault_three_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td style="width:15%">序号</td>
@@ -95,51 +95,47 @@
                     <tr>
                         <td>1</td>
                         <td>故障现象少写或错写1条扣1分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.xianxian_score|htmlentities}</td>
+                        <td>{if $row.xianxian_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>可能原因少写或错写1条扣1分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.yuanyin_socre|htmlentities}</td>
+                        <td>{if $row.yuanyin_socre eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>3</td>
                         <td>故障部位少写或错写1条扣1分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.buwei_score|htmlentities}</td>
+                        <td>{if $row.buwei_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>4</td>
                         <td>排除方法少写或错写1条扣1分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.fangfa_score|htmlentities}</td>
+                        <td>{if $row.fangfa_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td>5</td>
                         <td>修复结论错扣2分</td>
-                        <td></td>
-                        <td></td>
+                        <td>{$row.jielun_score|htmlentities}</td>
+                        <td>{if $row.jielun_score eq 0 }<span class="text-success">已排除</span> {else} <span class="text-danger">未排除</span>{/if}</td>
                     </tr>
                     <tr>
                         <td colspan="4" style="text-align: left;padding-left: 1%">三.维修时间(10分)</td>
                     </tr>
                     <tr>
                         <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
-                        <td colspan="2"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">扣分小计</td>
-                        <td colspan="2">超时</td>
+                        <td colspan="2">{$row.overtime_score|htmlentities}</td>
                     </tr>
+<!--                    <tr>-->
+<!--                        <td colspan="2">扣分小计</td>-->
+<!--                        <td colspan="2">超时</td>-->
+<!--                    </tr>-->
                     <tr>
                         <td colspan="2">五.成绩</td>
-                        <td colspan="2"></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">说明</td>
-                        <td colspan="2"></td>
+                        <td colspan="2">{$row.total|htmlentities}</td>
                     </tr>
                 </table>
             </div>

public/assets/js/addons.js

@@ -1,3 +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',
+        },
+        shim: {
+            'editable': {
+                deps: ['x-editable', 'bootstrap-table']
+            },
+            // "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
+                });
+            };
+        });
+    }
 });

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

@@ -20,6 +20,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:true,
+                singleSelect : true,
                 columns: [
                     [
                         {checkbox: true},
@@ -75,6 +76,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 为表格绑定事件
             Table.api.bindevent(table);
+
+            $(document).on('click', '.btn-view', function () {
+                var ids = Table.api.selectedids(table);
+                var title = '成绩详情';
+                Fast.api.open(Fast.api.fixurl("student/exam/view/ids/"+ids), title, { area: ["60%", "95%"] });
+            });
         },
         add: function () {
             Controller.api.bindevent();

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

@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function ($, undefined, Backend, Table, Form,editable) {
 
     var Controller = {
         index: function () {
@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:true,
+                singleSelect : true, //
                 columns: [
                     [
                         {checkbox: true},
@@ -107,7 +108,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.init({
                 extend: {
                     index_url: 'teacher/exams/persent' + location.search,
+                    edit_url: 'teacher/exams/editscore',
                     indexed_url: 'teacher/exams/examing' + location.search,
+                    score_url: 'teacher/exams/score' + location.search,
                     table: 'teacher_exams',
                 }
             });
@@ -122,6 +125,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:false,
+                showExport:false,
+                search:false,
                 columns: [
                     [
                         // {checkbox: true},
@@ -198,6 +203,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedColumns: true,
                 fixedRightNumber: 1,
                 searchFormVisible:false,
+                showExport:false,
+                search:false,
                 columns: [
                     [
                         // {checkbox: true},
@@ -246,50 +253,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             var table2 = $("#table2");
             // 初始化表格
             table2.bootstrapTable({
-                url: $.fn.bootstrapTable.defaults.extend.indexed_url,
+                url: $.fn.bootstrapTable.defaults.extend.score_url,
                 pk: 'exam_id',
                 sortName: 'exam_id',
                 toolbar: '#toolbar2',
                 fixedColumns: true,
                 pageSize: 10,
                 pagination:false,
-                fixedRightNumber: 1,
+                fixedLeftNumber: 4,
                 searchFormVisible:false,
+                showExport:false,
+                search:false,
                 columns: [
                     [
                         // {checkbox: true},
                         {field: 'seat_id', title: __('座号')},
                         {field: 'user_username', title: __('学员学号')},
                         {field: 'user_nickname', title: __('学员姓名')},
-                        {field: 'total_score', title: __('考试成绩')},
-                        {field: '', title: __('总分')},
-                        {field: '', title: __('故障一未排除扣25分')},
-                        {field: '', title: __('故障二未排除扣25分')},
-                        {field: '', title: __('故障三未排除扣25分')},
-                        {field: '', title: __('故障现象少写或错写1条扣1分')},
-                        {field: '', title: __('可能原因少写或错写1条扣1分')},
-                        {field: '', title: __('故障部位少写或错写1条扣1分')},
-                        {field: '', title: __('排除方法少写或错写1条扣1分')},
-                        {field: '', title: __('修复结论错扣2分')},
-                        {field: '', title: __('按每超时1分钟扣分的比例扣分')},
-                        // {field: '', title: __('故障部位')},
-                        // {field: '', title: __('排除方法')},
-                        // {field: 'operate', title: __('Operate'), table: table1,
-                        //     events: Table.api.events.operate,
-                        //     // formatter: Table.api.formatter.operate
-                        //     formatter: Table.api.formatter.buttons,
-                        //     buttons: [
-                        //         // {
-                        //         //     name: 'dispatch',
-                        //         //     text: '',
-                        //         //     icon: 'fa fa-pencil',
-                        //         //     title: '编辑',
-                        //         //     classname: 'btn btn-success btn-xs btn-magic btn-dialog',
-                        //         //     extend: 'data-area=\'["55%","95%"]\'',
-                        //         //     url: 'teacher/exams/edit',
-                        //         // }
-                        //     ],
-                        // }
+                        {field: 'total', title: __('考试成绩')},
+                        {field: 'fault_one_score', title: __('故障一扣分'),editable:true},
+                        {field: 'fault_two_score', title: __('故障二扣分'),editable:true},
+                        {field: 'fault_three_score', title: __('故障三扣分'),editable:true},
+                        {field: 'xianxian_score', title: __('故障现象扣分'),editable:true},
+                        {field: 'yuanyin_socre', title: __('可能原因扣分'),editable:true},
+                        {field: 'buwei_score', title: __('故障部位扣分'),editable:true},
+                        {field: 'fangfa_score', title: __('排除方法扣分'),editable:true},
+                        {field: 'jielun_score', title: __('修复结论扣分'),editable:true},
+                        {field: 'overtime_score', title: __('按每扣分'),editable:true},
                     ]
                 ]
             });
@@ -297,6 +287,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table2);
 
+            $("button[name=commonSearch]").css('display','none');
+
         },
         add: function () {
             Controller.api.bindevent();

public/assets/js/require-table.js

@@ -793,7 +793,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
                 },
                // ["primary", "success", "danger", "warning", "info", "gray", "red", "yellow", "aqua", "blue", "navy", "teal", "olive", "lime", "fuchsia", "purple", "maroon"];
                 simexamstatus: function (value, row, index) {
-                    var custom = {'0': 'gray', '1': 'info', '2': 'danger', '3': 'success','4': 'warning','5': 'warning','6': 'navy','7': 'blue','80': 'red','81': 'yellow','90': 'maroon'};
+                    var custom = {'0': 'gray', '1': 'info', '2': 'danger', '3': 'success','4': 'warning','5': 'aqua','6': 'navy','7': 'blue','80': 'red','81': 'yellow','90': 'maroon'};
                     if (typeof this.custom !== 'undefined') {
                         custom = $.extend(custom, this.custom);
                     }