m

app/Http/Controllers/Admin/StatisticsController.php

@@ -3958,6 +3958,7 @@ class StatisticsController extends Controller
      * 地域roi7 15,30,45,60日汇总
      */
     public function districtRoiAllTotal(Request $request){
+        $only_roi = (int)$request->input('only_roi');
         $page = (int)$request->input('page');
         $pageSize = 20;
         if($page<=0){
@@ -4059,7 +4060,8 @@ class StatisticsController extends Controller
             'page'              =>$page,
             'count'             =>$count,
             'pages'             =>$pages,                                    
-            'city'             =>$city,                                        
+            'city'              =>$city,                                        
+            'only_roi'          =>$only_roi,                                        
             ]);
 
     }
@@ -4068,7 +4070,7 @@ class StatisticsController extends Controller
      * 地域roi7日
      */
     public function districtRoiAllTotal_export(Request $request){
-
+        $only_roi = (int)$request->input('only_roi');
         $city = $request->input('city');
         if($city !== null){
             $city = str_replace('市', '', $city);
@@ -4144,8 +4146,14 @@ class StatisticsController extends Controller
             }
         }
 
-        $indexKey = ['city','cost','order_count','order_amount','total_roi','cost15','order_count15','order_amount15','total_roi15','cost30','order_count30','order_amount30','total_roi30','cost45','order_count45','order_amount45','total_roi45','cost60','order_count60','order_amount60','total_roi60'];
-        $title = ['城市', '7日累计投放成本', '7日累计成单数', '7日累计收入', '7日累计ROI', '15日累计投放成本', '15日累计成单数', '15日累计收入', '15日累计ROI', '30日累计投放成本', '30日累计成单数', '30日累计收入', '30日累计ROI', '45日累计投放成本', '45日累计成单数', '45日累计收入', '45日累计ROI', '60日累计投放成本', '60日累计成单数', '60日累计收入', '60日累计ROI'];
+        if($only_roi == 1){
+            $indexKey = ['city','total_roi','total_roi15','total_roi30','total_roi45','total_roi60'];
+            $title = ['城市', '7日累计ROI', '15日累计ROI', '30日累计ROI', '45日累计ROI', '60日累计ROI'];
+        }
+        else{
+            $indexKey = ['city','cost','order_count','order_amount','total_roi','cost15','order_count15','order_amount15','total_roi15','cost30','order_count30','order_amount30','total_roi30','cost45','order_count45','order_amount45','total_roi45','cost60','order_count60','order_amount60','total_roi60'];
+            $title = ['城市', '7日累计投放成本', '7日累计成单数', '7日累计收入', '7日累计ROI', '15日累计投放成本', '15日累计成单数', '15日累计收入', '15日累计ROI', '30日累计投放成本', '30日累计成单数', '30日累计收入', '30日累计ROI', '45日累计投放成本', '45日累计成单数', '45日累计收入', '45日累计ROI', '60日累计投放成本', '60日累计成单数', '60日累计收入', '60日累计ROI'];
+        }
         $filename = 'districtRoiAll_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }

resources/views/statistics/districtRoi.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>  
-                    <option value="9">所有roi汇总</option>                                  
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                  
                   
                 </select>
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -174,6 +175,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
        
         /*分页*/

resources/views/statistics/districtRoi15day.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>   
-                    <option value="9">所有roi汇总</option>                                 
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                  
                   
                 </select> 
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -131,6 +132,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
        
         /*分页*/

resources/views/statistics/districtRoi15dayTotal.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>   
-                    <option value="9">所有roi汇总</option>                                  
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                  
                   
                 </select>  
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -121,6 +122,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
         /*分页*/
             

resources/views/statistics/districtRoi30day.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>  
-                    <option value="9">所有roi汇总</option>                                   
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                   
                   
                 </select> 
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -131,6 +132,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
        
         /*分页*/

resources/views/statistics/districtRoi30dayTotal.blade.php

@@ -15,7 +15,8 @@
                     <option value="4" selected>30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>  
-                    <option value="9">所有roi汇总</option>                                   
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                   
                   
                 </select>  
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -121,6 +122,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
         /*分页*/
             

resources/views/statistics/districtRoi45day.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7"  selected>45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>    
-                    <option value="9">所有roi汇总</option>                                  
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                  
                   
                 </select> 
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -131,6 +132,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
        
         /*分页*/

resources/views/statistics/districtRoi45dayTotal.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8" selected>45日roi汇总</option>        
-                    <option value="9">所有roi汇总</option>                             
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                             
                   
                 </select>  
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -121,6 +122,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
         /*分页*/
             

resources/views/statistics/districtRoi7day.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>    
-                    <option value="9">所有roi汇总</option>                                  
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                  
                   
                 </select> 
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -131,6 +132,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
        
         /*分页*/

resources/views/statistics/districtRoi7dayTotal.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>  
-                    <option value="9">所有roi汇总</option>                                    
+                    <option value="9">所有时段roi汇总</option>                                  
+                    <option value="10">单独roi列汇总</option>                                    
                   
                 </select>  
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -124,6 +125,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
         /*分页*/
             

resources/views/statistics/districtRoiAllTotal.blade.php

@@ -15,7 +15,8 @@
                     <option value="4">30日roi汇总</option> 
                     <option value="7">45日roi明细</option>                                     
                     <option value="8">45日roi汇总</option>                                      
-                    <option value="9" selected>所有roi汇总</option>                                      
+                    <option value="9" @if($only_roi == 0) selected @endif>各类roi汇总</option>                                      
+                    <option value="10" @if($only_roi == 1) selected @endif>单独roi列统计</option>                                      
                   
                 </select>  
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
@@ -32,6 +33,13 @@
                 <thead>
                 <tr class="text-c">
                     <th width="4%">城市</th>
+                    @if($only_roi == 1)
+                    <th width="4%">7日累计ROI</th>
+                    <th width="4%">15日累计ROI</th>
+                    <th width="4%">30日累计ROI</th>
+                    <th width="4%">45日累计ROI</th>
+                    <th width="4%">60日累计ROI</th>
+                    @else
                     <th width="4%">7日累计投放成本</th>
                     <th width="4%">7日累计成单数</th>
                     <th width="4%">7日累计收入</th>
@@ -51,14 +59,22 @@
                     <th width="4%">60日累计投放成本</th>
                     <th width="4%">60日累计成单数</th>
                     <th width="4%">60日累计收入</th>
-                    <th width="4%">60日累计ROI</th>                                               
+                    <th width="4%">60日累计ROI</th>  
+                    @endif                                             
                 </tr>
                 </thead>
                 <tbody>
                 @if($result)
                     @foreach($result as $a)
                         <tr class="text-c" style=" text-align:center;">                                                                           
-                            <td>{{$a['city']}}</td>                                                                                         
+                            <td>{{$a['city']}}</td>   
+                            @if($only_roi == 1)   
+                            <td>{{$a['total_roi']}}</td>
+                            <td>{{$a['total_roi15']}}</td>
+                            <td>{{$a['total_roi30']}}</td>
+                            <td>{{$a['total_roi45']}}</td>
+                            <td>{{$a['total_roi60']}}</td>
+                            @else                                                                                   
                             <td>{{$a['cost']}}</td>         
                             <td>{{$a['order_count']}}</td>                                                                                         
                             <td>{{$a['order_amount']}}</td>                                                                                         
@@ -78,7 +94,8 @@
                             <td>{{$a['cost60']}}</td>         
                             <td>{{$a['order_count60']}}</td>                                                                                         
                             <td>{{$a['order_amount60']}}</td>                                                                                         
-                            <td>{{$a['total_roi60']}}</td>                                                                                         
+                            <td>{{$a['total_roi60']}}</td>   
+                            @endif                                                                                      
                         </tr>
                     @endforeach
                 @endif
@@ -102,13 +119,15 @@
         function user_search(){
 
             var city = $('#city').val();
+            var only_roi = "{{$only_roi}}";
             //var page = {{$page}};
-            location.href = 'districtRoiAllTotal?city='+city;
+            location.href = 'districtRoiAllTotal?city='+city+'&only_roi='+only_roi;
         }
         //导出
         function statistics_export(){
             var city = $('#city').val();
-            location.href = '/admin/statistics/districtRoiAllTotal_export?city='+city;
+            var only_roi = "{{$only_roi}}"
+            location.href = '/admin/statistics/districtRoiAllTotal_export?city='+city+'&only_roi='+only_roi;
         }
        
         $("#data_type").change(function(){
@@ -143,6 +162,9 @@
             else if(date_type == 9){
                 location.href='districtRoiAllTotal';
             }
+            else if(date_type == 10){
+                location.href='districtRoiAllTotal?only_roi=1';
+            }
         })
         /*分页*/
             
@@ -152,7 +174,8 @@
             totalSize: {{$count}},
             callback: function(num) {
                 var city = $('#city').val();
-                location.href='districtRoiAllTotal?page='+num+'&city='+city;
+                var only_roi = "{{$only_roi}}"
+                location.href='districtRoiAllTotal?page='+num+'&city='+city+'&only_roi='+only_roi;
             }
         })