后台页面调整

application/admin/controller/Tongji.php

@@ -27,6 +27,9 @@ class Tongji extends Backend
         $starttime = strtotime(date('Y-m-d',strtotime("-7 day")));  //默认7天前
         $endtime   = strtotime(date('Y-m-d')) - 1;
 
+        $starttime = strtotime(date('Y-m-d'));  //默认7天前
+        $endtime   = strtotime(date('Y-m-d')) + 86399;
+
         //接收
         $choicedatetime = input('choicedatetime','');
         if(!empty($choicedatetime)){

application/admin/view/trainactive/index.html

@@ -31,7 +31,7 @@
                             </ul>
                         </div>
 
-                        <!--<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('trainactive/recyclebin')?'':'hide'}" href="trainactive/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>-->
+                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('trainactive/recyclebin')?'':'hide'}" href="trainactive/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('trainactive/edit')}"

application/admin/view/trainactive/recyclebin.html

@@ -8,9 +8,9 @@
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
                         <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('trainactive/restore')?'':'hide'}" href="javascript:;" data-url="trainactive/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('trainactive/destroy')?'':'hide'}" href="javascript:;" data-url="trainactive/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('trainactive/destroy')?'':'hide'}" href="javascript:;" data-url="trainactive/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
                         <a class="btn btn-success btn-restoreall {:$auth->check('trainactive/restore')?'':'hide'}" href="javascript:;" data-url="trainactive/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('trainactive/destroy')?'':'hide'}" href="javascript:;" data-url="trainactive/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('trainactive/destroy')?'':'hide'}" href="javascript:;" data-url="trainactive/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
                            data-operate-restore="{:$auth->check('trainactive/restore')}"

application/admin/view/user/user/edit.html

@@ -12,10 +12,10 @@
             </select>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Jigou_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <!--<input id="c-jigou_id" data-rule="required" data-source="userjigou/selectpage" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">-->
+            &lt;!&ndash;<input id="c-jigou_id" data-rule="required" data-source="userjigou/selectpage" class="form-control selectpage" name="row[jigou_id]" type="text" value="{$row.jigou_id|htmlentities}">&ndash;&gt;
             <select id="c-jigou_id" data-rule="required" class="form-control selectpicker" name="row[jigou_id]">
                 <option value="0" selected>无</option>
                 {foreach name="jigoulist" item="vo"}
@@ -23,7 +23,7 @@
                 {/foreach}
             </select>
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/trainactive.js

@@ -172,14 +172,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                                     url: 'trainactive/restore',
                                     refresh: true
                                 },
-                                {
+                               /* {
                                     name: 'Destroy',
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
                                     url: 'trainactive/destroy',
                                     refresh: true
-                                }
+                                }*/
                             ],
                             formatter: Table.api.formatter.operate
                         }

public/assets/js/backend/user/user.js

@@ -41,8 +41,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'gangwei_id', title: __('Gangwei_id')},
                         {field: 'gangwei.name', title: __('Gangwei.name'), operate: false},
-                        {field: 'jigou_id', title: __('Jigou_id')},
-                        {field: 'jigou.name', title: __('Jigou.name'), operate: false},
+//                        {field: 'jigou_id', title: __('Jigou_id')},
+//                        {field: 'jigou.name', title: __('Jigou.name'), operate: false},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},