潘钊 / bsth_control · Commits

Commit a3ba2934ff7524da15604cc43649ac860c97d08d

Authored by 廖磊
1 parent 55bc42ec

调度历史消息修改 

南汇油电数据设置只能操作近三天的
Inline Side-by-side
Showing 15 changed files with 598 additions and 350 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @a3ba293
@@ -229,6 +229,12 @@ public class YlbController extends BaseController<Ylb, Integer>{ @@ -229,6 +229,12 @@ public class YlbController extends BaseController<Ylb, Integer>{
229 return list; 229 return list;
230 } 230 }
231 231
  232 + @RequestMapping(value = "/checkDate",method = RequestMethod.GET)
  233 + public String checkDate(@RequestParam Map<String, Object> map){
  234 + String list=ylbService.checkDate(map);
  235 + return list;
  236 + }
  237 +
232 @RequestMapping(value = "/sumYlb",method = RequestMethod.GET) 238 @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
233 public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){ 239 public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
234 Map<String, Object> list=ylbService.sumYlb(map); 240 Map<String, Object> list=ylbService.sumYlb(map);
src/main/java/com/bsth/controller/report/ReportController.java
  View file @a3ba293
@@ -209,6 +209,12 @@ public class ReportController { @@ -209,6 +209,12 @@ public class ReportController {
209 return service.historyMessageCount(line, date, code); 209 return service.historyMessageCount(line, date, code);
210 } 210 }
211 211
  212 + @RequestMapping(value = "/historyMessageList", method = RequestMethod.GET)
  213 + public List<Object[]> historyMessageList(@RequestParam String line, @RequestParam String date,
  214 + @RequestParam String code,@RequestParam String type) {
  215 + return service.historyMessageList(line, date, code, type);
  216 + }
  217 +
212 @RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET) 218 @RequestMapping(value = "/tbodyTime1", method = RequestMethod.GET)
213 public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) { 219 public Map<String, Object> tbodyTime1(@RequestParam String line,@RequestParam String ttinfo) {
214 return service.tbodyTime1(line, ttinfo); 220 return service.tbodyTime1(line, ttinfo);
src/main/java/com/bsth/repository/CarDeviceRepository.java
  View file @a3ba293
1 package com.bsth.repository; 1 package com.bsth.repository;
2 2
3 import com.bsth.entity.CarDevice; 3 import com.bsth.entity.CarDevice;
  4 +
  5 +import java.util.Date;
  6 +import java.util.List;
  7 +
  8 +import org.springframework.data.jpa.repository.Query;
4 import org.springframework.stereotype.Repository; 9 import org.springframework.stereotype.Repository;
5 10
6 /** 11 /**
@@ -8,4 +13,6 @@ import org.springframework.stereotype.Repository; @@ -8,4 +13,6 @@ import org.springframework.stereotype.Repository;
8 */ 13 */
9 @Repository 14 @Repository
10 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> { 15 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
  16 + @Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq>=?2 ")
  17 + List<CarDevice> findCarDevice(String device,Date date );
11 } 18 }
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @a3ba293
@@ -58,6 +58,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI @@ -58,6 +58,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
58 + " lp_name,xl_name,cl_zbh",nativeQuery=true) 58 + " lp_name,xl_name,cl_zbh",nativeQuery=true)
59 List<Object[]> historyMessageCount(String line,String date,String code); 59 List<Object[]> historyMessageCount(String line,String date,String code);
60 60
  61 + @Query(value="SELECT r.xl_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content "
  62 + + " FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d "
  63 + + " ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
  64 + + " r.schedule_date_str = ?2 and r.cl_zbh =?3 ",nativeQuery=true)
  65 + List<Object[]> historyMessageList(String line,String date,String code);
  66 +
61 @Query(value = "select max(id) from ScheduleRealInfo") 67 @Query(value = "select max(id) from ScheduleRealInfo")
62 Long getMaxId(); 68 Long getMaxId();
63 69
src/main/java/com/bsth/service/oil/YlbService.java
  View file @a3ba293
@@ -19,6 +19,8 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{ @@ -19,6 +19,8 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
19 19
20 Map<String, Object> sumYlb(Map<String, Object> map); 20 Map<String, Object> sumYlb(Map<String, Object> map);
21 String checkJsy(Map<String, Object> map); 21 String checkJsy(Map<String, Object> map);
  22 + String checkDate(Map<String, Object> map);
  23 +
22 List<Map<String, Object>> oilListMonth(Map<String, Object> map); 24 List<Map<String, Object>> oilListMonth(Map<String, Object> map);
23 List<Ylb> listYlb(Map<String, Object> map); 25 List<Ylb> listYlb(Map<String, Object> map);
24 StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx); 26 StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @a3ba293
@@ -1442,6 +1442,35 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1442,6 +1442,35 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1442 } 1442 }
1443 return type; 1443 return type;
1444 } 1444 }
  1445 +
  1446 + @Override
  1447 + public String checkDate(Map<String, Object> map) {
  1448 + // TODO Auto-generated method stub
  1449 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  1450 + String rq=map.get("rq").toString();
  1451 + String gsbm=map.get("ssgsdm_like").toString();
  1452 + String type="1";
  1453 + if(gsbm.equals("26")){
  1454 + Date date=new Date();
  1455 + Calendar aCalendar = Calendar.getInstance();
  1456 + aCalendar.setTime(date);
  1457 + int day1 = aCalendar.get(Calendar.DAY_OF_YEAR);
  1458 + try {
  1459 + aCalendar.setTime(sdf.parse(rq));
  1460 + } catch (ParseException e) {
  1461 + // TODO Auto-generated catch block
  1462 + e.printStackTrace();
  1463 + }
  1464 + int day2 = aCalendar.get(Calendar.DAY_OF_YEAR);
  1465 + int days=day1-day2;
  1466 + if(days>3){
  1467 + type="2";
  1468 + }
  1469 + }
  1470 + return type;
  1471 + }
  1472 +
  1473 +
1445 1474
1446 @Override 1475 @Override
1447 public Map<String, Object> saveYlb(Ylb t) { 1476 public Map<String, Object> saveYlb(Ylb t) {
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a3ba293
@@ -21,6 +21,7 @@ import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger; @@ -21,6 +21,7 @@ import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
21 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto; 21 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
22 import com.bsth.data.schedule.late_adjust.LateAdjustHandle; 22 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
23 import com.bsth.data.utils.CustomStringUtils; 23 import com.bsth.data.utils.CustomStringUtils;
  24 +import com.bsth.entity.CarDevice;
24 import com.bsth.entity.Cars; 25 import com.bsth.entity.Cars;
25 import com.bsth.entity.Line; 26 import com.bsth.entity.Line;
26 import com.bsth.entity.Personnel; 27 import com.bsth.entity.Personnel;
@@ -39,6 +40,7 @@ import com.bsth.entity.schedule.GuideboardInfo; @@ -39,6 +40,7 @@ import com.bsth.entity.schedule.GuideboardInfo;
39 import com.bsth.entity.schedule.SchedulePlanInfo; 40 import com.bsth.entity.schedule.SchedulePlanInfo;
40 import com.bsth.entity.sys.DutyEmployee; 41 import com.bsth.entity.sys.DutyEmployee;
41 import com.bsth.entity.sys.SysUser; 42 import com.bsth.entity.sys.SysUser;
  43 +import com.bsth.repository.CarDeviceRepository;
42 import com.bsth.repository.LineRepository; 44 import com.bsth.repository.LineRepository;
43 import com.bsth.repository.oil.DlbRepository; 45 import com.bsth.repository.oil.DlbRepository;
44 import com.bsth.repository.oil.YlbRepository; 46 import com.bsth.repository.oil.YlbRepository;
@@ -153,6 +155,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -153,6 +155,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
153 155
154 @Autowired 156 @Autowired
155 DirectiveService directiveService; 157 DirectiveService directiveService;
  158 +
  159 + @Autowired
  160 + CarDeviceRepository carDeviceRepository;
156 161
157 Logger logger = LoggerFactory.getLogger(this.getClass()); 162 Logger logger = LoggerFactory.getLogger(this.getClass());
158 163
@@ -1097,6 +1102,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1097,6 +1102,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1097 @Override 1102 @Override
1098 public List<Object[]> historyMessage(String line, String date, String code, String type) { 1103 public List<Object[]> historyMessage(String line, String date, String code, String type) {
1099 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 1104 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  1105 +
1100 long d = 0; 1106 long d = 0;
1101 long t = 0; 1107 long t = 0;
1102 if (date.length() > 0) { 1108 if (date.length() > 0) {
@@ -1116,7 +1122,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1116,7 +1122,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1116 List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device); 1122 List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device);
1117 for (Object[] obj : list) { 1123 for (Object[] obj : list) {
1118 if (obj != null) { 1124 if (obj != null) {
1119 - obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString()); 1125 +
  1126 + if(BasicData.deviceId2NbbmMap.get(obj[0].toString())==null){
  1127 + List<CarDevice> carDeviceList=new ArrayList<CarDevice>();
  1128 + try {
  1129 + carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), sdf.parse(date + " 00:00:00"));
  1130 + } catch (ParseException e) {
  1131 + // TODO Auto-generated catch block
  1132 + e.printStackTrace();
  1133 + }
  1134 + if(carDeviceList.size()>0){
  1135 + obj[0] =carDeviceList.get(0).getClZbh();
  1136 + }else{
  1137 + obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
  1138 + }
  1139 + }else{
  1140 + obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
  1141 + }
1120 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString()))); 1142 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
1121 obj[4] = BasicData.lineCode2NameMap.get(line); 1143 obj[4] = BasicData.lineCode2NameMap.get(line);
1122 } 1144 }
src/main/java/com/bsth/service/report/ReportService.java
  View file @a3ba293
@@ -22,6 +22,8 @@ public interface ReportService { @@ -22,6 +22,8 @@ public interface ReportService {
22 List<Map<String, String>> sreachZd(String line,int zdlx); 22 List<Map<String, String>> sreachZd(String line,int zdlx);
23 23
24 List<Object[]> historyMessageCount(String line, String date, String code); 24 List<Object[]> historyMessageCount(String line, String date, String code);
  25 + List<Object[]> historyMessageList(String line, String date, String code,String type);
  26 +
25 27
26 Map<String, Object> tbodyTime1(String line ,String ttinfo); 28 Map<String, Object> tbodyTime1(String line ,String ttinfo);
27 29
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @a3ba293
1 package com.bsth.service.report.impl; 1 package com.bsth.service.report.impl;
2 import com.bsth.data.BasicData; 2 import com.bsth.data.BasicData;
  3 +import com.bsth.entity.CarDevice;
3 import com.bsth.entity.Line; 4 import com.bsth.entity.Line;
4 import com.bsth.entity.Personnel; 5 import com.bsth.entity.Personnel;
5 import com.bsth.entity.StationRoute; 6 import com.bsth.entity.StationRoute;
@@ -278,6 +279,48 @@ public class ReportServiceImpl implements ReportService{ @@ -278,6 +279,48 @@ public class ReportServiceImpl implements ReportService{
278 return list; 279 return list;
279 } 280 }
280 @Override 281 @Override
  282 + public List<Object[]> historyMessageList(String line, String date, String code,String type) {
  283 + // TODO Auto-generated method stub
  284 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  285 +
  286 + List<Object[]> list = scheduleRealInfoRepository.historyMessageList(line, date, code);
  287 + for (Object[] obj : list) {
  288 + if (obj != null) {
  289 + obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
  290 + }
  291 + }
  292 +
  293 + if (type != null && type.length() != 0 && type.equals("export_msg")) {
  294 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  295 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  296 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  297 + Map<String, Object> m = new HashMap<String, Object>();
  298 + ReportUtils ee = new ReportUtils();
  299 + List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
  300 + for (int i = 0; i < list.size(); i++) {
  301 + Map<String, Object> map = new HashMap<String, Object>();
  302 + Object[] obj = list.get(i);
  303 + map.put("num", i + 1);
  304 + map.put("line", obj[0]);
  305 + map.put("clZbh", obj[1]);
  306 + map.put("sender", obj[2]);
  307 + map.put("date", obj[3]);
  308 + map.put("text", obj[4]);
  309 + newList.add(map);
  310 + }
  311 + try {
  312 + listI.add(newList.iterator());
  313 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  314 + ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls",
  315 + path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  316 + } catch (Exception e) {
  317 + // TODO: handle exception
  318 + e.printStackTrace();
  319 + }
  320 + }
  321 + return list;
  322 + }
  323 + @Override
281 public Map<String, Object> tbodyTime1(String line, String ttinfo) { 324 public Map<String, Object> tbodyTime1(String line, String ttinfo) {
282 DecimalFormat df = new DecimalFormat("#0.00"); 325 DecimalFormat df = new DecimalFormat("#0.00");
283 // TODO Auto-generated method stub 326 // TODO Auto-generated method stub
src/main/resources/static/pages/electricity/list/add.html
  View file @a3ba293
@@ -387,22 +387,35 @@ @@ -387,22 +387,35 @@
387 var date=$("#date").val(); 387 var date=$("#date").val();
388 var jsy=$("#jsy").val(); 388 var jsy=$("#jsy").val();
389 var xlbm=$("#xlbm").val(); 389 var xlbm=$("#xlbm").val();
  390 + var gsdm=$("#ssgsdm").val();
390 var map={}; 391 var map={};
391 map["nbbm"]=nbbm; 392 map["nbbm"]=nbbm;
392 map["date"]=date; 393 map["date"]=date;
393 map["jsy"]=jsy; 394 map["jsy"]=jsy;
394 map["xlbm"]=xlbm; 395 map["xlbm"]=xlbm;
  396 + map["rq"]=date;
  397 + map["ssgsdm_like"]=gsdm;
395 //检查一下用户是否存在 398 //检查一下用户是否存在
396 - $get('/dlb/checkJsy', map, function(fage){  
397 - if(fage=="0"){  
398 - layer.msg('该驾驶员当天已存在.'); 399 + var i = layer.load(2);
  400 + $get('/ylb/checkDate', map, function(fage){
  401 + if(fage=="2"){
  402 + layer.msg('只能操作三天内数据.');
  403 + layer.close(i);
399 }else{ 404 }else{
400 - $post('/dlb/saveDlb', params, function(){  
401 - layer.msg('添加信息成功.');  
402 - loadPage('list.html'); 405 + $get('/dlb/checkJsy', map, function(fage){
  406 + if(fage=="0"){
  407 + layer.msg('该驾驶员当天已存在.');
  408 + layer.close(i);
  409 + }else{
  410 + $post('/dlb/saveDlb', params, function(){
  411 + layer.close(i);
  412 + layer.msg('添加信息成功.');
  413 + loadPage('list.html');
  414 + });
  415 + }
403 }); 416 });
404 } 417 }
405 - }); 418 + })
406 } 419 }
407 }); 420 });
408 }); 421 });
src/main/resources/static/pages/electricity/list/list.html
  View file @a3ba293
@@ -271,12 +271,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -271,12 +271,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
271 271
272 $("#checkDl").on('click', function () { 272 $("#checkDl").on('click', function () {
273 if ($("#rq").val() != "") { 273 if ($("#rq").val() != "") {
274 - var params=getParamsList();  
275 - var i = layer.load(2);  
276 - $get('/dlb/checkDl', params, function () {  
277 - layer.close(i);  
278 - jsDoQuery(params, true);  
279 - }); 274 + var params=getParamsList();
  275 + $get('/ylb/checkDate',params,function(status){
  276 + if(status=='2'){
  277 + layer.msg('只能操作三天内数据.');
  278 + }else{
  279 + var i = layer.load(2);
  280 + $get('/dlb/checkDl', params, function () {
  281 + layer.close(i);
  282 + jsDoQuery(params, true);
  283 + });
  284 + }
  285 + })
280 } else { 286 } else {
281 layer.msg('请选择日期.'); 287 layer.msg('请选择日期.');
282 } 288 }
@@ -286,12 +292,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -286,12 +292,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
286 $("#outAndIn").on('click', function () { 292 $("#outAndIn").on('click', function () {
287 console.log("进场油量等于出场油量"); 293 console.log("进场油量等于出场油量");
288 if ($("#rq").val() != "") { 294 if ($("#rq").val() != "") {
289 - var params=getParamsList();  
290 - var i = layer.load(2);  
291 - $get('/ylb/outAndIn', params, function () {  
292 - layer.close(i);  
293 - jsDoQuery(params, true);  
294 - }); 295 + var params=getParamsList();
  296 + $get('/ylb/checkDate',params,function(status){
  297 + if(status=='2'){
  298 + layer.msg('只能操作三天内数据.');
  299 + }else{
  300 + var i = layer.load(2);
  301 + $get('/ylb/outAndIn', params, function () {
  302 + layer.close(i);
  303 + jsDoQuery(params, true);
  304 + });
  305 + }
  306 + })
295 } else { 307 } else {
296 layer.msg('请选择日期.'); 308 layer.msg('请选择日期.');
297 } 309 }
@@ -300,56 +312,63 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -300,56 +312,63 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
300 312
301 //保存 313 //保存
302 $("#saveButton").on('click',function(){ 314 $("#saveButton").on('click',function(){
303 - var ylArray = [];  
304 - $('input.icheck').each(function(){  
305 - var map = {};  
306 - var id=$(this).data('id');  
307 - var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();  
308 - var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();  
309 - if(cdl=="" || cdl ==null){  
310 - cdl=0;  
311 - }  
312 - var czcd=$('.in_carpark_czcd[data-id='+id+']', '#dl_oil_list').val();  
313 - if(czcd=="" || czcd==null){  
314 - czcd=0;  
315 - }  
316 - var jzcd=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();  
317 - if(jzcd=="" || jzcd==null){  
318 - jzcd=0;  
319 - }  
320 -  
321 - var sh = $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();  
322 - if(sh=="" || sh==null){  
323 - sh=0;  
324 - }  
325 -  
326 - var shyy = $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();  
327 - var hd = $('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val();  
328 - if(hd=="" || hd==null){  
329 - hd=0;  
330 - }  
331 - var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#dl_oil_list').val();  
332 -  
333 - map['id']=id;  
334 - map['cdl']=cdl;  
335 - map['czcd']=czcd;  
336 - map['jzcd']=jzcd;  
337 - map['sh']=sh;  
338 - map['shyy']=shyy;  
339 - map['yhlx']=yhlx;  
340 - map['nbbm']=nbbm;  
341 - map['hd']=hd;  
342 - map['rq']=$("#rq").val();  
343 - ylArray.push(map); 315 + var params_=getParamsList();
  316 + $get('/ylb/checkDate',params_,function(status){
  317 + if(status=='2'){
  318 + layer.msg('只能操作三天内数据.');
  319 + }else{
  320 + var ylArray = [];
  321 + $('input.icheck').each(function(){
  322 + var map = {};
  323 + var id=$(this).data('id');
  324 + var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#dl_oil_list').html();
  325 + var cdl =$('.in_carpark_cdl[data-id='+id+']', '#dl_oil_list').html();
  326 + if(cdl=="" || cdl ==null){
  327 + cdl=0;
  328 + }
  329 + var czcd=$('.in_carpark_czcd[data-id='+id+']', '#dl_oil_list').val();
  330 + if(czcd=="" || czcd==null){
  331 + czcd=0;
  332 + }
  333 + var jzcd=$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list').val();
  334 + if(jzcd=="" || jzcd==null){
  335 + jzcd=0;
  336 + }
  337 +
  338 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#dl_oil_list').val();
  339 + if(sh=="" || sh==null){
  340 + sh=0;
  341 + }
  342 +
  343 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#dl_oil_list').val();
  344 + var hd = $('.in_carpark_hd[data-id='+id+']', '#dl_oil_list').val();
  345 + if(hd=="" || hd==null){
  346 + hd=0;
  347 + }
  348 + var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#dl_oil_list').val();
  349 +
  350 + map['id']=id;
  351 + map['cdl']=cdl;
  352 + map['czcd']=czcd;
  353 + map['jzcd']=jzcd;
  354 + map['sh']=sh;
  355 + map['shyy']=shyy;
  356 + map['yhlx']=yhlx;
  357 + map['nbbm']=nbbm;
  358 + map['hd']=hd;
  359 + map['rq']=$("#rq").val();
  360 + ylArray.push(map);
  361 + })
  362 + var params = {};
  363 + params['dlbList']=JSON.stringify(ylArray);
  364 + var i = layer.load(2);
  365 + $post('/dlb/saveDlbList', params, function () {
  366 + layer.close(i);
  367 + var params1 =getParamsList();
  368 + jsDoQuery(params1, true);
  369 + });
  370 + }
344 }) 371 })
345 - var params = {};  
346 - params['dlbList']=JSON.stringify(ylArray);  
347 - var i = layer.load(2);  
348 - $post('/dlb/saveDlbList', params, function () {  
349 - layer.close(i);  
350 - var params1 =getParamsList();  
351 - jsDoQuery(params1, true);  
352 - });  
353 }) 372 })
354 //拆分 373 //拆分
355 $("#sortButton").on('click', function () { 374 $("#sortButton").on('click', function () {
@@ -405,13 +424,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -405,13 +424,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
405 //获取加存信息 424 //获取加存信息
406 $("#obtain").on('click', function () { 425 $("#obtain").on('click', function () {
407 if ($("#rq").val() != "") { 426 if ($("#rq").val() != "") {
408 - var params =getParamsList();  
409 -  
410 - var i = layer.load(2);  
411 - $get('/dlb/obtain', params, function () {  
412 - layer.close(i);  
413 - jsDoQuery(params, true);  
414 - }); 427 + var params=getParamsList();
  428 + $get('/ylb/checkDate',params,function(status){
  429 + if(status=='2'){
  430 + layer.msg('只能操作三天内数据.');
  431 + }else{
  432 + var i = layer.load(2);
  433 + $get('/dlb/obtain', params, function () {
  434 + layer.close(i);
  435 + jsDoQuery(params, true);
  436 + });
  437 + }
  438 + })
415 } else { 439 } else {
416 layer.msg('请选择日期.'); 440 layer.msg('请选择日期.');
417 } 441 }
@@ -563,15 +587,20 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -563,15 +587,20 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
563 } 587 }
564 588
565 function jsyUpdate(){ 589 function jsyUpdate(){
566 - var id = $(this).data('id');  
567 - var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();  
568 - $get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){  
569 - layer.msg('修改成功.');  
570 - var params = getParamsList();  
571 - page = 0;  
572 - jsDoQuery(params, true);  
573 - });  
574 - 590 + var params=getParamsList();
  591 + $get('/ylb/checkDate',params,function(status){
  592 + if(status=='2'){
  593 + layer.msg('只能操作三天内数据.');
  594 + }else{
  595 + var id = $(this).data('id');
  596 + var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
  597 + $get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
  598 + layer.msg('修改成功.');
  599 + page = 0;
  600 + jsDoQuery(params, true);
  601 + });
  602 + }
  603 + })
575 } 604 }
576 //页面计算防止精度丢失 605 //页面计算防止精度丢失
577 var accAdd = function (a, b) { 606 var accAdd = function (a, b) {
@@ -702,31 +731,38 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -702,31 +731,38 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
702 731
703 //删除 732 //删除
704 $('#removeButton').on('click', function () { 733 $('#removeButton').on('click', function () {
705 - var idArray = [];  
706 - var x=0;  
707 - $('input.icheck:checked').each(function(){  
708 - x++;  
709 - var map ={};  
710 - var id=$(this).data('id');  
711 - map['id']=id;  
712 - idArray.push(map);  
713 - 734 + var params_=getParamsList();
  735 + $get('/ylb/checkDate',params_,function(status){
  736 + if(status=='2'){
  737 + layer.msg('只能操作三天内数据.');
  738 + }else{
  739 + var idArray = [];
  740 + var x=0;
  741 + $('input.icheck:checked').each(function(){
  742 + x++;
  743 + var map ={};
  744 + var id=$(this).data('id');
  745 + map['id']=id;
  746 + idArray.push(map);
  747 +
  748 + })
  749 + var params = {};
  750 + params['ids']=JSON.stringify(idArray);
  751 + if (x==0) {
  752 + layer.msg("请选择要删除的数据");
  753 + }else{
  754 + if(confirm('确定要删除选中的数据？'))
  755 + {
  756 + var i = layer.load(2);
  757 + $post('/dlb/deleteIds', params, function (result) {
  758 + layer.close(i);
  759 + var params=getParamsList();
  760 + jsDoQuery(params, true);
  761 + });
  762 + }
  763 + }
  764 + }
714 }) 765 })
715 - var params = {};  
716 - params['ids']=JSON.stringify(idArray);  
717 - if (x==0) {  
718 - layer.msg("请选择要删除的数据");  
719 - }else{  
720 - if(confirm('确定要删除选中的数据？'))  
721 - {  
722 - var i = layer.load(2);  
723 - $post('/dlb/deleteIds', params, function (result) {  
724 - layer.close(i);  
725 - var params=getParamsList();  
726 - jsDoQuery(params, true);  
727 - });  
728 - }  
729 - }  
730 }); 766 });
731 767
732 768
src/main/resources/static/pages/mforms/singledatas/jquery.table2excel.min.js 0 → 100644
  View file @a3ba293
  1 +/*
  2 + * jQuery table2excel - v1.1.1
  3 + * jQuery plugin to export an .xls file in browser from an HTML table
  4 + * https://github.com/rainabba/jquery-table2excel
  5 + *
  6 + * Made by rainabba
  7 + * Under MIT License
  8 + */
  9 +!function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>",console.log(e)}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document);
0 \ No newline at end of file 10 \ No newline at end of file
src/main/resources/static/pages/oil/add.html
  View file @a3ba293
@@ -392,24 +392,38 @@ @@ -392,24 +392,38 @@
392 var date=$("#date").val(); 392 var date=$("#date").val();
393 var jsy=$("#jsy").val(); 393 var jsy=$("#jsy").val();
394 var xlbm=$("#xlbm").val(); 394 var xlbm=$("#xlbm").val();
  395 + var gsdm=$("#ssgsdm").val();
395 var map={}; 396 var map={};
396 map["nbbm"]=nbbm; 397 map["nbbm"]=nbbm;
397 map["date"]=date; 398 map["date"]=date;
398 map["jsy"]=jsy; 399 map["jsy"]=jsy;
399 map["xlbm"]=xlbm; 400 map["xlbm"]=xlbm;
  401 + map["date"]=date;
  402 + map["rq"]=date;
  403 + map["ssgsdm_like"]=gsdm;
400 //检查一下用户是否存在 404 //检查一下用户是否存在
401 - $get('/ylb/checkJsy', map, function(fage){  
402 - if(fage=="0"){  
403 - layer.msg('该驾驶员当天已存在.'); 405 + var i = layer.load(2);
  406 + $get('/ylb/checkDate', map, function(fage){
  407 + if(fage=="2"){
  408 + layer.msg('只能操作三天内数据.');
  409 + layer.close(i);
404 }else{ 410 }else{
405 - $post('/ylb/saveYlb', params, function(){  
406 - layer.msg('添加信息成功.');  
407 - loadPage('list_ph.html'); 411 + $get('/ylb/checkJsy', map, function(fage){
  412 + if(fage=="0"){
  413 + layer.msg('该驾驶员当天已存在.');
  414 + layer.close(i);
  415 + }else{
  416 + $post('/ylb/saveYlb', params, function(){
  417 + layer.msg('添加信息成功.');
  418 + layer.close(i);
  419 + loadPage('list_ph.html');
  420 + });
  421 + }
408 }); 422 });
409 } 423 }
410 - }); 424 + })
411 } 425 }
412 - });  
413 }); 426 });
  427 + });
414 })(); 428 })();
415 </script> 429 </script>
416 \ No newline at end of file 430 \ No newline at end of file
src/main/resources/static/pages/oil/list_ph.html
  View file @a3ba293
@@ -336,16 +336,24 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -336,16 +336,24 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
336 var fage=false; 336 var fage=false;
337 //var id = 15; 337 //var id = 15;
338 //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list') 338 //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
339 - 339 +
  340 +
340 $("#checkYl").on('click', function () { 341 $("#checkYl").on('click', function () {
341 //console.log("核对加注量"); 342 //console.log("核对加注量");
342 if ($("#rq").val() != "") { 343 if ($("#rq").val() != "") {
343 - var params=getParamsList();  
344 - var i = layer.load(2);  
345 - $get('/ylb/checkYl', params, function () {  
346 - layer.close(i);  
347 - jsDoQuery(params, true);  
348 - }); 344 + var params=getParamsList();
  345 + $get('/ylb/checkDate',params,function(status){
  346 + if(status=='2'){
  347 + layer.msg('只能操作三天内数据.');
  348 + }else{
  349 + var i = layer.load(2);
  350 + $get('/ylb/checkYl', params, function () {
  351 + layer.close(i);
  352 + jsDoQuery(params, true);
  353 + });
  354 + }
  355 + })
  356 +
349 } else { 357 } else {
350 layer.msg('请选择日期.'); 358 layer.msg('请选择日期.');
351 } 359 }
@@ -355,12 +363,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -355,12 +363,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
355 $("#outAndIn").on('click', function () { 363 $("#outAndIn").on('click', function () {
356 // console.log("进场油量等于出场油量"); 364 // console.log("进场油量等于出场油量");
357 if ($("#rq").val() != "") { 365 if ($("#rq").val() != "") {
358 - var params=getParamsList();  
359 - var i = layer.load(2);  
360 - $get('/ylb/outAndIn', params, function () {  
361 - layer.close(i);  
362 - jsDoQuery(params, true);  
363 - }); 366 + var params=getParamsList();
  367 + $get('/ylb/checkDate',params,function(status){
  368 + if(status=='2'){
  369 + layer.msg('只能操作三天内数据.');
  370 + }else{
  371 + var i = layer.load(2);
  372 + $get('/ylb/outAndIn', params, function () {
  373 + layer.close(i);
  374 + jsDoQuery(params, true);
  375 + });
  376 + }
  377 + })
364 } else { 378 } else {
365 layer.msg('请选择日期.'); 379 layer.msg('请选择日期.');
366 } 380 }
@@ -368,164 +382,180 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -368,164 +382,180 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
368 382
369 //保存 383 //保存
370 $(".saveButton").on('click',function(){ 384 $(".saveButton").on('click',function(){
371 - var ylArray = [];  
372 - $('input.icheck').each(function(){  
373 - var map = {};  
374 - var id=$(this).data('id');  
375 - var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();  
376 - var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();  
377 - if(jzl=="" || jzl ==null){  
378 - jzl=0;  
379 - }  
380 - var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();  
381 - if(czyl=="" || czyl==null){  
382 - czyl=0;  
383 - }  
384 - var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();  
385 - if(jzyl=="" || jzyl==null){  
386 - jzyl=0;  
387 - }  
388 -  
389 - var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();  
390 - if(sh=="" || sh==null){  
391 - sh=0;  
392 - }  
393 -  
394 - var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();  
395 - var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();  
396 - if(ns=="" || ns==null){  
397 - ns=0; 385 +
  386 + var params_=getParamsList();
  387 + $get('/ylb/checkDate',params_,function(status){
  388 + if(status=='2'){
  389 + layer.msg('只能操作三天内数据.');
  390 + }else{
  391 + var ylArray = [];
  392 + $('input.icheck').each(function(){
  393 + var map = {};
  394 + var id=$(this).data('id');
  395 + var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
  396 + var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
  397 + if(jzl=="" || jzl ==null){
  398 + jzl=0;
  399 + }
  400 + var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
  401 + if(czyl=="" || czyl==null){
  402 + czyl=0;
  403 + }
  404 + var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
  405 + if(jzyl=="" || jzyl==null){
  406 + jzyl=0;
  407 + }
  408 +
  409 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
  410 + if(sh=="" || sh==null){
  411 + sh=0;
  412 + }
  413 +
  414 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
  415 + var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
  416 + if(ns=="" || ns==null){
  417 + ns=0;
  418 + }
  419 +
  420 + var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
  421 + var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
  422 +
  423 + map['id']=id;
  424 + map['jzl']=jzl;
  425 + map['czyl']=czyl;
  426 + map['jzyl']=jzyl;
  427 + map['sh']=sh;
  428 + map['shyy']=shyy;
  429 + map['ns']=ns;
  430 + map['rylx']=rylx;
  431 + map['yhlx']=yhlx;
  432 + map['nbbm']=nbbm;
  433 + map['rq']=$("#rq").val();
  434 + ylArray.push(map);
  435 + })
  436 + var params = {};
  437 + params['ylbList']=JSON.stringify(ylArray);
  438 + var i = layer.load(2);
  439 + $post('/ylb/saveYlbList', params, function () {
  440 + layer.close(i);
  441 + var params1 =getParamsList();
  442 + jsDoQuery(params1, true);
  443 + });
398 } 444 }
399 -  
400 - var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();  
401 - var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();  
402 -  
403 - map['id']=id;  
404 - map['jzl']=jzl;  
405 - map['czyl']=czyl;  
406 - map['jzyl']=jzyl;  
407 - map['sh']=sh;  
408 - map['shyy']=shyy;  
409 - map['ns']=ns;  
410 - map['rylx']=rylx;  
411 - map['yhlx']=yhlx;  
412 - map['nbbm']=nbbm;  
413 - map['rq']=$("#rq").val();  
414 - ylArray.push(map);  
415 }) 445 })
416 - var params = {};  
417 - params['ylbList']=JSON.stringify(ylArray);  
418 - var i = layer.load(2);  
419 - $post('/ylb/saveYlbList', params, function () {  
420 - layer.close(i);  
421 - var params1 =getParamsList();  
422 - jsDoQuery(params1, true);  
423 - });  
424 }) 446 })
425 //拆分 447 //拆分
426 $(".sortButton").on('click', function () { 448 $(".sortButton").on('click', function () {
427 if ($("#rq").val() != "") { 449 if ($("#rq").val() != "") {
428 - //拆分前先保存全部  
429 - var ylArray = [];  
430 - $('input.icheck').each(function(){  
431 - var map = {};  
432 - var id=$(this).data('id');  
433 - var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();  
434 - var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();  
435 - if(jzl=="" || jzl ==null){  
436 - jzl=0;  
437 - }  
438 - var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();  
439 - if(czyl=="" || czyl==null){  
440 - czyl=0;  
441 - }  
442 - var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();  
443 - if(jzyl=="" || jzyl==null){  
444 - jzyl=0;  
445 - }  
446 -  
447 - var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();  
448 - if(sh=="" || sh==null){  
449 - sh=0;  
450 - }  
451 -  
452 - var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();  
453 - var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();  
454 - if(ns=="" || ns==null){  
455 - ns=0;  
456 - }  
457 -  
458 - var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();  
459 - var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();  
460 -  
461 - map['id']=id;  
462 - map['jzl']=jzl;  
463 - map['czyl']=czyl;  
464 - map['jzyl']=jzyl;  
465 - map['sh']=sh;  
466 - map['shyy']=shyy;  
467 - map['ns']=ns;  
468 - map['rylx']=rylx;  
469 - map['yhlx']=yhlx;  
470 - map['nbbm']=nbbm;  
471 - map['rq']=$("#rq").val();  
472 - ylArray.push(map);  
473 - })  
474 - var params = {};  
475 - params['ylbList']=JSON.stringify(ylArray);  
476 -  
477 -  
478 - //拆分操作  
479 - var ylArray2 = [];  
480 - var nbbm="";  
481 - var msg="";  
482 - $('input.icheck:checked').each(function(){  
483 - var map = {};  
484 - var id=$(this).data('id');  
485 - var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();  
486 - if(nbbm.indexOf(clzbh)>-1){  
487 - if(msg==""){  
488 - msg += clzbh;  
489 - }else{  
490 - msg += ","+clzbh;  
491 - }  
492 - }else{  
493 - nbbm +=clzbh;  
494 - var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();  
495 - var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();  
496 - var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();  
497 - var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();  
498 - var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();  
499 - map['id']=id;  
500 - map['jzyl']=jzyl;  
501 - map['sh']=sh;  
502 - map['shyy']=shyy;  
503 - map['ns']=ns;  
504 - map['rylx']=rylx;  
505 - ylArray2.push(map);  
506 - }  
507 -  
508 - }) ;  
509 - if(msg!=""){  
510 - layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');  
511 - }else{  
512 - var params2 = {};  
513 - params2['ylbList']=JSON.stringify(ylArray2);  
514 - var i = layer.load(2);  
515 - //保存操作  
516 - $post('/ylb/saveYlbList', params, function () {  
517 - //拆分操作  
518 - $post('/ylb/sort', params2, function () {  
519 - layer.close(i);  
520 - var params1 =getParamsList();  
521 - jsDoQuery(params1, true);  
522 - });  
523 - });  
524 - }  
525 - 450 + var params_=getParamsList();
  451 + $get('/ylb/checkDate',params_,function(status){
  452 + if(status=='2'){
  453 + layer.msg('只能操作三天内数据.');
  454 + }else{
  455 + //拆分前先保存全部
  456 + var ylArray = [];
  457 + $('input.icheck').each(function(){
  458 + var map = {};
  459 + var id=$(this).data('id');
  460 + var nbbm =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
  461 + var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
  462 + if(jzl=="" || jzl ==null){
  463 + jzl=0;
  464 + }
  465 + var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
  466 + if(czyl=="" || czyl==null){
  467 + czyl=0;
  468 + }
  469 + var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
  470 + if(jzyl=="" || jzyl==null){
  471 + jzyl=0;
  472 + }
  473 +
  474 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
  475 + if(sh=="" || sh==null){
  476 + sh=0;
  477 + }
  478 +
  479 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
  480 + var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
  481 + if(ns=="" || ns==null){
  482 + ns=0;
  483 + }
  484 +
  485 + var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
  486 + var yhlx = $('.in_carpark_yhlx[data-id='+id+']', '#ll_oil_list').val();
  487 +
  488 + map['id']=id;
  489 + map['jzl']=jzl;
  490 + map['czyl']=czyl;
  491 + map['jzyl']=jzyl;
  492 + map['sh']=sh;
  493 + map['shyy']=shyy;
  494 + map['ns']=ns;
  495 + map['rylx']=rylx;
  496 + map['yhlx']=yhlx;
  497 + map['nbbm']=nbbm;
  498 + map['rq']=$("#rq").val();
  499 + ylArray.push(map);
  500 + })
  501 + var params = {};
  502 + params['ylbList']=JSON.stringify(ylArray);
  503 +
  504 +
  505 + //拆分操作
  506 + var ylArray2 = [];
  507 + var nbbm="";
  508 + var msg="";
  509 + $('input.icheck:checked').each(function(){
  510 + var map = {};
  511 + var id=$(this).data('id');
  512 + var clzbh =$('.in_carpark_nbbm[data-id='+id+']', '#ll_oil_list').html();
  513 + if(nbbm.indexOf(clzbh)>-1){
  514 + if(msg==""){
  515 + msg += clzbh;
  516 + }else{
  517 + msg += ","+clzbh;
  518 + }
  519 + }else{
  520 + nbbm +=clzbh;
  521 + var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
  522 + var sh = $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
  523 + var shyy = $('.in_carpark_shyy[data-id='+id+']', '#ll_oil_list').val();
  524 + var ns = $('.in_carpark_ns[data-id='+id+']', '#ll_oil_list').val();
  525 + var rylx= $('.in_carpark_rylx[data-id='+id+']', '#ll_oil_list').val();
  526 + map['id']=id;
  527 + map['jzyl']=jzyl;
  528 + map['sh']=sh;
  529 + map['shyy']=shyy;
  530 + map['ns']=ns;
  531 + map['rylx']=rylx;
  532 + ylArray2.push(map);
  533 + }
  534 +
  535 + }) ;
  536 + if(msg!=""){
  537 + layer.msg('内部编码为:【'+msg +'】的车辆请选择一条数据进行拆分.');
  538 + }else{
  539 + var params2 = {};
  540 + params2['ylbList']=JSON.stringify(ylArray2);
  541 + var i = layer.load(2);
  542 + //保存操作
  543 + $post('/ylb/saveYlbList', params, function () {
  544 + //拆分操作
  545 + $post('/ylb/sort', params2, function () {
  546 + layer.close(i);
  547 + var params1 =getParamsList();
  548 + jsDoQuery(params1, true);
  549 + });
  550 + });
  551 + }
  552 + }
  553 + })
526 } else { 554 } else {
527 layer.msg('请选择日期.'); 555 layer.msg('请选择日期.');
528 } 556 }
  557 +
  558 +
529 }) 559 })
530 560
531 /* //拆分 561 /* //拆分
@@ -583,13 +613,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -583,13 +613,18 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
583 $("#obtain").on('click', function () { 613 $("#obtain").on('click', function () {
584 //console.log("获取加存"); 614 //console.log("获取加存");
585 if ($("#rq").val() != "") { 615 if ($("#rq").val() != "") {
586 - var params =getParamsList();  
587 -  
588 - var i = layer.load(2);  
589 - $get('/ylb/obtain', params, function () {  
590 - layer.close(i);  
591 - jsDoQuery(params, true);  
592 - }); 616 + var params=getParamsList();
  617 + $get('/ylb/checkDate',params,function(status){
  618 + if(status=='2'){
  619 + layer.msg('只能操作三天内数据.');
  620 + }else{
  621 + var i = layer.load(2);
  622 + $get('/ylb/obtain', params, function () {
  623 + layer.close(i);
  624 + jsDoQuery(params, true);
  625 + });
  626 + }
  627 + })
593 } else { 628 } else {
594 layer.msg('请选择日期.'); 629 layer.msg('请选择日期.');
595 } 630 }
@@ -625,33 +660,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -625,33 +660,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
625 jsDoQuery(params, true); 660 jsDoQuery(params, true);
626 } 661 }
627 }); 662 });
628 -  
629 - function getParamsList(){  
630 - var cells = $('tr.filter')[0].cells  
631 - , cells1 = $('tr.filter2')[0].cells,params = {}  
632 - , name;  
633 - $.each(cells, function (i, cell) {  
634 - var items = $('input,select', cell);  
635 - for (var j = 0, item; item = items[j++];) {  
636 - name = $(item).attr('name');  
637 - if (name) {  
638 - params[name] = $(item).val();  
639 - }  
640 - }  
641 - });  
642 - $.each(cells1, function (i, cell) {  
643 - var items = $('input,select', cell);  
644 - for (var j = 0, item; item = items[j++];) {  
645 - name = $(item).attr('name');  
646 - if (name) {  
647 - params[name] = $(item).val();  
648 - }  
649 - }  
650 - });  
651 -  
652 - return params;  
653 - }  
654 663
  664 +
655 var xlList; 665 var xlList;
656 var obj=[]; 666 var obj=[];
657 $.get('/report/lineList',function(result){ 667 $.get('/report/lineList',function(result){
@@ -751,14 +761,20 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -751,14 +761,20 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
751 761
752 762
753 function jsyUpdate(){ 763 function jsyUpdate(){
754 - var id = $(this).data('id');  
755 - var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();  
756 - $get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){  
757 - layer.msg('修改成功.');  
758 - var params = getParamsList();  
759 - page = 0;  
760 - jsDoQuery(params, true);  
761 - }); 764 + var params=getParamsList();
  765 + $get('/ylb/checkDate',params,function(status){
  766 + if(status=='2'){
  767 + layer.msg('只能操作三天内数据.');
  768 + }else{
  769 + var id = $(this).data('id');
  770 + var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
  771 + $get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
  772 + layer.msg('修改成功.');
  773 + page = 0;
  774 + jsDoQuery(params, true);
  775 + });
  776 + }
  777 + })
762 778
763 } 779 }
764 //页面计算防止精度丢失 780 //页面计算防止精度丢失
@@ -883,32 +899,38 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -883,32 +899,38 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
883 899
884 //删除 900 //删除
885 $('.removeButton').on('click', function () { 901 $('.removeButton').on('click', function () {
886 - var idArray = [];  
887 - var x=0;  
888 - $('input.icheck:checked').each(function(){  
889 - x++;  
890 - var map ={};  
891 - var id=$(this).data('id');  
892 - map['id']=id;  
893 - idArray.push(map);  
894 - 902 + var params_=getParamsList();
  903 + $get('/ylb/checkDate',params_,function(status){
  904 + if(status=='2'){
  905 + layer.msg('只能操作三天内数据.');
  906 + }else{
  907 + var idArray = [];
  908 + var x=0;
  909 + $('input.icheck:checked').each(function(){
  910 + x++;
  911 + var map ={};
  912 + var id=$(this).data('id');
  913 + map['id']=id;
  914 + idArray.push(map);
  915 +
  916 + })
  917 + var params = {};
  918 + params['ids']=JSON.stringify(idArray);
  919 + if (x==0) {
  920 + layer.msg("请选择要删除的数据");
  921 + }else{
  922 + if(confirm('确定要删除选中的数据？'))
  923 + {
  924 + var i = layer.load(2);
  925 + $post('/ylb/deleteIds', params, function (result) {
  926 + layer.close(i);
  927 + var params=getParamsList();
  928 + jsDoQuery(params, true);
  929 + });
  930 + }
  931 + }
  932 + }
895 }) 933 })
896 - var params = {};  
897 - params['ids']=JSON.stringify(idArray);  
898 - console.log(idArray);  
899 - if (x==0) {  
900 - layer.msg("请选择要删除的数据");  
901 - }else{  
902 - if(confirm('确定要删除选中的数据？'))  
903 - {  
904 - var i = layer.load(2);  
905 - $post('/ylb/deleteIds', params, function (result) {  
906 - layer.close(i);  
907 - var params=getParamsList();  
908 - jsDoQuery(params, true);  
909 - });  
910 - }  
911 - }  
912 }); 934 });
913 935
914 $("#ylbListFgsdmId").on("change",initXl); 936 $("#ylbListFgsdmId").on("change",initXl);
@@ -1011,6 +1033,37 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep @@ -1011,6 +1033,37 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
1011 } 1033 }
1012 }); 1034 });
1013 1035
  1036 + function checkDate(){
  1037 + var params=getParamsList();
  1038 +
  1039 + }
  1040 +
  1041 + function getParamsList(){
  1042 + var cells = $('tr.filter')[0].cells
  1043 + , cells1 = $('tr.filter2')[0].cells,params = {}
  1044 + , name;
  1045 + $.each(cells, function (i, cell) {
  1046 + var items = $('input,select', cell);
  1047 + for (var j = 0, item; item = items[j++];) {
  1048 + name = $(item).attr('name');
  1049 + if (name) {
  1050 + params[name] = $(item).val();
  1051 + }
  1052 + }
  1053 + });
  1054 + $.each(cells1, function (i, cell) {
  1055 + var items = $('input,select', cell);
  1056 + for (var j = 0, item; item = items[j++];) {
  1057 + name = $(item).attr('name');
  1058 + if (name) {
  1059 + params[name] = $(item).val();
  1060 + }
  1061 + }
  1062 + });
  1063 +
  1064 + return params;
  1065 + }
  1066 +
1014 //表格滚动条 1067 //表格滚动条
1015 var modal='#ylbtable'; 1068 var modal='#ylbtable';
1016 $('#datatable_ylb_body_div', modal).perfectScrollbar({suppressScrollX: true}); 1069 $('#datatable_ylb_body_div', modal).perfectScrollbar({suppressScrollX: true});
src/main/resources/static/pages/report/message/message.html
  View file @a3ba293
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 line = $("#line").val(); 217 line = $("#line").val();
218 date = $("#date").val(); 218 date = $("#date").val();
219 var obj = $(this); 219 var obj = $(this);
220 - $get('/realSchedule/historyMessage',{line:line,date:date,code:jName,type:"query"},function(result){ 220 + $get('/report/historyMessageList',{line:line,date:date,code:jName,type:"query"},function(result){
221 var list_history_msg = template('list_history_msg',{list:result}); 221 var list_history_msg = template('list_history_msg',{list:result});
222 // 把渲染好的模版html文本追加到表格中 222 // 把渲染好的模版html文本追加到表格中
223 $('#forms tbody').html(list_history_msg); 223 $('#forms tbody').html(list_history_msg);
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
237 }); 237 });
238 238
239 $("#export").on("click",function(){ 239 $("#export").on("click",function(){
240 - $get('/realSchedule/historyMessage',{line:line,date:date,code:jName,type:"export_msg"},function(result){ 240 + $get('/report/historyMessageList',{line:line,date:date,code:jName,type:"export_msg"},function(result){
241 window.open("/downloadFile/download?fileName=调度消息分析"+moment(date).format("YYYYMMDD")); 241 window.open("/downloadFile/download?fileName=调度消息分析"+moment(date).format("YYYYMMDD"));
242 }); 242 });
243 }); 243 });
@@ -274,12 +274,12 @@ @@ -274,12 +274,12 @@
274 {{each list as obj i}} 274 {{each list as obj i}}
275 <tr> 275 <tr>
276 <td>{{i+1}}</td> 276 <td>{{i+1}}</td>
277 - <td>{{obj[4]}}</td>  
278 - <!--<td>{{obj[6]}}</td>-->  
279 <td>{{obj[0]}}</td> 277 <td>{{obj[0]}}</td>
  278 + <!--<td>{{obj[6]}}</td>-->
280 <td>{{obj[1]}}</td> 279 <td>{{obj[1]}}</td>
281 - <td>{{obj[3]}}</td>  
282 <td>{{obj[2]}}</td> 280 <td>{{obj[2]}}</td>
  281 + <td>{{obj[3]}}</td>
  282 + <td>{{obj[4]}}</td>
283 </tr> 283 </tr>
284 {{/each}} 284 {{/each}}
285 {{if list.length == 0}} 285 {{if list.length == 0}}