lizhen 4 giorni fa
parent
commit
9fde8cbeb3

+ 3 - 12
application/admin/view/exam/paper/add.html

@@ -7,14 +7,14 @@
 <div id="app">
     <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Cate_id')}:</label>
             <div class="col-xs-12 col-sm-8">
                 <input id="c-cate_id" data-rule="required" data-source="exam/cate/selectpage"
                        data-params='{"custom[kind]":"QUESTION","isTree":true}' class="form-control selectpage" name="row[cate_id]"
                        type="text" value="">
             </div>
-        </div>
+        </div>-->
 
         <!--<div class="form-group">
             <label class="control-label col-xs-12 col-sm-2">{:__('Kind')}:</label>
@@ -175,16 +175,7 @@
             </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">
-                <select id="c-gangwei_id" multiple="" class="form-control selectpicker" name="">
-                    {foreach name="gangweilist" item="vo"}
-                    <option value="{$vo.id}" >{$vo.name}</option>
-                    {/foreach}
-                </select>
-            </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">

+ 2 - 2
application/admin/view/exam/paper/index.html

@@ -18,8 +18,8 @@
                     <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('exam/paper/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('exam/paper/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('exam/paper/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('exam/paper/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('exam/paper/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
 
 
                         <!--<div class="dropdown btn-group {:$auth->check('exam/paper/multi')?'':'hide'}">

+ 3 - 3
application/admin/view/exam/question/index.html

@@ -18,9 +18,9 @@
                     <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('exam/question/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('exam/question/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('exam/question/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-importPage {:$auth->check('exam/question/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file"><i class="fa fa-upload"></i> {:__('Import')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('exam/question/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('exam/question/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-importPage {:$auth->check('exam/question/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
 
                         <!--<div class="dropdown btn-group {:$auth->check('exam/question/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>

+ 3 - 0
application/api/controller/Store.php

@@ -59,6 +59,9 @@ class Store extends Api
         $longitude   = input('longitude',0,'trim');
         $latitude    = input('latitude',0,'trim');
 
+        $longitude   = !empty($longitude) ? $longitude : 0;
+        $latitude    = !empty($latitude)  ? $latitude : 0;
+
         $field = ['*'];
         $field[] = '(st_distance(point (' . $longitude . ', ' . $latitude . '),point(longitude,latitude))*111195) as distance';
 

+ 6 - 6
public/assets/js/backend/exam/paper.js

@@ -64,8 +64,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id'), operate: false},
-                        {field: 'cate_id', title: __('Cate_id'), autocomplete: false, visible: false},
-                        {field: 'cate.name', title: __('Cate_id'), operate: false},
+                        // {field: 'cate_id', title: __('Cate_id'), autocomplete: false, visible: false},
+                        // {field: 'cate.name', title: __('Cate_id'), operate: false},
                         {field: 'title', title: __('Title'), autocomplete: false, operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         // {field: 'configs', title: __('Configs'), operate: 'LIKE'},
@@ -126,7 +126,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                             title: __('Operate'),
                             table: table,
                             buttons:[
-                                {
+                                /*{
                                     name:'selectuser',
                                     text:'选择用户',
                                     title:'选择用户',
@@ -134,7 +134,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                                     classname:'btn btn-xs btn-info btn-dialog btn-selectuser',
                                     url:'exam/paper/selectuser/id/{ids}?dialog=1',
                                     target:'_self',
-                                },
+                                },*/
                                 {
                                     name:'grade',
                                     text:'成绩',
@@ -144,7 +144,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                                     url:'exam/grade/index/paper_id/{ids}?dialog=1',
                                     target:'_self',
                                 },
-                                {
+                                /*{
                                     name:'nograde',
                                     text:'缺考',
                                     title:'缺考',
@@ -152,7 +152,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                                     classname:'btn btn-xs btn-info btn-dialog btn-nograde',
                                     url:'exam/paper/nograde/id/{ids}',
                                     target:'_self',
-                                }
+                                }*/
                             ],
                             events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate

+ 2 - 2
public/assets/js/backend/exam/question.js

@@ -52,8 +52,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'cate_id', title: __('Cate_id'), autocomplete: false, visible: false},
-                        {field: 'cate.name', title: __('Cate_id'), operate: false},
+                        // {field: 'cate_id', title: __('Cate_id'), autocomplete: false, visible: false},
+                        // {field: 'cate.name', title: __('Cate_id'), operate: false},
                         // {field: 'exam_type_id', title: __('Exam_type_id'), visible: false},
                         // {field: 'examtype.name', title: __('Exam_type_id'), operate: false},
                         {