Commit c1dc14d5f43aac0622ee9e0e084b46b44954e8c9

Authored by 娄高锋
1 parent 5652506f

页面查询条件的修改提交

src/main/resources/static/pages/forms/calc/calcsingledata.html
1 -<style type="text/css"> 1 +<style type="text/css">
2 .table-bordered { 2 .table-bordered {
3 border: 1px solid; } 3 border: 1px solid; }
4 .table-bordered > thead > tr > th, 4 .table-bordered > thead > tr > th,
@@ -40,14 +40,6 @@ @@ -40,14 +40,6 @@
40 <span class="item-label" style="width: 80px;">线路: </span> 40 <span class="item-label" style="width: 80px;">线路: </span>
41 <select class="form-control" name="line" id="line" style="width: 140px;"></select> 41 <select class="form-control" name="line" id="line" style="width: 140px;"></select>
42 </div> 42 </div>
43 - <div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">  
44 - <span class="item-label" style="width: 80px;">是否电车: </span>  
45 - <select class="form-control form-filter " name="sfdc" id="sfdc">  
46 - <option value="">请选择...</option>  
47 - <option value="0">否</option>  
48 - <option value="1">是</option>  
49 - </select>  
50 - </div>  
51 <div style="margin-top: 10px"></div> 43 <div style="margin-top: 10px"></div>
52 <div style="display: inline-block;margin-left: 3px;"> 44 <div style="display: inline-block;margin-left: 3px;">
53 <span class="item-label" style="width: 140px;">开始时间: </span> 45 <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -108,7 +100,6 @@ @@ -108,7 +100,6 @@
108 if (!$('body').hasClass('page-sidebar-closed')) 100 if (!$('body').hasClass('page-sidebar-closed'))
109 $('.menu-toggler.sidebar-toggler').click(); 101 $('.menu-toggler.sidebar-toggler').click();
110 102
111 -  
112 var d = new Date(); 103 var d = new Date();
113 d.setTime(d.getTime() - 4*1000*60*60*24); 104 d.setTime(d.getTime() - 4*1000*60*60*24);
114 var year = d.getFullYear(); 105 var year = d.getFullYear();
@@ -118,20 +109,13 @@ @@ -118,20 +109,13 @@
118 month = "0" + month; 109 month = "0" + month;
119 if(day < 10) 110 if(day < 10)
120 day = "0" + day; 111 day = "0" + day;
121 - var dateTime = year + "-" + month + "-" + day;  
122 - $("#startDate").datetimepicker({  
123 - format : 'YYYY-MM-DD',  
124 - locale : 'zh-cn',  
125 - maxDate : dateTime  
126 - });  
127 - $("#endDate").datetimepicker({ 112 +
  113 + $("#startDate,#endDate").datetimepicker({
128 format : 'YYYY-MM-DD', 114 format : 'YYYY-MM-DD',
129 locale : 'zh-cn', 115 locale : 'zh-cn',
130 - maxDate : dateTime 116 + maxDate : year + "-" + month + "-" + day
131 }); 117 });
132 - $("#startDate").val(dateTime);  
133 - $("#endDate").val(dateTime);  
134 - 118 + $("#startDate,#endDate").val(year + "-" + month + "-" + day);
135 119
136 var fage=false; 120 var fage=false;
137 var xlList; 121 var xlList;
@@ -211,8 +195,6 @@ @@ -211,8 +195,6 @@
211 } 195 }
212 }); 196 });
213 197
214 - $("#sfdcDiv").hide();  
215 -  
216 var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = ""; 198 var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
217 $("#tjtype").on("change",function(){ 199 $("#tjtype").on("change",function(){
218 if(cont == "驾驶员"){ 200 if(cont == "驾驶员"){
@@ -225,13 +207,10 @@ @@ -225,13 +207,10 @@
225 cont = $("#tjtype").val(); 207 cont = $("#tjtype").val();
226 if($("#tjtype").val() == "驾驶员"){ 208 if($("#tjtype").val() == "驾驶员"){
227 $("#cont").val(cont1); 209 $("#cont").val(cont1);
228 - $("#sfdcDiv").hide();  
229 } else if($("#tjtype").val() == "售票员"){ 210 } else if($("#tjtype").val() == "售票员"){
230 $("#cont").val(cont2); 211 $("#cont").val(cont2);
231 - $("#sfdcDiv").hide();  
232 } else if($("#tjtype").val() == "车辆自编号"){ 212 } else if($("#tjtype").val() == "车辆自编号"){
233 $("#cont").val(cont3); 213 $("#cont").val(cont3);
234 - $("#sfdcDiv").show();  
235 } 214 }
236 }); 215 });
237 216
@@ -252,10 +231,9 @@ @@ -252,10 +231,9 @@
252 var fgsdmSing = $("#fgsdmSing").val(); 231 var fgsdmSing = $("#fgsdmSing").val();
253 var tjtype=$("#tjtype").val(); 232 var tjtype=$("#tjtype").val();
254 var cont=$("#cont").val(); 233 var cont=$("#cont").val();
255 - var sfdc=$("#sfdc").val();  
256 var params = {}; 234 var params = {};
257 var i = layer.load(2); 235 var i = layer.load(2);
258 - $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){ 236 + $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){
259 layer.close(i); 237 layer.close(i);
260 var singledata = template('singledata',{list:result}); 238 var singledata = template('singledata',{list:result});
261 // 把渲染好的模版html文本追加到表格中 239 // 把渲染好的模版html文本追加到表格中
@@ -271,12 +249,11 @@ @@ -271,12 +249,11 @@
271 var fgsdmSing = $("#fgsdmSing").val(); 249 var fgsdmSing = $("#fgsdmSing").val();
272 var tjtype=$("#tjtype").val(); 250 var tjtype=$("#tjtype").val();
273 var cont=$("#cont").val(); 251 var cont=$("#cont").val();
274 - var sfdc=$("#sfdc").val();  
275 var lineName = $('#line option:selected').text(); 252 var lineName = $('#line option:selected').text();
276 if(lineName == "全部线路") 253 if(lineName == "全部线路")
277 lineName = $('#fgsdmSing option:selected').text(); 254 lineName = $('#fgsdmSing option:selected').text();
278 var i = layer.load(2); 255 var i = layer.load(2);
279 - $get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){ 256 + $get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
280 var dateTime = ""; 257 var dateTime = "";
281 if(startDate == endDate){ 258 if(startDate == endDate){
282 dateTime = moment(startDate).format("YYYYMMDD"); 259 dateTime = moment(startDate).format("YYYYMMDD");
src/main/resources/static/pages/forms/calc/statisticsDaily.html
1 -<style type="text/css"> 1 +<style type="text/css">
2 .table-bordered { 2 .table-bordered {
3 border: 1px solid; } 3 border: 1px solid; }
4 .table-bordered > thead > tr > th, 4 .table-bordered > thead > tr > th,
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 $('.menu-toggler.sidebar-toggler').click(); 150 $('.menu-toggler.sidebar-toggler').click();
151 151
152 var d = new Date(); 152 var d = new Date();
153 - d.setTime(d.getTime() - 1*1000*60*60*24); 153 + d.setTime(d.getTime() - 4*1000*60*60*24);
154 var year = d.getFullYear(); 154 var year = d.getFullYear();
155 var month = d.getMonth() + 1; 155 var month = d.getMonth() + 1;
156 var day = d.getDate(); 156 var day = d.getDate();
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrate.html
1 -<style type="text/css"> 1 +<style type="text/css">
2 .table-bordered { 2 .table-bordered {
3 border: 1px solid; } 3 border: 1px solid; }
4 .table-bordered > thead > tr > th, 4 .table-bordered > thead > tr > th,
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 123
124 124
125 var d = new Date(); 125 var d = new Date();
126 - d.setTime(d.getTime() - 1*1000*60*60*24); 126 + //d.setTime(d.getTime() - 1*1000*60*60*24);
127 var year = d.getFullYear(); 127 var year = d.getFullYear();
128 var month = d.getMonth() + 1; 128 var month = d.getMonth() + 1;
129 var day = d.getDate(); 129 var day = d.getDate();
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrateZgf.html
1 -<style type="text/css"> 1 +<style type="text/css">
2 .table-bordered { 2 .table-bordered {
3 border: 1px solid; } 3 border: 1px solid; }
4 .table-bordered > thead > tr > th, 4 .table-bordered > thead > tr > th,
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 113
114 114
115 var d = new Date(); 115 var d = new Date();
116 - d.setTime(d.getTime() - 1*1000*60*60*24); 116 + //d.setTime(d.getTime() - 1*1000*60*60*24);
117 var year = d.getFullYear(); 117 var year = d.getFullYear();
118 var month = d.getMonth() + 1; 118 var month = d.getMonth() + 1;
119 var day = d.getDate(); 119 var day = d.getDate();