梯形图加时间

app/Http/Controllers/Admin/StatisticsController.php

@@ -1204,20 +1204,51 @@ class StatisticsController extends Controller
      * 成单率梯形图
      */
     public function orderRateList(Request $request){
+        $stime = $request->input('stime');
+        $etime = $request->input('etime');
+        $_day = 30;
+        if($stime == '' && $etime == ''){
+            $stime = date("Y-m-d", strtotime('-32 day'));
+            $etime = date("Y-m-d", strtotime('-2 day'));
+        }else{
+            if($stime){
+                $_day = floor( (time() - strtotime($stime)) / 86400) - 1; //距昨天天数
+            }
+        }
         #统计天数
         $month = date('d')<=2 ? date('Y-m', strtotime('-1 month')) : date('Y-m'); //当前月
-        $day_count = DB::table('cust_day_remain')->where('month_time', $month)->count();
-        #计算分区级别 固定分20区
-        $_day = round($day_count / 30);
-        if($_day == 0) $_day = 1;
-        $result = DB::table('cust_day_remain')->orderBy('idate', 'asc')->orderBy('month_time', 'asc')->get();
+        $day_count = DB::table('cust_day_remain')->where('month_time', $month)->where(function($query) use($stime, $etime){
+            if($stime) $query->where('idate','>=', $stime);
+            if($etime) $query->where('idate','<=', $etime);
+        })->count();
+
+        $result = DB::table('cust_day_remain')->where(function($query) use($stime, $etime){
+            if($stime) $query->where('idate','>=', $stime);
+            if($etime) $query->where('idate','<=', $etime);
+        })->orderBy('idate', 'asc')->orderBy('month_time', 'asc')->get();
+
+        if($stime)
         #获取列
         $columns = array();
-        $i_max = floor($day_count/$_day) > 30 ? 30 : floor($day_count/$_day);
+        $i_max = 31;
         for($i=0; $i<$i_max; $i++){
-            $columns[] = $i*$_day;
+            $columns[] = $i;
         }
 
+        if($_day >= 45){
+            $columns[] = 45;
+        }
+        if($_day >= 60){
+            $columns[] = 60;
+        }
+        if($_day >= 75){
+            $columns[] = 75;
+        }
+        if($_day >= 90){
+            $columns[] = 90;
+        }
+
+
         #数据整合
         $data = array();
         foreach($result as $k=>$v){
@@ -1239,7 +1270,7 @@ class StatisticsController extends Controller
         }
         //echo '<pre>';
         //print_r($new_data);print_r($columns);exit;
-        return view('statistics/orderRateList', ['result' =>$new_data, 'columns'=>$columns]);
+        return view('statistics/orderRateList', ['result' =>$new_data, 'columns'=>$columns, 'stime'=>$stime, 'etime'=>$etime]);
 
     }
 }

resources/views/statistics/orderRateList.blade.php

@@ -4,7 +4,11 @@
     <div class="page-container">
         <div>
             <div>    
-                
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
+                <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>
+                <input id="etime"type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="etime" value="{{$etime?$etime:''}}">
+                <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>
                 <!--a class="btn btn-primary radius" onclick="statistics_export()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 导出数据</a-->
                 
             </div>
@@ -14,10 +18,10 @@
             <table class="table table-border table-bordered table-bg table-hover table-sort">
                 <thead>
                 <tr class="text-c">
-                    <th width="8%">时间</th>
-                    <th width="8%">新增用户</th>
+                    <th width="4%">时间</th>
+                    <th width="3%">新增用户</th>
                     @foreach($columns as $v)
-                    <th width="8%">@if($v==0) 当天 @else {{$v}}天后@endif</th>
+                    <th width="3%">@if($v==0) 当天 @else {{$v}}天后@endif</th>
                     @endforeach                          
                 </tr>
                 </thead>
@@ -76,6 +80,12 @@
                 location.href='/admin/statistics/down/'+id;
             });
         }
+
+        function user_search(){
+            var stime = $('#stime').val();
+            var etime = $('#etime').val();
+            location.href = 'orderRateList?stime='+stime+'&etime='+etime;
+        }
         
         
     </script>