najixian / xt_dc_admin · Commits

Go to a project

Commit 05948b4a95199faef4bbf71963ebd019e3a9fa02

Authored by teemitop
1 parent 769d849d
build: skipped

设备维度查询预定信息

Inline Side-by-side
Showing 2 changed files with 27 additions and 54 deletions
@@ -134,27 +134,22 @@ class Seller extends Common @@ -134,27 +134,22 @@ class Seller extends Common
134 134
135 $sid = $data['sid'] ? implode(',', $data['sid']) : ''; 135 $sid = $data['sid'] ? implode(',', $data['sid']) : '';
136 $sellername = $data['key'] ? $data['key'] : ''; 136 $sellername = $data['key'] ? $data['key'] : '';
137 - $stime = $data['stime'] ? strtotime(date($data['stime'],time())) : '';  
138 - $etime = $data['etime'] ? strtotime(date($data['etime'],time())) : '';  
139 137
140 - $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&type='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type']; 138 + $time = $data['time'] ? explode(' - ', $data['time']) : '';
  139 +
  140 + $stime = $time ? strtotime(date($time[0],time())) : '';
  141 + $etime = $time ? strtotime(date($time[1],time())) : '';
  142 +
  143 + $data['time_type'] = $data['time_type'] ? $data['time_type'] : 1;
  144 + $data['channel'] = $data['channel'] ? $data['channel'] : 1;
  145 +
  146 + $parame = '&page='.$data["page"].'&size='.$data["limit"].'&sellername='.@$sellername.'&stime='.@$stime.'&etime='.@$etime.'&channel='.@$data['channel'].'&sid='.$sid.'&time_type='.@$data['time_type'];
141 //获取运营人员列表 147 //获取运营人员列表
142 - $list= file_get_contents(ON_LINE.'App.Report.GetReserveData'.$parame);  
143 - 148 + $list= file_get_contents(ON_LINE.'App.Report.GetReserveDataBydev'.$parame);
144 $array = json_decode($list,TRUE); 149 $array = json_decode($list,TRUE);
145 - $new_array = array();  
146 - foreach ($array['data'] as $key => $value) {  
147 - if(is_array($value)){  
148 - $new_array[$key]['id'] = $value['id'];  
149 - $new_array[$key]['sellername'] = $value['sellername'];  
150 - $new_array[$key]['inviting'] = $value['inviting'];  
151 - $new_array[$key]['reserve_count'] = $value['appReserveCount'] + $value['AndroidReserveCount'].'('.$value['appReserveCount'] .'/'. $value['AndroidReserveCount'].')';  
152 - $new_array[$key]['sms_send_count'] = $value['appSmsCount'] + $value['AndroidSmsCount'].'('.$value['appSmsCount'] .'/'. $value['AndroidSmsCount'].')';  
153 - }  
154 - }  
155 - return $result = ['code'=>0,'msg'=>'获取成功!','data'=>$new_array,'count'=>$array['data']['total'],'countReserve'=>$array['data']['countReserve'],'countSms'=>$array['data']['countSms'],'rel'=>1]; 150 + return $result = ['code'=>0,'msg'=>'获取成功!','data'=>$array['data']['list'],'count'=>$array['data']['total'],'rel'=>1];
156 } 151 }
157 - $this->assign ( 'title','预定订单统计'); 152 + $this->assign ( 'title','设备维度统计预定订单');
158 return $this->fetch(); 153 return $this->fetch();
159 } 154 }
160 155
@@ -3,14 +3,6 @@ @@ -3,14 +3,6 @@
3 <fieldset class="layui-elem-field layui-field-title"> 3 <fieldset class="layui-elem-field layui-field-title">
4 <legend>{:$title}</legend> 4 <legend>{:$title}</legend>
5 </fieldset> 5 </fieldset>
6 - <blockquote class="layui-elem-quote">  
7 - <a href="{:url('Seller/getStatistics')}" class="layui-btn layui-btn-sm">  
8 - <i class="fa fa-file-image-o"></i> 商家维度  
9 - </a>  
10 - <a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger">  
11 - <i class="fa fa-file-image-o"></i> 设备维度  
12 - </a>  
13 - </blockquote>  
14 <div class="demoTable"> 6 <div class="demoTable">
15 商家： 7 商家：
16 <div class="layui-input-inline"> 8 <div class="layui-input-inline">
@@ -18,12 +10,7 @@ @@ -18,12 +10,7 @@
18 </div> 10 </div>
19 日期范围： 11 日期范围：
20 <div class="layui-input-inline" > 12 <div class="layui-input-inline" >
21 - <!--<input type="text" style = "width:300px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">-->  
22 - <input type="text" class="layui-input" id="stime" placeholder="开始日期">  
23 - </div>  
24 - -  
25 - <div class="layui-input-inline">  
26 - <input type="text" class="layui-input" id="etime" placeholder="结束日期"> 13 + <input type="text" style = "width:300px"; class="layui-input" id="time" placeholder="默认为当天的统计情况">
27 </div> 14 </div>
28 商家来源： 15 商家来源：
29 <div class="layui-input-inline layui-form"> 16 <div class="layui-input-inline layui-form">
@@ -44,17 +31,15 @@ @@ -44,17 +31,15 @@
44 </select> 31 </select>
45 </div> 32 </div>
46 </div> 33 </div>
47 - 地区： 34 + <!--地区：
48 <div class="layui-input-inline"> 35 <div class="layui-input-inline">
49 <input type="text" class="layui-input" id="area" placeholder="地区暂未开放"> 36 <input type="text" class="layui-input" id="area" placeholder="地区暂未开放">
50 - </div> 37 + </div>-->
51 <button class="layui-btn" id="search" data-type="reload">查询统计</button> 38 <button class="layui-btn" id="search" data-type="reload">查询统计</button>
52 </div> 39 </div>
53 <table class="layui-table" id="list" lay-filter="list"></table> 40 <table class="layui-table" id="list" lay-filter="list"></table>
54 </div> 41 </div>
55 <script type="text/html" id="toolbarDemo"> 42 <script type="text/html" id="toolbarDemo">
56 - <span>订单总数：<i id="count">X</i>条</span>  
57 - <span>短信发送数量：<i id="size">Y</i>条</span>  
58 </script> 43 </script>
59 {include file="common/foot"/} 44 {include file="common/foot"/}
60 <script> 45 <script>
@@ -65,17 +50,17 @@ @@ -65,17 +50,17 @@
65 elem: '#list', 50 elem: '#list',
66 url: '{:url("getEquipment")}', 51 url: '{:url("getEquipment")}',
67 method: 'post', 52 method: 'post',
68 - title: '预定订单统计', 53 + title: '设备维度统计预定情况',
69 page:true, 54 page:true,
70 toolbar: '#toolbarDemo', 55 toolbar: '#toolbarDemo',
71 cols: [[ 56 cols: [[
72 {checkbox:true,fixed: true}, 57 {checkbox:true,fixed: true},
73 {field: 'id', title: '{:lang("id")}', width:103, fixed: true}, 58 {field: 'id', title: '{:lang("id")}', width:103, fixed: true},
74 - {field: 'sellername', title: '设备编号', width: 350},  
75 - {field: 'reserve_count', align: 'center', title: 'APP版本', width: 250},  
76 - {field: 'sms_send_count', align: 'center',title: '所属商家', width: 250},  
77 - {field: 'inviting', align: 'center',title: '产生订单量', width: 290, sort: true},  
78 - {field: 'inviting', align: 'center',title: '短信发送量', width: 290, sort: true}, 59 + {field: 'sellername', align: 'center',title: '所属商家', width: 250},
  60 + {field: 'device', title: '设备编号', width: 350},
  61 + {field: 'version', align: 'center', title: 'APP版本', width: 250},
  62 + {field: 'reserveCount', align: 'center',title: '产生订单量', width: 290, sort: true},
  63 + {field: 'SmsCount', align: 'center',title: '短信发送量', width: 290, sort: true},
79 ]], 64 ]],
80 done: function(res, curr, count){ 65 done: function(res, curr, count){
81 $('#count').html(res.countReserve); 66 $('#count').html(res.countReserve);
@@ -89,13 +74,9 @@ @@ -89,13 +74,9 @@
89 74
90 //日期时间范围 75 //日期时间范围
91 laydate.render({ 76 laydate.render({
92 - elem: '#stime',  
93 - type: 'datetime'  
94 - });  
95 -  
96 - laydate.render({  
97 - elem: '#etime',  
98 - type: 'datetime' 77 + elem: '#time'
  78 + ,type: 'datetime'
  79 + ,range: true
99 }); 80 });
100 81
101 //搜索 82 //搜索
@@ -109,11 +90,8 @@ @@ -109,11 +90,8 @@
109 a.push(o.id); 90 a.push(o.id);
110 }); 91 });
111 console.log(a); 92 console.log(a);
112 - //选中的日期  
113 - var stime = $('#stime').val();  
114 - console.log(stime);  
115 - var etime = $('#etime').val();  
116 - console.log(etime); 93 + var time = $('#time').val();
  94 + console.log(time);
117 //商家来源 95 //商家来源
118 var channel = $('#channel').val(); 96 var channel = $('#channel').val();
119 console.log(channel); 97 console.log(channel);
@@ -121,7 +99,7 @@ @@ -121,7 +99,7 @@
121 var time_type = $('#time_type').val(); 99 var time_type = $('#time_type').val();
122 console.log(time_type); 100 console.log(time_type);
123 //传参 101 //传参
124 - tableIn.reload({ page: {page: 1},where: {key: key,sid: a,stime: stime,time_type: time_type,etime: etime,channel: channel}}); 102 + tableIn.reload({ page: {page: 1},where: {key: key,sid: a,time: time,time_type: time_type,channel: channel}});
125 }); 103 });
126 104
127 var $ = layui.$, active = { 105 var $ = layui.$, active = {