20250616 修改

application/admin/view/student/exercise/analysis.html

@@ -154,7 +154,7 @@
                         </tr>
                         <tr>
                             <td colspan="2">按没超过1分钟扣1分的比例扣分</td>
-                            <td colspan="2"><span class="text-danger">考试时长:{$row.shijian|htmlentities}</span></td>
+                            <td colspan="2"><span class="text-danger">练习时长:{$row.shijian|htmlentities}</span></td>
                             <td colspan="1">扣分:{$row.overtime_score|htmlentities}</td>
                         </tr>
                         <tr>

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

@@ -94,7 +94,7 @@
                 <form id="update-form" role="form" data-toggle="validator" method="POST" action="">
                     {:token()}
                     <div class="panel-heading">
-                        <div class="readme">正在练习中，考试时间 {$row.limit_duration|htmlentities} 分钟</div>
+                        <div class="readme">正在练习中，练习时间 {$row.limit_duration|htmlentities} 分钟</div>
                         <div class="djs">距离练习结束还有 <span id="timer"></span> </div>
                     </div>
                     <div class="box-body box-profile">

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

@@ -1,15 +1,14 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-    <div class="row">
-
+    <div class="row shang">
         <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">
         <input class="form-control task_id" name="row[task_id]" type="hidden" value="0">
         <input class="form-control examid"  type="hidden" value="{$examid}">
 
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6" style="margin-top: 5px">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Sim_type')}:</label>
-            <div class="col-xs-12 col-sm-7">
-                <select id="c-sim_type" data-rule="required" class="form-control" name="row[sim_type]">
+            <div class="col-xs-12 col-sm-7" >
+                <select id="c-sim_type" data-rule="required" class="form-control" name="row[sim_type]" >
                     <option value="">请选择</option>
                     {foreach name="sim_sim_type" item="vo"}
                     <option value="{$key}" >{$vo}</option>
@@ -18,7 +17,7 @@
             </div>
         </div>
 
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6" style="margin-top: 5px">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Question_setting_method')}:</label>
             <div class="col-xs-12 col-sm-7">
                 <select id="c-question_setting_method" data-rule="required" class="form-control" name="row[question_setting_method]">
@@ -46,9 +45,8 @@
                 <input id="c-question_name" readonly  class="form-control" name="row[question_name]" type="text">
             </div>
         </div>
-
     </div>
-    <div class="panel panel-default panel-intro">
+    <div class="panel panel-default panel-intro" style="padding-top:5%">
         <div class="panel-body">
             <div class="tableTitle success" style="font-size: 16px;margin: 10px 0">统计情况</div>
             <div class="panel-success">
@@ -80,3 +78,13 @@
         </div>
     </div>
 </form>
+<style>
+    .shang{
+        position:fixed;
+        width: 100%;
+        background-color: #ecf0f1;
+        overflow:hidden;
+        margin-top:-14px;
+        z-index: 9999;
+    }
+</style>

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

@@ -15,8 +15,8 @@
                            width="100%">
                     </table>
                 </div>
-                <div style="margin-top: 15px;margin-left: 2px">
-                    <a href="javascript:;" class="btn btn-danger btn-choose-multi" title="{:__('Refresh')}" ><i class="fa fa-check"></i> 选择</a>
+                <div style="margin-top: 15px;text-align: center;">
+                    <a href="javascript:;" class="btn btn-success btn-choose-multi" title="{:__('Refresh')}" ><i class="fa fa-check"></i> 确定</a>
                 </div>
             </div>
 

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

@@ -8,9 +8,9 @@
                 <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-success btn-add {:$auth->check('teacher/collection/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('teacher/collection/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/collection/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('teacher/collection/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}考试</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('teacher/collection/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/collection/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/collection/start')?'':'hide'}" title="{:__('开始考试')}" ><i class="fa fa-play-circle"></i> {:__('开始考试')}</a>-->
 
                     </div>

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

@@ -1,5 +1,5 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-    <div class="row">
+    <div class="row shang">
         <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">
         <input class="form-control task_id" name="row[task_id]" type="hidden" value="0">
@@ -7,7 +7,7 @@
 
 
 
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6" style="margin-top: 5px">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Sim_type')}:</label>
             <div class="col-xs-12 col-sm-7">
                 <select id="c-sim_type" data-rule="required" class="form-control" name="row[sim_type]">
@@ -19,7 +19,7 @@
             </div>
         </div>
 
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6" style="margin-top: 5px">
             <label class="control-label col-xs-12 col-sm-3 addRedStar">{:__('Question_setting_method')}:</label>
             <div class="col-xs-12 col-sm-7">
                 <select id="c-question_setting_method" data-rule="required" class="form-control" name="row[question_setting_method]">
@@ -60,7 +60,7 @@
             </div>
         </div>
     </div>
-    <div class="panel panel-default panel-intro">
+    <div class="panel panel-default panel-intro" style="padding-top:5%">
         <div class="panel-body">
             <div class="tableTitle success" style="font-size: 16px;margin: 10px 0">统计情况</div>
             <div class="panel-success">
@@ -87,7 +87,17 @@
     <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>
+<style>
+    .shang{
+        position:fixed;
+        width: 100%;
+        background-color: #ecf0f1;
+        overflow:hidden;
+        margin-top:-14px;
+        z-index: 9999;
+    }
+</style>

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

@@ -33,7 +33,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/practice/index.html

@@ -7,9 +7,9 @@
                 <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-success btn-add {:$auth->check('teacher/collection/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('teacher/practice/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('teacher/practice/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('teacher/collection/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}训练</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('teacher/practice/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}训练</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('teacher/practice/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}训练</a>
 
 
 <!--                        <a href="javascript:;" class="btn btn-warning btn-start btn-disabled disabled {:$auth->check('teacher/practice/start')?'':'hide'}" title="{:__('开始训练')}" ><i class="fa fa-play-circle"></i> {:__('开始训练')}</a>-->

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

@@ -60,15 +60,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             // 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=\'["85%","85%"]\'',
-                                    url: 'teacher/collection/edit',
-                                },
+                                // {
+                                //     name: 'dispatch',
+                                //     text: '编辑',
+                                //     icon: 'fa fa-pencil',
+                                //     title: '编辑',
+                                //     classname: 'btn btn-success btn-xs btn-magic btn-dialog',
+                                //     // extend: 'data-area=\'["85%","85%"]\'',
+                                //     url: 'teacher/collection/edit',
+                                // },
                                 {
                                     name: 'dispatch',
                                     text: '进入考试',
@@ -122,22 +122,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     extend: 'data-area=\'["75%","75%"]\'',
                                     url: 'teacher/collection/edituser',
                                 },
-                                {
-                                    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;
+                                //     }
+                                // }
                             ],
                         }
                     ]
@@ -147,6 +147,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
 
+            $(".form-commonsearch .btn-success").html('搜索考试');
+            $(".form-commonsearch .btn-default").html('重置查询条件');
+
             $(document).on('click', '.btn-start', function () {
                 var ids = Table.api.selectedids(table);
                 Fast.api.ajax({

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

@@ -62,15 +62,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                             // 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=\'["85%","85%"]\'',
-                                    url: 'teacher/practice/edit',
-                                },
+                                // {
+                                //     name: 'dispatch',
+                                //     text: '编辑',
+                                //     icon: 'fa fa-pencil',
+                                //     title: '编辑',
+                                //     classname: 'btn btn-success btn-xs btn-magic btn-dialog',
+                                //     // extend: 'data-area=\'["85%","85%"]\'',
+                                //     url: 'teacher/practice/edit',
+                                // },
                                 {
                                     name: 'dispatch',
                                     text: '进入训练',
@@ -124,22 +124,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                                     extend: 'data-area=\'["75%","75%"]\'',
                                     url: 'teacher/practice/edituser',
                                 },
-                                {
-                                    name: 'dispatch',
-                                    text: '删除',
-                                    icon: 'fa fa-trash',
-                                    title: '删除',
-                                    classname: 'btn btn-danger btn-xs btn-magic btn-ajax',
-                                    url: 'teacher/practice/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/practice/del',
+                                //     confirm: '确定要删除吗？',
+                                //     success: function (data, ret) {
+                                //         $(".btn-refresh").trigger("click");
+                                //     },
+                                //     error: function (data, ret) {
+                                //         Layer.alert(ret.msg);
+                                //         return false;
+                                //     }
+                                // }
                             ],
                         }
                     ]
@@ -149,6 +149,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
             // 为表格绑定事件
             Table.api.bindevent(table);
 
+            $(".form-commonsearch .btn-success").html('搜索训练');
+            $(".form-commonsearch .btn-default").html('重置查询条件');
+
             $(document).on('click', '.btn-start', function () {
                 var ids = Table.api.selectedids(table);
                 Fast.api.ajax({
@@ -286,20 +289,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                         },
                         {field: 'user_username', title: __('学员学号')},
                         {field: 'user_nickname', title: __('学员姓名')},
-                        {field: 'exam_status', title: __('考试状态'),
+                        {field: 'exam_status', title: __('训练状态'),
                             formatter: function(value, row,index) {
                                 if(value=='未登录'){
                                     return '<span class="text-danger">'+value+'</span>';
-                                }else if(value=='已登录未开始考试'){
+                                }else if(value=='已登录未开始训练'){
                                     return '<span class="text-warning">'+value+'</span>';
-                                }else if(value=='已开始考试'){
+                                }else if(value=='已开始训练'){
                                     return '<span class="text-info">'+value+'</span>';
                                 }else if(value=='已交卷'){
                                     return '<span class="text-success">'+value+'</span>';
                                 }
                             }
                         },
-                        {field: 'total_score', title: __('考试成绩')},
+                        {field: 'total_score', title: __('训练成绩')},
                         {field: 'fault_names', title: __('出题题目'),formatter: Table.api.formatter.faultname},
                         {field: 'operate', title: __('Operate'), table: table1,
                             events: Table.api.events.operate,
@@ -354,7 +357,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
                         {field: 'sim_type', title: __('Sim_type'),searchList:{"0001":"FZD04B型侦毒器","0002":"FZB006型毒剂报警器","0003":"防化兵用毒剂报警器"},formatter: Table.api.formatter.simtype},
                         {field: 'user_username', title: __('学员学号')},
                         {field: 'user_nickname', title: __('学员姓名')},
-                        {field: 'total', title: __('考试成绩')},
+                        {field: 'total', title: __('训练成绩')},
                         {field: 'fault_one_score', title: __('故障一扣分'),editable:true},
                         {field: 'fault_two_score', title: __('故障二扣分'),editable:true},
                         {field: 'fault_three_score', title: __('故障三扣分'),editable:true},