潘钊 / bsth_control · Commits

Commit 7f78679136f48565fe955d1b2fd362b51b94649b

Authored by 廖磊
1 parent 4dd4a882

报表

Inline Side-by-side
Showing 7 changed files with 313 additions and 265 deletions
src/main/resources/application-dev.properties
  View file @7f78679
... ... @@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto= update
6 6 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
7 7 #DATABASE
8 8 spring.jpa.database= MYSQL
9   -spring.jpa.show-sql= false
  9 +spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11 11 spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 12 spring.datasource.username= root
... ...
src/main/resources/static/pages/oil/checkJyryList.html
  View file @7f78679
... ... @@ -166,7 +166,19 @@ $(function(){
166 166 params['jsy']=jsy;
167 167 params['id']=id;
168 168 $get('/ylxxb/check', params, function(){
169   - jsDoQuery(null,true);
  169 + var cells = $('tr.filter')[0].cells
  170 + ,params1 = {}
  171 + ,name;
  172 + $.each(cells, function(i, cell){
  173 + var items = $('input,select', cell);
  174 + for(var j = 0, item; item = items[j++];){
  175 + name = $(item).attr('name');
  176 + if(name){
  177 + params1[name] = $(item).val();
  178 + }
  179 + }
  180 + });
  181 + jsDoQuery(params1,true);
170 182 });
171 183 }
172 184 })
... ... @@ -186,21 +198,22 @@ $(function(){
186 198 // jsDoQuery(null, true);
187 199 });
188 200  
189   - var gsqx="";
190   - var fgsqx="";
  201 +// var gsqx="";
  202 +// var fgsqx="";
191 203  
192 204 $.get('/user/companyData', function(result){
193 205 obj = result;
194   - var options = '<option value="">请选择</option>';
  206 + var options = '';
  207 +// '<option value="">请选择</option>';
195 208 for(var i = 0; i < obj.length; i++){
196 209 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
197   - setFgsqx(obj[i].companyCode);
198   - gsqx +=obj[i].companyCode+",";
  210 +// setFgsqx(obj[i].companyCode);
  211 +// gsqx +=obj[i].companyCode+",";
199 212 }
200 213 $('#jyryListGsdmId').html(options);
201 214 updateCompany();
202 215 });
203   - function setFgsqx(gs){
  216 + /* function setFgsqx(gs){
204 217 var company =gs
205 218 var options = '';
206 219 for(var i = 0; i < obj.length; i++){
... ... @@ -211,11 +224,12 @@ $(function(){
211 224 }
212 225 }
213 226 }
214   - }
  227 + } */
215 228 $("#jyryListGsdmId").on("change",updateCompany);
216 229 function updateCompany(){
217 230 var company = $('#jyryListGsdmId').val();
218   - var options = '<option value="">请选择</option>';
  231 + var options = '';
  232 +// '<option value="">请选择</option>';
219 233 for(var i = 0; i < obj.length; i++){
220 234 if(obj[i].companyCode == company){
221 235 var children = obj[i].children;
... ... @@ -230,7 +244,13 @@ $(function(){
230 244  
231 245 //提交
232 246 $('tr.filter .filter-submit').on('click', function(){
233   - if($("#yyrq").val()!=""){
  247 + var jyryGsdm=$("#jyryListGsdmId").val();
  248 + var jyryFgsdm=$("#jyryListFgsdmId").val();
  249 + if($("#yyrq").val()==""||$("#yyrq").val()==null ){
  250 + layer.msg('请选择日期.');
  251 + }else if(jyryGsdm=="" || jyryGsdm==null ||jyryFgsdm==""||jyryFgsdm==null){
  252 + layer.msg('请选择公司和分公司.');
  253 + }else{
234 254 var cells = $('tr.filter')[0].cells
235 255 ,params = {}
236 256 ,name;
... ... @@ -245,8 +265,6 @@ $(function(){
245 265 });
246 266 page = 0;
247 267 jsDoQuery(params, true);
248   - }else{
249   - layer.msg('请选择日期.');
250 268 }
251 269 });
252 270  
... ... @@ -265,7 +283,7 @@ $(function(){
265 283 // var i = layer.load(2);
266 284  
267 285 var i = 2;
268   - var jyryGsdm=$("#jyryListGsdmId").val();
  286 + /* var jyryGsdm=$("#jyryListGsdmId").val();
269 287 var jyryFgsdm=$("#jyryListFgsdmId").val();
270 288 if(jyryGsdm=="" || jyryGsdm==null){
271 289 params['gsdm_in']=gsqx;
... ... @@ -283,7 +301,7 @@ $(function(){
283 301 }
284 302 params['fgsdm_in']=fgsqx1;
285 303 }
286   - }
  304 + } */
287 305  
288 306 $get('/ylxxb/pagequery' ,params, function(data){
289 307 $.each(data.dataList, function(i, obj) {
... ... @@ -355,54 +373,49 @@ $(function(){
355 373 });
356 374  
357 375  
358   -});
359   -//改变状态
360   -function changeEnabled(id,enabled){
361   - debugger
362   - $get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
363   - jsDoQuery(null, true);
364   - })
365   -}
366 376  
367   -//改变状态
368   -function startOptJsy(id){
369   - $('#jsy'+id).select2({
370   - placeholder: '搜索驾驶员...',
371   - ajax: {
372   - url: '/personnel/sreachPersonnel',
373   - dataType: 'json',
374   - delay: 150,
375   - data: function(params){
376   - return{jobCode: params.term};
  377 + //改变状态
  378 + function startOptJsy(id){
  379 + $('#jsy'+id).select2({
  380 + placeholder: '搜索驾驶员...',
  381 + ajax: {
  382 + url: '/personnel/sreachPersonnel',
  383 + dataType: 'json',
  384 + delay: 150,
  385 + data: function(params){
  386 + return{jobCode: params.term};
  387 + },
  388 + processResults: function (data) {
  389 + return {
  390 + results: data
  391 + };
  392 + },
  393 + cache: true
377 394 },
378   - processResults: function (data) {
379   - return {
380   - results: data
381   - };
382   - },
383   - cache: true
384   - },
385   - templateResult: function(repo){
386   - if (repo.loading) return repo.text;
387   - var h = '<span>'+repo.text+'</span>';
388   - return h;
389   - },
390   - escapeMarkup: function (markup) { return markup; },
391   - minimumInputLength: 1,
392   - templateSelection: function(repo){
393   - return repo.text;
394   - },
395   - language: {
396   - noResults: function(){
397   - return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
398   - },
399   - inputTooShort : function(e) {
400   - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
401   - },
402   - searching : function() {
403   - return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
404   - }
405   - }
406   - })
407   -}
  395 + templateResult: function(repo){
  396 + if (repo.loading) return repo.text;
  397 + var h = '<span>'+repo.text+'</span>';
  398 + return h;
  399 + },
  400 + escapeMarkup: function (markup) { return markup; },
  401 + minimumInputLength: 1,
  402 + templateSelection: function(repo){
  403 + return repo.text;
  404 + },
  405 + language: {
  406 + noResults: function(){
  407 + return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
  408 + },
  409 + inputTooShort : function(e) {
  410 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
  411 + },
  412 + searching : function() {
  413 + return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
  414 + }
  415 + }
  416 + })
  417 + }
  418 +
  419 +});
  420 +
408 421 </script>
409 422 \ No newline at end of file
... ...
src/main/resources/static/pages/oil/cylList.html
  View file @7f78679
... ... @@ -141,23 +141,24 @@ $(function(){
141 141 increaseArea: '20%'
142 142 }
143 143  
144   - var gsqx="";
145   - var fgsqx="";
  144 +// var gsqx="";
  145 +// var fgsqx="";
146 146  
147 147 $.get('/user/companyData', function(result){
148 148 obj = result;
149   - var options = '<option value="">请选择</option>';
  149 + var options = '';
  150 +// '<option value="">请选择</option>';
150 151 for(var i = 0; i < obj.length; i++){
151 152 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
152   - setFgsqx(obj[i].companyCode);
153   - gsqx +=obj[i].companyCode+",";
  153 +// setFgsqx(obj[i].companyCode);
  154 +// gsqx +=obj[i].companyCode+",";
154 155 }
155 156 $('#cylListGsdmId').html(options);
156 157 updateCompany();
157   - jsDoQuery(null,true);
  158 +// jsDoQuery(null,true);
158 159 });
159 160  
160   - function setFgsqx(gs){
  161 + /* function setFgsqx(gs){
161 162 var company =gs
162 163 var options = '';
163 164 for(var i = 0; i < obj.length; i++){
... ... @@ -168,12 +169,13 @@ $(function(){
168 169 }
169 170 }
170 171 }
171   - }
  172 + } */
172 173  
173 174 $("#cylListGsdmId").on("change",updateCompany);
174 175 function updateCompany(){
175 176 var company = $('#cylListGsdmId').val();
176   - var options = '<option value="">请选择</option>';
  177 + var options = '';
  178 +// '<option value="">请选择</option>';
177 179 for(var i = 0; i < obj.length; i++){
178 180 if(obj[i].companyCode == company){
179 181 var children = obj[i].children;
... ... @@ -188,25 +190,31 @@ $(function(){
188 190 //重置
189 191 $('tr.filter .filter-cancel').on('click', function(){
190 192 $('tr.filter input, select').val('').change();
191   - jsDoQuery(null, true);
  193 +// jsDoQuery(null, true);
192 194 });
193 195  
194 196 //提交
195 197 $('tr.filter .filter-submit').on('click', function(){
196   - var cells = $('tr.filter')[0].cells
197   - ,params = {}
198   - ,name;
199   - $.each(cells, function(i, cell){
200   - var items = $('input,select', cell);
201   - for(var j = 0, item; item = items[j++];){
202   - name = $(item).attr('name');
203   - if(name){
204   - params[name] = $(item).val();
  198 + var cylGsdm=$("#cylListGsdmId").val();
  199 + var cylFgsdm=$("#cylListFgsdmId").val();
  200 + if(cylGsdm=="" ||cylGsdm ==null ||cylFgsdm=="" ||cylFgsdm ==null){
  201 + layer.msg("请选择公司和分公司");
  202 + }else{
  203 + var cells = $('tr.filter')[0].cells
  204 + ,params = {}
  205 + ,name;
  206 + $.each(cells, function(i, cell){
  207 + var items = $('input,select', cell);
  208 + for(var j = 0, item; item = items[j++];){
  209 + name = $(item).attr('name');
  210 + if(name){
  211 + params[name] = $(item).val();
  212 + }
205 213 }
206   - }
207   - });
208   - page = 0;
209   - jsDoQuery(params, true);
  214 + });
  215 + page = 0;
  216 + jsDoQuery(params, true);
  217 + }
210 218 });
211 219  
212 220  
... ... @@ -222,7 +230,7 @@ $(function(){
222 230 params['order'] = 'nbbm';
223 231 params['page'] = page;
224 232 var i = 2;
225   - var cylGsdm=$("#cylListGsdmId").val();
  233 + /* var cylGsdm=$("#cylListGsdmId").val();
226 234 var cylFgsdm=$("#cylListFgsdmId").val();
227 235 if(cylGsdm==''|| cylGsdm==null){
228 236 params['gsdm_in']=gsqx;
... ... @@ -240,8 +248,7 @@ $(function(){
240 248 }
241 249 params['fgsdm_in']=fgsqx1;
242 250 }
243   - }
244   - console.log(params);
  251 + } */
245 252 $get('/cyl' ,params, function(data){
246 253 $.each(data.content, function(i, obj) {
247 254 obj.updatetime = moment(obj.updatetime).format("YYYY-MM-DD");
... ...
src/main/resources/static/pages/oil/jyglList.html
  View file @7f78679
... ... @@ -202,39 +202,25 @@ $(function(){
202 202 //重置
203 203 $('tr.filter .filter-cancel').on('click', function(){
204 204 $('tr.filter input, select').val('').change();
205   - if($("#rq").val()!=""){
206   - var cells = $('tr.filter')[0].cells
207   - ,params = {}
208   - ,name;
209   - $.each(cells, function(i, cell){
210   - var items = $('input,select', cell);
211   - for(var j = 0, item; item = items[j++];){
212   - name = $(item).attr('name');
213   - if(name){
214   - params[name] = $(item).val();
215   - }
216   - }
217   - });
218   - jsDoQuery(params, true);
219   - }
220 205 });
221 206  
222 207  
223   - var gsqx="";
224   - var fgsqx="";
  208 +// var gsqx="";
  209 +// var fgsqx="";
225 210  
226 211 $.get('/user/companyData', function(result){
227 212 obj = result;
228   - var options = '<option value="">请选择</option>';
  213 + var options = '';
  214 +// '<option value="">请选择</option>';
229 215 for(var i = 0; i < obj.length; i++){
230 216 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
231   - setFgsqx(obj[i].companyCode);
232   - gsqx +=obj[i].companyCode+",";
  217 +// setFgsqx(obj[i].companyCode);
  218 +// gsqx +=obj[i].companyCode+",";
233 219 }
234 220 $('#jyglListGsdmId').html(options);
235 221 updateCompany();
236 222 });
237   - function setFgsqx(gs){
  223 + /* function setFgsqx(gs){
238 224 var company =gs
239 225 var options = '';
240 226 for(var i = 0; i < obj.length; i++){
... ... @@ -245,11 +231,12 @@ $(function(){
245 231 }
246 232 }
247 233 }
248   - }
  234 + } */
249 235 $("#jyglListGsdmId").on("change",updateCompany);
250 236 function updateCompany(){
251 237 var company = $('#jyglListGsdmId').val();
252   - var options = '<option value="">请选择</option>';
  238 + var options = '';
  239 +// '<option value="">请选择</option>';
253 240 for(var i = 0; i < obj.length; i++){
254 241 if(obj[i].companyCode == company){
255 242 var children = obj[i].children;
... ... @@ -262,7 +249,13 @@ $(function(){
262 249 }
263 250 //提交
264 251 $('tr.filter .filter-submit').on('click', function(){
265   - if($("#rq").val()!=""){
  252 + var jyglGsdm=$("#jyglListGsdmId").val();
  253 + var jyglFgsdm=$("#jyglListFgsdmId").val();
  254 + if($("#rq").val()==""||$("#rq").val()==null){
  255 + layer.msg('请选择日期.');
  256 + }else if(jyglGsdm=="" || jyglGsdm==null || jyglFgsdm=="" || jyglFgsdm==null){
  257 + layer.msg('请选择公司和分公司.');
  258 + }else{
266 259 var cells = $('tr.filter')[0].cells
267 260 ,params = {}
268 261 ,name;
... ... @@ -277,8 +270,6 @@ $(function(){
277 270 });
278 271 page = 0;
279 272 jsDoQuery(params, true);
280   - }else{
281   - layer.msg('请选择日期.');
282 273 }
283 274 });
284 275  
... ... @@ -296,7 +287,7 @@ $(function(){
296 287 params['rq']=$("#rq").val();
297 288  
298 289 var i = 2;
299   - var jyglGsdm=$("#jyglListGsdmId").val();
  290 + /* var jyglGsdm=$("#jyglListGsdmId").val();
300 291 var jyglFgsdm=$("#jyglListFgsdmId").val();
301 292 if(jyglGsdm=="" || jyglGsdm==null){
302 293 params['gsdm_in']=gsqx;
... ... @@ -314,7 +305,7 @@ $(function(){
314 305 }
315 306 params['fgsdm_in']=fgsqx1;
316 307 }
317   - }
  308 + } */
318 309 $get('/cwjy/pagequery' ,params, function(data){
319 310 $.each(data.dataList, function(i, obj) {
320 311 obj.yyrq = $("#rq").val();
... ...
src/main/resources/static/pages/oil/jyszList.html
  View file @7f78679
... ... @@ -127,22 +127,23 @@ $(function(){
127 127 checkboxClass: 'icheckbox_flat-blue',
128 128 increaseArea: '20%'
129 129 }
130   - var gsqx="";
131   - var fgsqx="";
  130 +// var gsqx="";
  131 +// var fgsqx="";
132 132 $.get('/user/companyData', function(result){
133 133 obj = result;
134   - var options = '<option value="">请选择</option>';
  134 + var options = '';
  135 +// '<option value="">请选择</option>';
135 136 for(var i = 0; i < obj.length; i++){
136 137 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
137   - setFgsqx(obj[i].companyCode);
138   - gsqx +=obj[i].companyCode+",";
  138 +// setFgsqx(obj[i].companyCode);
  139 +// gsqx +=obj[i].companyCode+",";
139 140 }
140 141 $('#jyszListGsdmId').html(options);
141 142 updateCompany();
142   - jsDoQuery(null,true);
  143 +// jsDoQuery(null,true);
143 144 });
144 145  
145   - function setFgsqx(gs){
  146 + /* function setFgsqx(gs){
146 147 var company =gs
147 148 for(var i = 0; i < obj.length; i++){
148 149 if(obj[i].companyCode == company){
... ... @@ -152,7 +153,7 @@ $(function(){
152 153 }
153 154 }
154 155 }
155   - }
  156 + } */
156 157 $("#jyszListGsdmId").on("change",updateCompany);
157 158 function updateCompany(){
158 159 var company = $('#jyszListGsdmId').val();
... ... @@ -160,7 +161,7 @@ $(function(){
160 161 for(var i = 0; i < obj.length; i++){
161 162 if(obj[i].companyCode == company){
162 163 var children = obj[i].children;
163   - options += '<option value="">请选择</option>';
  164 +// options += '<option value="">请选择</option>';
164 165 for(var j = 0; j < children.length; j++){
165 166 options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
166 167 }
... ... @@ -173,25 +174,31 @@ $(function(){
173 174 //重置
174 175 $('tr.filter .filter-cancel').on('click', function(){
175 176 $('tr.filter input, select').val('').change();
176   - jsDoQuery(null, true);
  177 + //jsDoQuery(null, true);
177 178 });
178 179  
179 180 //提交
180 181 $('tr.filter .filter-submit').on('click', function(){
181   - var cells = $('tr.filter')[0].cells
182   - ,params = {}
183   - ,name;
184   - $.each(cells, function(i, cell){
185   - var items = $('input,select', cell);
186   - for(var j = 0, item; item = items[j++];){
187   - name = $(item).attr('name');
188   - if(name){
189   - params[name] = $(item).val();
  182 + var jyszGsdm=$("#jyszListGsdmId").val();
  183 + var jyszFgsdm=$("#jyszListFgsdmId").val();
  184 + if(jyszGsdm=="" || jyszGsdm==null ||jyszFgsdm==""||jyszFgsdm==null){
  185 + layer.msg('请选择公司和分公司.');
  186 + }else{
  187 + var cells = $('tr.filter')[0].cells
  188 + ,params = {}
  189 + ,name;
  190 + $.each(cells, function(i, cell){
  191 + var items = $('input,select', cell);
  192 + for(var j = 0, item; item = items[j++];){
  193 + name = $(item).attr('name');
  194 + if(name){
  195 + params[name] = $(item).val();
  196 + }
190 197 }
191   - }
192   - });
193   - page = 0;
194   - jsDoQuery(params, true);
  198 + });
  199 + page = 0;
  200 + jsDoQuery(params, true);
  201 + }
195 202 });
196 203  
197 204 /*
... ... @@ -206,7 +213,7 @@ $(function(){
206 213 params['order'] = 'nbbm';
207 214 params['page'] = page;
208 215 var i = 2;
209   - var jyszGsdm=$("#jyszListGsdmId").val();
  216 + /* var jyszGsdm=$("#jyszListGsdmId").val();
210 217 var jyszFgsdm=$("#jyszListFgsdmId").val();
211 218 if(jyszGsdm==''|| jyszGsdm==null){
212 219 params['gsdm_in']=gsqx;
... ... @@ -224,7 +231,7 @@ $(function(){
224 231 }
225 232 params['fgsdm_in']=fgsqx1;
226 233 }
227   - }
  234 + } */
228 235 $get('/cwjy' ,params, function(data){
229 236 $.each(data.content, function(i, obj) {
230 237 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
... ...
src/main/resources/static/pages/oil/list.html
  View file @7f78679
... ... @@ -315,9 +315,6 @@
315 315 locale: 'zh-cn'
316 316 });
317 317  
318   - if ($("#rq").val() != "") {
319   - jsDoQuery(null, true);
320   - }
321 318 var page = 0, initPagination;
322 319 var icheckOptions = {
323 320 radioClass: 'iradio_square-blue icheck',
... ... @@ -331,7 +328,14 @@
331 328  
332 329 //提交
333 330 $('tr.filter .filter-submit').on('click', function () {
334   - if ($("#rq").val() != "") {
  331 + var ylbGsdm=$("#ylbListGsdmId").val();
  332 + var ylbFgsdm=$("#ylbListFgsdmId").val();
  333 + console.log();
  334 + if ($("#rq").val() == "" || $("#rq").val() ==null){
  335 + layer.msg('请选择日期.');
  336 + }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
  337 + layer.msg('请选择公司和分公司.');
  338 + }else {
335 339 var cells = $('tr.filter')[0].cells
336 340 , params = {}
337 341 , name;
... ... @@ -346,42 +350,41 @@
346 350 });
347 351 page = 0;
348 352 jsDoQuery(params, true);
349   - } else {
350   - layer.msg('请选择日期.');
351   - }
  353 + }
352 354 });
353 355  
354 356  
355   - var gsqx="";
356   - var fgsqx="";
  357 +// var gsqxdm="";
  358 +
357 359  
358 360 $.get('/user/companyData', function(result){
359 361 obj = result;
360   - var options = '<option value="">请选择</option>';
  362 + var options="";
  363 +// = '<option value="">请选择</option>';
361 364 for(var i = 0; i < obj.length; i++){
362 365 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
363   - setFgsqx(obj[i].companyCode);
364   - gsqx +=obj[i].companyCode+",";
  366 +// setFgsqx(obj[i].companyCode);
365 367 }
366 368 $('#ylbListGsdmId').html(options);
367 369 updateCompany();
368 370 });
369   - function setFgsqx(gs){
  371 + /* function setFgsqx(gs){
370 372 var company =gs
371 373 var options = '';
372 374 for(var i = 0; i < obj.length; i++){
373 375 if(obj[i].companyCode == company){
374 376 var children = obj[i].children;
375 377 for(var j = 0; j < children.length; j++){
376   - fgsqx +=children[j].code+",";
  378 + gsqxdm +=company+""+children[j].code+",";
377 379 }
378 380 }
379 381 }
380   - }
  382 + } */
381 383 $("#ylbListGsdmId").on("change",updateCompany);
382 384 function updateCompany(){
383 385 var company = $('#ylbListGsdmId').val();
384   - var options = '<option value="">请选择</option>';
  386 + var options ="";
  387 +// = '<option value="">请选择</option>';
385 388 for(var i = 0; i < obj.length; i++){
386 389 if(obj[i].companyCode == company){
387 390 var children = obj[i].children;
... ... @@ -403,6 +406,25 @@
403 406 params['order'] = 'nbbm';
404 407 params['page'] = page;
405 408 params['rq'] = $("#rq").val();
  409 +
  410 + /* var ylbGsdm=$("#ylbListGsdmId").val();
  411 + var ylbFgsdm=$("#ylbListFgsdmId").val();
  412 + if(ylbGsdm==''|| ylbGsdm==null){
  413 + params['concat(ssgsdm,fgsdm)_in']=gsqxdm;
  414 + }else{
  415 + if(ylbFgsdm==''||ylbFgsdm==null){
  416 + var fgsqx1='';
  417 + for(var i = 0; i < obj.length; i++){
  418 + if(obj[i].companyCode == ylbGsdm){
  419 + var children = obj[i].children;
  420 + for(var j = 0; j < children.length; j++){
  421 + fgsqx1 +=children[j].code+",";
  422 + }
  423 + }
  424 + }
  425 + params['fgsdm_in']=fgsqx1;
  426 + }
  427 + } */
406 428 var i = layer.load(2);
407 429 $get('/ylb', params, function (data) {
408 430 $.each(data.content, function (i, obj) {
... ...
src/main/resources/static/pages/report/inoutstation.html
  View file @7f78679
... ... @@ -36,7 +36,7 @@
36 36 </div>
37 37 <div style="display: inline-block;margin-left: 15px;">
38 38 <span class="item-label" style="width: 80px;">线路: </span>
39   - <select class="form-control" name="line" id="line" onchange="sreachZd()" style="width: 180px;"></select>
  39 + <select class="form-control sreach-zd" name="line" id="line" style="width: 180px;"></select>
40 40 </div>
41 41 </div>
42 42 <br/>
... ... @@ -58,7 +58,7 @@
58 58 <span class="item-label" style="width: 60px;">至: </span>
59 59 <input class="form-control" type="text" id="date2" style="width: 180px;"/>
60 60 <span class="item-label" style="width: 80px;">站点: </span>
61   - <select id="zdlx" onchange="sreachZd()">
  61 + <select id="zdlx" class="sreach-zd" >
62 62 <option value="">请选择</option>
63 63 <option value="0">上行</option>
64 64 <option value="1">下行</option>
... ... @@ -68,7 +68,7 @@
68 68 </div>
69 69 <div class="form-group" style="display: inline-block;margin-left: 15px;">
70 70 <input class="btn btn-default" type="button" id="query" value="查询"/>
71   - <input class="btn btn-default" type="button" style="display: none;" onclick="clzd()" id="query2" value="查询"/>
  71 + <input class="btn btn-default" type="button" style="display: none;" id="query2" value="查询"/>
72 72 <input class="btn btn-default" type="button" id="export" value="导出"/>
73 73 <input class="btn btn-default" type="button" id="print" value="打印"/>
74 74 <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
... ... @@ -176,7 +176,6 @@
176 176 for(var code in result){
177 177 data.push({id: code, text: result[code]});
178 178 }
179   - console.log(data);
180 179 initPinYinSelect2('#line',data,'');
181 180  
182 181 })
... ... @@ -195,7 +194,6 @@
195 194 }else{
196 195 $post('/report/queryListBczx',{clzbh:clzbh,date:date,line:line},function(result){
197 196 getTime(result);
198   - console.log(result);
199 197 var ludan_ll_2 = template('ludan_ll_2',{list:result});
200 198 // 把渲染好的模版html文本追加到表格中
201 199 $('#forms .ludan_ll_2').html(ludan_ll_2);
... ... @@ -279,111 +277,119 @@
279 277 return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
280 278 }
281 279 }
282   - })
283   -
284   - });
285   -
286   -
287   - function zdxx(fcsj,ddsj){
288   - var rq=$("#date").val();
289   - var line=$("#line").val();
290   - var nbbm=$("#nbbm").val();
  280 + });
291 281  
292   - $post('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
293   - var xlmc="线路: "+$("#select2-line-container").html();
294   - var clmc="车辆: "+nbbm;
295   - var rqmc="日期: "+rq;
296   - var bcmc="班次: "+fcsj+"-"+ddsj;
297   - $("#dlzmx").html("到离站详细 "+xlmc+" "+clmc+" "+rqmc+" "+bcmc);
298   - console.log(result);
299   - var ludan_ll_1 = template('ludan_ll_1',{list:result});
300   - // 把渲染好的模版html文本追加到表格中
301   - $('#forms1 .ludan_ll_1').html(ludan_ll_1);
  282 + $("#forms tbody").on("click","tr",function(){
  283 + var rq=$("#date").val();
  284 + var line=$("#line").val();
  285 + var nbbm=$("#nbbm").val();
  286 + var params = new Array();
  287 + if($(this).children().size() < 2){
  288 + return;
  289 + }
  290 +
  291 + $(this).children().each(function(index){
  292 + params[index] = $(this).text();
302 293 });
  294 + var id=params[0].split("\\")[0];
  295 + var fcsj = $('.in_carpark_fcsj[data-id='+id+']', '#forms').html();
  296 + var ddsj= $('.in_carpark_zdsj[data-id='+id+']', '#forms').html();
  297 +
  298 + $post('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
  299 + var xlmc="线路: "+$("#select2-line-container").html();
  300 + var clmc="车辆: "+nbbm;
  301 + var rqmc="日期: "+rq;
  302 + var bcmc="班次: "+fcsj+"-"+ddsj;
  303 + $("#dlzmx").html("到离站详细 "+xlmc+" "+clmc+" "+rqmc+" "+bcmc);
  304 + var ludan_ll_1 = template('ludan_ll_1',{list:result});
  305 + // 把渲染好的模版html文本追加到表格中
  306 + $('#forms1 .ludan_ll_1').html(ludan_ll_1);
  307 + });
  308 + })
303 309  
304   - }
305   -
306   - function clzd(){
307   - var date1=$("#date1").val();
308   - var date2=$("#date2").val();
309   - var line=$("#line").val();
310   - var zdlx=$("#zdlx").val();
311   - var zd=$("#zd").val();
312   - console.log(nbbm);
313   - if(date1=="" || date1==null){
314   - layer.msg("请选择时间");
315   - }else if( line=="" || line==null){
316   - layer.msg("请选择线路");
317   - }else if(date2 ==null || date2==""){
318   - layer.msg("请选择时间");
319   - }else if(zdlx=="" || zdlx==null){
320   - layer.msg("请选择方向");
321   - }else{
322   - var xlmc="线路: "+$("#select2-line-container").html();
323   - var rqmc="日期: "+date1+"-"+date2;
324   - var sxmc="上下行: "+ zdlx;
325   - var zdmc="";
326   - if(zd==null || zd==""){
327   - zdmc="站点: "
328   - }else{
329   - zdmc="站点: "+$("#select2-zd-container").html();
330   - }
331   - $("#dlzmx").html("到离站详细 "+xlmc+" "+rqmc+" "+sxmc+" "+zdmc);
332   - $post('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
333   - console.log(result);
334   - var ludan_ll_1 = template('ludan_ll_1',{list:result});
335   - // 把渲染好的模版html文本追加到表格中
336   - $('#forms1 .ludan_ll_1').html(ludan_ll_1);
337   - });
338   - }
339   - }
340   -
341   - function sreachZd(){
342   - var line = $("#line").val();
343   - var zdlx = $("#zdlx").val();
344   - if(line==null|| line =="" || zdlx ==null || zdlx==""){
345   -
346   - }else{
347   - $('#zd').select2({
348   - placeholder: '搜索站点...',
349   - ajax: {
350   - url: '/report/sreachZd',
351   - dataType: 'json',
352   - delay: 150,
353   - data: function(params){
354   - return{line: line,zdlx:zdlx,zd:params.term};
  310 + $("#query2").click(function(){
  311 + var date1=$("#date1").val();
  312 + var date2=$("#date2").val();
  313 + var line=$("#line").val();
  314 + var zdlx=$("#zdlx").val();
  315 + var zd=$("#zd").val();
  316 + if(date1=="" || date1==null){
  317 + layer.msg("请选择时间");
  318 + }else if( line=="" || line==null){
  319 + layer.msg("请选择线路");
  320 + }else if(date2 ==null || date2==""){
  321 + layer.msg("请选择时间");
  322 + }else if(zdlx=="" || zdlx==null){
  323 + layer.msg("请选择方向");
  324 + }else{
  325 + var xlmc="线路: "+$("#select2-line-container").html();
  326 + var rqmc="日期: "+date1+"-"+date2;
  327 + var sxmc="上下行: "+ zdlx;
  328 + var zdmc="";
  329 + if(zd==null || zd==""){
  330 + zdmc="站点: "
  331 + }else{
  332 + zdmc="站点: "+$("#select2-zd-container").html();
  333 + }
  334 + $("#dlzmx").html("到离站详细 "+xlmc+" "+rqmc+" "+sxmc+" "+zdmc);
  335 + $post('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
  336 + var ludan_ll_1 = template('ludan_ll_1',{list:result});
  337 + // 把渲染好的模版html文本追加到表格中
  338 + $('#forms1 .ludan_ll_1').html(ludan_ll_1);
  339 + });
  340 + }
  341 + })
  342 +
  343 + $(".sreach-zd").click(function(){
  344 + var line = $("#line").val();
  345 + var zdlx = $("#zdlx").val();
  346 + if(line==null|| line =="" || zdlx ==null || zdlx==""){
  347 +
  348 + }else{
  349 + $('#zd').select2({
  350 + placeholder: '搜索站点...',
  351 + ajax: {
  352 + url: '/report/sreachZd',
  353 + dataType: 'json',
  354 + delay: 150,
  355 + data: function(params){
  356 + return{line: line,zdlx:zdlx,zd:params.term};
  357 + },
  358 + processResults: function (data) {
  359 + return {
  360 + results: data
  361 + };
  362 + },
  363 + cache: true
355 364 },
356   - processResults: function (data) {
357   - return {
358   - results: data
359   - };
360   - },
361   - cache: true
362   - },
363   - templateResult: function(repo){
364   - if (repo.loading) return repo.text;
365   - var h = '<span>'+repo.text+'</span>';
366   - return h;
367   - },
368   - escapeMarkup: function (markup) { return markup; },
369   - minimumInputLength: 1,
370   - templateSelection: function(repo){
371   - return repo.text;
372   - },
373   - language: {
374   - noResults: function(){
375   - return '<span style="color:red;font-size: 12px;">没有搜索到站点！</span>';
376   - },
377   - inputTooShort : function(e) {
378   - return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入站点名称</span>';
379   - },
380   - searching : function() {
381   - return '<span style="color:gray;font-size: 12px;"> 正在搜索站点...</span>';
382   - }
383   - }
384   - });
385   - }
386   - }
  365 + templateResult: function(repo){
  366 + if (repo.loading) return repo.text;
  367 + var h = '<span>'+repo.text+'</span>';
  368 + return h;
  369 + },
  370 + escapeMarkup: function (markup) { return markup; },
  371 + minimumInputLength: 1,
  372 + templateSelection: function(repo){
  373 + return repo.text;
  374 + },
  375 + language: {
  376 + noResults: function(){
  377 + return '<span style="color:red;font-size: 12px;">没有搜索到站点！</span>';
  378 + },
  379 + inputTooShort : function(e) {
  380 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入站点名称</span>';
  381 + },
  382 + searching : function() {
  383 + return '<span style="color:gray;font-size: 12px;"> 正在搜索站点...</span>';
  384 + }
  385 + }
  386 + });
  387 + }
  388 + })
  389 +
  390 +
  391 + });
  392 +
387 393 </script>
388 394 <script type="text/html" id="ludan_ll_1">
389 395 {{each list as obj i}}
... ... @@ -426,7 +432,7 @@
426 432 {{else if obj.status==-1}}
427 433 (已烂班 )
428 434 {{else}}
429   - <a onclick='zdxx("{{obj.fcsjActual}}","{{obj.zdsjActual}}")'>
  435 + <a >
430 436 ({{obj.fcsjActual}}
431 437 {{if obj.fast>0}}
432 438 早点 {{obj.fast}}分钟
... ... @@ -436,6 +442,8 @@
436 442 整点
437 443 {{/if}}
438 444 )
  445 + <span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.fcsjActual}}</span>
  446 + <span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.zdsjActual}}</span>
439 447 </a>
440 448 {{/if}}
441 449  
... ...