潘钊 / bsth_control · Commits

Commit 41237e5c7dafdc17f6b1b6f89b7a37321b0a5df1

Authored by 徐烜
2 parents 92ae765a d88e6db8
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 10 changed files with 601 additions and 190 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @41237e5
... ... @@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.ChangePersonCar;
7 7 import com.bsth.controller.realcontrol.dto.DfsjChange;
8 8 import com.bsth.data.BasicData;
9 9 import com.bsth.data.schedule.DayOfSchedule;
  10 +import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
10 11 import com.bsth.entity.realcontrol.ScheduleRealInfo;
11 12 import com.bsth.entity.schedule.SchedulePlanInfo;
12 13 import com.bsth.service.realcontrol.ScheduleRealInfoService;
... ... @@ -317,9 +318,9 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
317 318 }
318 319  
319 320 @RequestMapping(value = "/correctForm")
320   - public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
321   - @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
322   - return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
  321 + public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
  322 + @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
  323 + return scheduleRealInfoService.correctForm(line, date, lpName, code, type);
323 324 }
324 325 /**
325 326 * @Title queryListWaybill
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @41237e5
... ... @@ -205,12 +205,15 @@ public class FormsServiceImpl implements FormsService {
205 205 if(map.containsKey("fgsdmManth")){
206 206 fgsdmManth=map.get("fgsdmManth").toString();
207 207 }
208   - String sql = "select"
209   - + " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
210   -// + "r.gs_bm,r.gs_name,"
211   -// + " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name "
212   - + " from bsth_c_s_sp_info_real r "
213   - + " where 1=1 ";
  208 + String sql ="select ";
  209 + if(empnames.equals("驾驶员")){
  210 + sql += " r.j_name,r.j_gh ";
  211 + }else if(empnames.equals("售票员")){
  212 + sql += " r.s_gh,r.s_name";
  213 + }else{
  214 + sql += " r.cl_zbh";
  215 + }
  216 + sql += " from bsth_c_s_sp_info_real r where 1=1 ";
214 217 if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
215 218 sql+=" and to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
216 219 }
... ... @@ -227,12 +230,16 @@ public class FormsServiceImpl implements FormsService {
227 230 // }
228 231 if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
229 232 sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
230   - }
231   - if(empnames.equals("售票员")){
232   - sql+="and r.s_name is not null AND r.s_name !=''";
233 233 }
  234 + if(empnames.equals("驾驶员")){
234 235 sql += " GROUP BY "
235   - + "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
  236 + + "r.j_name,r.j_gh";
  237 + }else if(empnames.equals("售票员")){
  238 + sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
  239 + }else{
  240 + sql += " GROUP BY r.cl_zbh";
  241 + }
  242 +
236 243 // + ",r.gs_bm,r.gs_name,"
237 244 // + "r.fgs_bm,r.fgs_name,r.bc_type ";
238 245  
... ... @@ -244,15 +251,16 @@ public class FormsServiceImpl implements FormsService {
244 251 public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
245 252 Shiftuehiclemanth shif = new Shiftuehiclemanth();
246 253 if(empnames.equals("驾驶员")){
247   - shif.setjName(arg0.getString("j_name"));
  254 + shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
  255 + shif.setJgh(arg0.getString("j_gh"));
248 256 }else if(empnames.equals("售票员")){
249   - shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
  257 + shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
250 258 shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
251 259 }else if(empnames.equals("车辆自编号")){
252 260 shif.setjName(arg0.getString("cl_zbh"));
253 261 }
254   - shif.setJgh(arg0.getString("j_gh"));
255   - shif.setZbh(arg0.getString("cl_zbh"));
  262 +// shif.setJgh(arg0.getString("j_gh"));
  263 +// shif.setZbh(arg0.getString("cl_zbh"));
256 264 // shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
257 265 return shif;
258 266 }
... ... @@ -274,11 +282,11 @@ public class FormsServiceImpl implements FormsService {
274 282 }
275 283 }else if(empnames.equals("售票员")){
276 284 String sgh=s.getsGh()==null?"":s.getsGh();
277   - if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
  285 + if(d.getSgh().equals(sgh)){
278 286 sList.add(s);
279 287 }
280 288 }else if(empnames.equals("车辆自编号")){
281   - if(d.getZbh().equals(s.getClZbh())){
  289 + if(d.getjName().equals(s.getClZbh())){
282 290 sList.add(s);
283 291 }
284 292 }
... ...
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @41237e5
... ... @@ -173,16 +173,22 @@ public class TrafficManageServiceImpl implements TrafficManageService{
173 173 upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
174 174 int startId = 1;
175 175 startId = packagStationXml(upStationsList, sBuffer, startId);
176   - // 再查下行
177   - downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
178   - packagStationXml(downStationsList, sBuffer, startId);
  176 + // 环线不查下行
  177 + if(line.getLinePlayType() != 1){
  178 + // 再查下行
  179 + downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
  180 + packagStationXml(downStationsList, sBuffer, startId);
  181 + }
179 182 sBuffer.append("</LineStationList>");
180 183  
181 184 // 循环添加站点点位信息
182 185 sBuffer.append("<LinePointList>");
183 186 startId = 1;
184 187 startId = packagStationPointXml(upStationsList, sBuffer, startId);
185   - packagStationPointXml(downStationsList, sBuffer, startId);
  188 + // 环线不查下行
  189 + if(line.getLinePlayType() != 1){
  190 + packagStationPointXml(downStationsList, sBuffer, startId);
  191 + }
186 192 sBuffer.append("</LinePointList>");
187 193 // }
188 194 sBuffer.append("</DataList>");
... ...
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @41237e5
... ... @@ -2,6 +2,7 @@ package com.bsth.service.realcontrol;
2 2  
3 3 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
4 4 import com.bsth.controller.realcontrol.dto.DfsjChange;
  5 +import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
5 6 import com.bsth.entity.realcontrol.ScheduleRealInfo;
6 7 import com.bsth.entity.schedule.SchedulePlanInfo;
7 8 import com.bsth.service.BaseService;
... ... @@ -104,7 +105,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
104 105 List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
105 106  
106 107  
107   - List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
  108 + List<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
108 109  
109 110 List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
110 111  
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @41237e5
... ... @@ -16,6 +16,7 @@ import com.bsth.data.schedule.ScheduleComparator;
16 16 import com.bsth.data.schedule.edit_logs.FormLogger;
17 17 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
18 18 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
  19 +import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
19 20 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
20 21 import com.bsth.entity.Cars;
21 22 import com.bsth.entity.Line;
... ... @@ -58,9 +59,11 @@ import org.apache.commons.lang3.StringEscapeUtils;
58 59 import org.apache.commons.lang3.StringUtils;
59 60 import org.joda.time.format.DateTimeFormat;
60 61 import org.joda.time.format.DateTimeFormatter;
  62 +import org.mvel2.optimizers.impl.refl.nodes.ArrayLength;
61 63 import org.slf4j.Logger;
62 64 import org.slf4j.LoggerFactory;
63 65 import org.springframework.beans.factory.annotation.Autowired;
  66 +import org.springframework.jdbc.core.BeanPropertyRowMapper;
64 67 import org.springframework.jdbc.core.JdbcTemplate;
65 68 import org.springframework.jdbc.core.RowMapper;
66 69 import org.springframework.stereotype.Service;
... ... @@ -1904,7 +1907,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1904 1907 return listMap;
1905 1908 }
1906 1909  
1907   - @Override
  1910 + /* @Override
1908 1911 public List<ScheduleRealInfo> correctForm(String line, String startDate,
1909 1912 String endDate, String lpName, String code, String type) {
1910 1913 List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
... ... @@ -1959,8 +1962,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1959 1962 }
1960 1963  
1961 1964 return list;
  1965 + }*/
  1966 +
  1967 + @Override
  1968 + public List<SchEditInfoDto> correctForm(String line,String date,
  1969 + String lpName,String code, String type) {
  1970 +
  1971 +// var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班',
  1972 +// 'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};
  1973 + Map<String, Object> map=new HashMap<String,Object>();
  1974 + map.put("DFTZ", "待发调整");
  1975 + map.put("FCXXWT", "发车信息微调");
  1976 + map.put("JHLB", "计划烂班");
  1977 + map.put("CXLB", "撤销烂班");
  1978 + map.put("CXZX","撤销执行");
  1979 + map.put("CXSF", "撤销实发");
  1980 + map.put("SFTZ", "实发调整");
  1981 + map.put("TZRC", "调整人车");
  1982 +
  1983 + String cont = "";
  1984 + cont = " and xl_bm ='"+line +"'";
  1985 + if(!lpName.equals("")){
  1986 + cont +=" and lp_name = '"+lpName+"'";
  1987 + }
  1988 + if(!code.equals("")){
  1989 + cont +=" and cl_zbh ='"+code+"'";
  1990 + }
  1991 + String sql = "select t1.*, "
  1992 + + "t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,"
  1993 + + "t2.xl_dir,t2.real_exec_date from (select * from "
  1994 + + "logger_sch_modify where rq=? and line_code=? )"
  1995 + + " t1 INNER JOIN bsth_c_s_sp_info_real t2 on "
  1996 + + "t1.sch_id=t2.id where 1=1 " + cont;
  1997 +
  1998 + List<SchEditInfoDto> list = jdbcTemplate.query(sql,
  1999 + new BeanPropertyRowMapper(SchEditInfoDto.class),date, line);
  2000 + List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
  2001 + for (int i = 0; i < list.size(); i++) {
  2002 + SchEditInfoDto t=list.get(i);
  2003 + if(map.get(t.getType())!=null){
  2004 + t.setType2(t.getTimeStr()+":"+map.get(t.getType()).toString());
  2005 + }else{
  2006 + t.setType2("");
  2007 + }
  2008 + boolean fage=true;
  2009 + for (int j = 0; j < lists.size(); j++) {
  2010 + SchEditInfoDto s=lists.get(j);
  2011 + if(s.getSchId()==t.getSchId()){
  2012 + s.setType2(s.getType2()+" "+t.getType2());
  2013 + fage=false;
  2014 + }
  2015 + }
  2016 + if(fage){
  2017 + lists.add(t);
  2018 + }
  2019 + }
  2020 +
  2021 + if (type != null && type.length() != 0 && type.equals("export")) {
  2022 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  2023 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  2024 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  2025 + Map<String, Object> m = new HashMap<String, Object>();
  2026 + m.put("dates",date);
  2027 + ReportUtils ee = new ReportUtils();
  2028 + List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
  2029 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  2030 + for (SchEditInfoDto d : lists) {
  2031 + Map<String, Object> tempMap = new HashMap<String, Object>();
  2032 + tempMap.put("lpName", d.getLpName());
  2033 + tempMap.put("clZbh", d.getClZbh());
  2034 + tempMap.put("jName", d.getjName()+"/"+d.getjGh());
  2035 + tempMap.put("fcsj", d.getFcsj());
  2036 + tempMap.put("type", d.getType2());
  2037 + tempList.add(tempMap);
  2038 + }
  2039 + try {
  2040 + listI.add(tempList.iterator());
  2041 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  2042 + ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
  2043 + path + "export/修正报表" + date+ ".xls");
  2044 + } catch (Exception e) {
  2045 + // TODO: handle exception
  2046 + e.printStackTrace();
  2047 + }
  2048 +// Map<String, Object> maps = tempList.get(tempList.size() - 1);
  2049 + }
  2050 + return lists;
1962 2051 }
1963   -
1964 2052 @Override
1965 2053 public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
1966 2054 String lpName, String date, String line) {
... ...
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @41237e5
... ... @@ -332,6 +332,8 @@ var BaseFun = function() {
332 332 var rs = new Array(),bxrcgs= new Array();
333 333 // 遍历已分配好路牌的班型人次数组.
334 334 for(var x = 0 ; x < bxrclist.length; x++) {
  335 + /*if(x>0)
  336 + continue;*/
335 337 // 定义当前班型人次下的路牌数组.
336 338 var cla = bxrclist[x].sslp;
337 339 var dsdnmb = bxrclist[x].rs/bxrclist[x].fpcls;
... ... @@ -339,12 +341,13 @@ var BaseFun = function() {
339 341 var hoursV = bxrclist[x].hoursV*dsdnmb;
340 342 // 遍历路牌
341 343 for(var s = 0 ; s < cla.length; s++) {
  344 + /*if(s>1 || s==0)
  345 + continue;*/
342 346 //cla[s].lpName = bxrclist[x].type;
343 347 // 获取路牌编号.
344 348 var lpNo = cla[s].lpNo;
345 349 // 定义路牌下的所有班次.
346 350 var lpbc = new Array();
347   - bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
348 351 // 遍历班次数.
349 352 for(var i =0 ; i <jsonArray.length; i++) {
350 353 // 判断当期遍历的班次是否属于当前的路牌.
... ... @@ -359,10 +362,20 @@ var BaseFun = function() {
359 362 cara[l].lpName = bxrclist[x].type + '_' + lpNo ;
360 363 }
361 364 }
  365 + var _obj = baseF.getsxAndxxbc(lpbc,dataMap);
  366 + baseF.tcbc(_obj.sxbc,dataMap.smbcsjArr[0].kssj,dataMap.smbcsjArr[0].jssj);// 剔除上行不在时间范围内的班次
  367 + baseF.tcbc(_obj.xxbc,dataMap.smbcsjArr[1].kssj,dataMap.smbcsjArr[1].jssj);// 剔除下行不在时间范围内的班次
  368 + var tcnofwlpbc = _obj.sxbc.concat(_obj.xxbc);
362 369 // 按照发车序号顺序排序.
363   - lpbc.sort(function(a,b){return b.fcno-a.fcno});
  370 + tcnofwlpbc.sort(function(a,b){return b.fcno-a.fcno});
  371 + /*var gsv = 0 ;
  372 + for(var z = 0 ;z < tza.length;z++) {
  373 + gsv = gsv + tza[z].bcsj + tza[z].STOPTIME;
  374 + }*/
  375 + // parseFloat((gsv/60).toFixed(2))
  376 + bxrcgs.push({'lpNo':lpNo,'hoursV':hoursV,'type':bxrclist[x].type});
364 377 // 调整班次数.也就是说调整工时.
365   - rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
  378 + rs = rs.concat(baseF.tzlpgs01(tcnofwlpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
366 379 }
367 380 }
368 381 var jar01 = baseF.tzsmbcsj01(
... ... @@ -375,6 +388,26 @@ var BaseFun = function() {
375 388 var jar = baseF.tzsmbcsj01(
376 389 baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
377 390 dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
  391 + // return {'json':jar,'bxrcgs':bxrcgs};
  392 + for(var r = 0 ; r < bxrcgs.length; r++) {
  393 + var lpNo = bxrcgs[r].lpNo;
  394 + var gsv = 0 , bczs = 0;
  395 + for(var g = 0 ; g< jar.length; g++) {
  396 + if(jar[g].lpNo == lpNo) {
  397 + gsv = gsv + jar[g].bcsj + jar[g].STOPTIME;
  398 + bczs++;
  399 + }
  400 + }
  401 + bxrcgs[r].sjgsV = gsv;
  402 + bxrcgs[r].bczs = bczs;
  403 + }
  404 + var jar3 = baseF.dqbcsAndgs(bxrcgs,jar,dataMap,cara.length);
  405 + // return {'json':jar3,'bxrcgs':bxrcgs};
  406 + /*var jar4 = baseF.tzsmbcsj01(
  407 + baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar3,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
  408 + dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);*/
  409 + var rsjar = baseF.tzsztest(cara,jar3,dataMap);
  410 + return {'json':rsjar,'bxrcgs':bxrcgs};
378 411 var resultJA = new Array();
379 412 for(var m = 0 ; m < cara.length; m++) {
380 413 // 获取路牌编号.
... ... @@ -382,11 +415,11 @@ var BaseFun = function() {
382 415 // 定义路牌下的所有班次.
383 416 var lpbc_ = new Array();
384 417 // 遍历班次数.
385   - for(var x =0 ; x <jar.length; x++) {
  418 + for(var x =0 ; x <rsjar.length; x++) {
386 419 // 判断当期遍历的班次是否属于当前的路牌.
387   - if(jar[x].lpNo == lpNo_) {
388   - delete jar[x].fcint;
389   - lpbc_.push(jar[x]);
  420 + if(rsjar[x].lpNo == lpNo_) {
  421 + delete rsjar[x].fcint;
  422 + lpbc_.push(rsjar[x]);
390 423 }
391 424 }
392 425 // 按照发车序号顺序排序.
... ... @@ -396,6 +429,222 @@ var BaseFun = function() {
396 429 return {'json':resultJA,'bxrcgs':bxrcgs};
397 430 },
398 431  
  432 + dqbcsAndgs : function(bxrcgs,jar,dataMap,cla) {
  433 + var bxA = new Array(),rsA = new Array();
  434 + for(var b = 0 ;b <bxrcgs.length; b++) {
  435 + if(bxA.indexOf(bxrcgs[b].type)<0)
  436 + bxA.push(bxrcgs[b].type);
  437 + }
  438 + var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
  439 + var v1 = Math.max.apply(null, maxXxsjA) *1.5;
  440 + for(var a = 0 ;a < bxA.length;a++) {
  441 + var type = bxA[a],bxszA = new Array();
  442 + for(var s = 0 ; s < bxrcgs.length; s++) {
  443 + if(type == bxrcgs[s].type)
  444 + bxszA.push({'szgs':bxrcgs[s].sjgsV,'szbc' : bxrcgs[s].bczs, 'lpNo':bxrcgs[s].lpNo,'type' :bxrcgs[s].type});
  445 + }
  446 + var lpA = new Array();
  447 + if(bxszA.length>1) {
  448 + /*bxszA.sort(function(c,d){return ((c.szbc - d.szbc) && (c.szgs - d.szgs))});*/
  449 + bxszA.sort(function(c,d){return d.szgs - c.szgs});
  450 + for(var t = 0 ;t < bxszA.length;t++) {
  451 + var lpN_ = bxszA[t].lpNo;
  452 + /*if(lpN_==bxszA[0].lpNo)
  453 + continue;*/
  454 + var dx = bxszA[t].szbc - bxszA[0].szbc;
  455 + var type_ = bxszA[t].type;
  456 + lpA = baseF.getlpbcA(lpN_,jar);
  457 + lpA.sort(function(x,y){return y.fcno - x.fcno});
  458 + var tempTag = false;
  459 + var isyddygbc = !baseF.issmbcsjArr(lpA[lpA.length-1].fcsj,dataMap.smbcsjArr);
  460 + var isydzhygbc = !baseF.issmbcsjArr(lpA[0].fcsj,dataMap.smbcsjArr);
  461 + if(dx>0) {
  462 + for(var j = 0 ; j < dx ; j++) {
  463 + for(var k = 0 ; k<lpA.length;k++) {
  464 + // 得到当前路牌下的发车时间.
  465 + var dqbcfcsj = baseF.getDateTime(lpA[k].fcsj);
  466 + // 判断时间范围.
  467 + if(dataMap.zgfsjd[0].ed < dqbcfcsj && dqbcfcsj < dataMap.wgfsjd[0].st) {
  468 + lpA.splice(k,1);
  469 + break;
  470 + }
  471 + }
  472 + }
  473 + tempTag = true;
  474 + }else if(bxszA[t].szgs < bxszA[0].szgs) {
  475 + var gsdx = bxszA[0].szgs - bxszA[t].szgs;
  476 + // console.log(gsdx + '---' + lpN_);
  477 + if(gsdx<=v1) {
  478 + if(isyddygbc && isydzhygbc) {
  479 + var dygbcydx = 0,zhygbcydx = 0;
  480 + if(gsdx%2==0) {
  481 + dygbcydx = gsdx/2;
  482 + zhygbcydx = dygbcydx;
  483 + }else {
  484 + dygbcydx = gsdx%2;
  485 + zhygbcydx = gsdx - dygbcydx;
  486 + }
  487 + baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
  488 + baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
  489 + }else if(isyddygbc) {
  490 + baseF.dygbcUpd(lpA[lpA.length-1],gsdx);
  491 + }else if(isydzhygbc) {
  492 + baseF.zhygbcUpd(lpA[0],lpA[1],gsdx);
  493 + }
  494 + }else {
  495 + var isZerInt = baseF.istzsjZero(lpA,dataMap);
  496 + var vag = 0,avgdx = 0;
  497 + if(gsdx % isZerInt==0) {
  498 + vag = gsdx / isZerInt;
  499 + }else {
  500 + vag = parseInt(gsdx / isZerInt);
  501 + avgdx = gsdx - vag*isZerInt;
  502 + if(isyddygbc && isydzhygbc) {
  503 + var dygbcydx = 0,zhygbcydx = 0;
  504 + if(avgdx%2==0) {
  505 + dygbcydx = avgdx/2;
  506 + zhygbcydx = dygbcydx;
  507 + }else {
  508 + dygbcydx = avgdx%2;
  509 + zhygbcydx = avgdx - dygbcydx;
  510 + }
  511 + baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
  512 + baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
  513 + }else if(isyddygbc) {
  514 + baseF.dygbcUpd(lpA[lpA.length-1],avgdx);
  515 + }else if(isydzhygbc) {
  516 + baseF.zhygbcUpd(lpA[0],lpA[1],avgdx);
  517 + }
  518 + }
  519 + var qbbfbc = new Array();
  520 + for(var v = 1 ; v < lpA.length;v++) {
  521 + var ddsj = baseF.getDateTime(lpA[v-1].fcsj);
  522 + if(baseF.getDateTime("13:00") <= baseF.getDateTime(lpA[v].fcsj)) {
  523 + if(lpA[v].STOPTIME > 0 && !baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr) ) {
  524 + lpA[v].STOPTIME = lpA[v].STOPTIME + vag;
  525 + ddsj.setMinutes(ddsj.getMinutes() - lpA[v].STOPTIME);
  526 + lpA[v].ARRIVALTIME = baseF.getTimeStr(ddsj);
  527 + ddsj.setMinutes(ddsj.getMinutes() - lpA[v].bcsj);
  528 + lpA[v].fcsj = baseF.getTimeStr(ddsj);
  529 +
  530 + }
  531 + }else {
  532 + if(!baseF.issmbcsjArr(lpA[v].fcsj,dataMap.smbcsjArr)) {
  533 + qbbfbc.push(lpA[v]);
  534 + }
  535 + }
  536 + }
  537 + qbbfbc.sort(function(x,y){return x.fcno - y.fcno});
  538 + for(var q = 0 ; q < qbbfbc.length; q++) {
  539 + if(q<(qbbfbc.length-1))
  540 + qbbfbc[q].STOPTIME = qbbfbc[q].STOPTIME + vag;
  541 + if(q==0)
  542 + continue;
  543 + else {
  544 + var ddsj_ = baseF.getDateTime(qbbfbc[q-1].ARRIVALTIME);
  545 + ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q-1].STOPTIME);
  546 + qbbfbc[q].fcsj = baseF.getTimeStr(ddsj_);
  547 + ddsj_.setMinutes(ddsj_.getMinutes() + qbbfbc[q].bcsj);
  548 + qbbfbc[q].ARRIVALTIME = baseF.getTimeStr(ddsj_);
  549 + }
  550 + }
  551 + }
  552 + }
  553 + var start = baseF.getDateTime(lpA[0].ARRIVALTIME);
  554 + var end = baseF.getDateTime(lpA[lpA.length-1].fcsj);
  555 + var hourdx = start.getHours() - end.getHours();
  556 + var minuedx = hourdx* 60 + (start.getMinutes() - end.getMinutes()) + lpA[0].STOPTIME;
  557 + var dx = 0;
  558 + /*if(minuedx > bxszA[0].szgs && tempTag) {
  559 + dx = minuedx - bxszA[0].szgs;
  560 + console.log(dx);
  561 + }else */
  562 + if(minuedx < bxszA[0].szgs && tempTag) {
  563 + dx = bxszA[0].szgs - minuedx;
  564 + if(dx > v1 && isyddygbc && isydzhygbc) {
  565 + var dygbcydx = 0,zhygbcydx = 0;
  566 + if(dx%2==0) {
  567 + dygbcydx = dx/2;
  568 + zhygbcydx = dygbcydx;
  569 + }else {
  570 + dygbcydx = dx%2;
  571 + zhygbcydx = dx - dygbcydx;
  572 + }
  573 + baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
  574 + baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
  575 + }else {
  576 + if(isyddygbc && isydzhygbc) {
  577 + var dygbcydx = 0,zhygbcydx = 0;
  578 + if(dx%2==0) {
  579 + dygbcydx = dx/2;
  580 + zhygbcydx = dygbcydx;
  581 + }else {
  582 + dygbcydx = dx%2;
  583 + zhygbcydx = dx - dygbcydx;
  584 + }
  585 + baseF.dygbcUpd(lpA[lpA.length-1],dygbcydx);
  586 + baseF.zhygbcUpd(lpA[0],lpA[1],zhygbcydx);
  587 + }else if(isyddygbc) {
  588 + baseF.dygbcUpd(lpA[lpA.length-1],dx);
  589 + }else if(isydzhygbc) {
  590 + baseF.zhygbcUpd(lpA[0],lpA[1],dx);
  591 + }
  592 + }
  593 + }
  594 + rsA = rsA.concat(lpA);
  595 + }
  596 +
  597 + }else {
  598 + rsA = rsA.concat(baseF.getlpbcA(bxszA[0].lpNo,jar));
  599 + }
  600 + }
  601 + return rsA;
  602 + },
  603 +
  604 + istzsjZero : function(arr,dataMap) {
  605 + var rsint = 0;
  606 + for(var r = 1 ; r<arr.length;r++) {
  607 + if(arr[r].STOPTIME>0 && !baseF.issmbcsjArr(arr[r].fcsj,dataMap.smbcsjArr)) {
  608 + rsint++;
  609 + }
  610 + }
  611 + return rsint;
  612 + },
  613 +
  614 + dygbcUpd : function(obj,dx) {
  615 + obj.STOPTIME = obj.STOPTIME + dx;
  616 + var dygbcfcsj = baseF.getDateTime(obj.fcsj);
  617 + dygbcfcsj.setMinutes(dygbcfcsj.getMinutes() - dx);
  618 + obj.fcsj = baseF.getTimeStr(dygbcfcsj);
  619 + },
  620 +
  621 + zhygbcUpd: function(obj,xgOjb,dx) {
  622 + xgOjb.STOPTIME = xgOjb.STOPTIME + dx;
  623 + var zhygbcydx = baseF.getDateTime(obj.fcsj);
  624 + zhygbcydx.setMinutes(zhygbcydx.getMinutes() + dx);
  625 + obj.fcsj = baseF.getTimeStr(zhygbcydx);
  626 + zhygbcydx.setMinutes(zhygbcydx.getMinutes() + obj.bcsj);
  627 + obj.ARRIVALTIME = baseF.getTimeStr(zhygbcydx);
  628 + },
  629 +
  630 + issmbcsjArr : function(str,arr) {
  631 + var tag = false;
  632 + for(var a = 0 ;a < arr.length;a++) {
  633 + if(str == arr[a].kssj || str == arr[a].jssj)
  634 + tag = true;
  635 + }
  636 + return tag;
  637 + },
  638 +
  639 + getlpbcA : function(lpN_,jar) {
  640 + var lpA = new Array();
  641 + for(var p = 0 ; p < jar.length; p++ ) {
  642 + if(jar[p].lpNo == lpN_)
  643 + lpA.push(jar[p]);
  644 + }
  645 + return lpA;
  646 + },
  647 +
399 648 tzsztest : function(cara,tempa,dataMap) {
400 649 var jsrs = new Array();
401 650 for(var t = 0 ; t < cara.length; t++) {
... ... @@ -445,22 +694,32 @@ var BaseFun = function() {
445 694 },
446 695  
447 696 tztzsjInit01 : function(ar,dataMap) {
  697 + var maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
  698 + var v1 = Math.max.apply(null, maxXxsjA) *1.5;
448 699 for(var r = 0 ; r< ar.length-1;r++) {
449 700 var sgbcfcsj = baseF.getDateTime(ar[r+1].fcsj),dqbcddsj = baseF.getDateTime(ar[r].ARRIVALTIME);
450 701 var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
451 702 if(dxmin<0 || ar[r].STOPTIME<0) {
452 703 var cctag = baseF.dirDmToIndex(ar[r].xlDir);
453 704 dxmin = ar[r].bcType == dataMap.bcTypeArr.cf ? 0 : baseF.isgfsjd01(baseF.getDateTime(ar[r].fcsj),dataMap) ? dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
454   - dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
  705 + /*dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
455 706 ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
456 707 dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
457   - ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
  708 + ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);*/
458 709 /*sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - dxmin);
459 710 ar[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
460 711 sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - ar[r].bcsj);
461 712 ar[r].fcsj = baseF.getTimeStr(sgbcfcsj);*/
  713 + }else if(dxmin >= v1 && dxmin < 180) {
  714 + dxmin = v1;
  715 + }
  716 + if(ar[r].STOPTIME >0) {
  717 + dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
  718 + ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
  719 + dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
  720 + ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
  721 + ar[r].STOPTIME = dxmin >= 180 ? 0 : parseInt(dxmin);
462 722 }
463   - ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
464 723 }
465 724 },
466 725  
... ... @@ -573,64 +832,122 @@ var BaseFun = function() {
573 832 var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] +
574 833 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
575 834 // 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
576   - var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
577   - while(lpdqzgs>gs) {
578   - for(var t = 0 ; t<arr.length;t++) {
579   - // 得到当前路牌下的发车时间.
580   - var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
581   - // 判断时间范围.
582   - if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
583   - arr.splice(t,1);
584   - break;
  835 + var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2)),tagboolean = true;
  836 + while(tagboolean) {
  837 + if(lpdqzgs>gs) {
  838 + var temp = true ;
  839 + for(var t = 0 ; t<arr.length;t++) {
  840 + // 得到当前路牌下的发车时间.
  841 + var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
  842 + // 判断时间范围.
  843 + if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
  844 + arr.splice(t,1);
  845 + temp = false;
  846 + break;
  847 + }
585 848 }
  849 + lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
  850 + if(temp)
  851 + tagboolean = false;
  852 + }else {
  853 + tagboolean = false;
586 854 }
587   - lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
588 855 }
  856 + if(arr[0].xlDir == arr[arr.length-1].xlDir) {
  857 + baseF.addbc01(arr,arr[0],dataMap);
  858 + }
  859 + var gfzjst = null
589 860 for(var c = 0 ; c<arr.length;c++) {
590 861 var cfsjbc = baseF.getDateTime(arr[c].fcsj);
591 862 if(dataMap.gfzjsjd[0].st <= cfsjbc && cfsjbc <= dataMap.gfzjsjd[0].ed && arr[c].bcType == dataMap.bcTypeArr.cf )
592 863 gfzjst = baseF.getDateTime(arr[c].ARRIVALTIME);
593 864 }
594   - gfzjst == null ? dataMap.gfzjsjd[0].st : gfzjst;
  865 + gfzjst = gfzjst == null ? dataMap.gfzjsjd[0].st : gfzjst;
595 866 var gfzjbc = new Array(),wgfbc = new Array(),zgfbc = new Array();
596   - for(var a = 0 ; a<arr.length;a++) {
597   - var tmkssj = baseF.getDateTime(arr[a].fcsj)
  867 + for(var x = 0 ; x<arr.length;x++) {
  868 + var tmkssj = baseF.getDateTime(arr[x].fcsj)
598 869 if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
599   - gfzjbc.push(arr[a]);
  870 + gfzjbc.push(arr[x]);
600 871 else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
601   - wgfbc.push(arr[a]);
  872 + wgfbc.push(arr[x]);
602 873 else
603   - zgfbc.push(arr[a]);
  874 + zgfbc.push(arr[x]);
604 875 }
605 876 gfzjbc.sort(function(a,b){return a.fcno-b.fcno});
606 877 wgfbc.sort(function(a,b){return a.fcno-b.fcno});
607   - if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir)
608   - gfzjbc.splice(gfzjbc.length-1,1);
609   - if(type!='五工二休') {
610   - var gfzjst = null;
611   - var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
612   - var addmin = parseInt(dxmin/gfzjbc.length);
613   - for(var g = 0 ;g < gfzjbc.length;g++) {
614   - if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
615   - gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
616   - if(g==0) {
617   - continue;
618   - }else {
619   - var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
620   - tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
621   - gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
622   - tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
623   - gfzjbc[g].ARRIVALTIME = baseF.getTimeStr(tempd);
  878 + if(gfzjbc.length>0 && wgfbc.length>0) {
  879 + if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir && dataMap.map.linePlayType == "0"){
  880 + // addbc
  881 + baseF.addbc01(gfzjbc,gfzjbc[gfzjbc.length-1],dataMap);
  882 + }
  883 + if(type!='五工二休') {
  884 + var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
  885 + var addmin = parseInt(dxmin/gfzjbc.length);
  886 + var rsM = baseF.gettzsjbs(gfzjbc,addmin,dataMap);
  887 + if(rsM.tag) {
  888 + for(var g = 0 ;g < gfzjbc.length;g++) {
  889 + if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
  890 + gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
  891 + if(g==0) {
  892 + continue;
  893 + }else {
  894 + var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
  895 + tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
  896 + gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
  897 + tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
  898 + gfzjbc[g].ARRIVALTIME = baseF.getTimeStr(tempd);
  899 + }
  900 + }
624 901 }
  902 + gfzjbc[gfzjbc.length-1].STOPTIME = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
625 903 }
626   - gfzjbc[gfzjbc.length-1].STOPTIME = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
627 904 }
628 905 return gfzjbc.concat(wgfbc).concat(zgfbc);
629 906 },
630 907  
  908 + addbc01 : function(gfzjbc,lastObj,dataMap) {
  909 + var kssj = new Date(),strArray = lastObj.ARRIVALTIME.split(':');
  910 + kssj.setHours(parseInt(strArray[0]));
  911 + kssj.setMinutes(parseInt(strArray[1]) + lastObj.STOPTIME);
  912 + var cctag = baseF.dirDmToIndex(lastObj.xlDir);
  913 + cctag = baseF.getfx(1,cctag);
  914 + var tzsj = baseF.isgfsjd01(kssj,dataMap) ? dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
  915 + var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
  916 + // 定义班次序号
  917 + var xhNo = lastObj.fcno+1;
  918 + var carArray = {'lp':lastObj.lp,'lpNo':lastObj.lpNo,'lpName':lastObj.lpName,'lpType':lastObj.lpType};
  919 + var ags = {'tcc_id':lastObj.tcc,'skbName':lastObj.ttinfo,'lineName':lastObj.xl+'_'};
  920 + gfzjbc.push(baseF.getbcObj( kssj,
  921 + _xxsj,
  922 + carArray,
  923 + 'normal',
  924 + dataMap.dira[cctag],
  925 + xhNo++,
  926 + dataMap.pcxslcArr[cctag],
  927 + ags,0,
  928 + dataMap.qdzArr[cctag],
  929 + dataMap.zdzArr[cctag],
  930 + null,tzsj,0));
  931 + },
  932 +
  933 + gettzsjbs : function(array,bs,dataMap) {
  934 + var tag = true,dx = 0;
  935 + var tempA = new Array(),maxXxsjA = [parseInt(dataMap.map.upTravelTime),parseInt(dataMap.map.downTravelTime)];
  936 + for(var r = 0 ; r<array.length;r++) {
  937 + tempA.push(array[r].STOPTIME + bs);
  938 + }
  939 + var v1 = Math.max.apply(null, maxXxsjA) *1.5;
  940 + var v2 = Math.max.apply(null, tempA);
  941 + if( v2 > v1) {
  942 + tag = false;
  943 + dx = parseInt(v2 -v1);
  944 + }
  945 + return {tag:tag,dx:dx};
  946 + },
  947 +
631 948 issplice : function (kssj,dataMap,type,lpNo,cla){
632 949 var tag = false;
633   - if(type=='五工二休' || lpNo <Math.round(cla/2)) {
  950 + if(type=='五工二休' || lpNo <= Math.round(cla/2)) {
634 951 if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) ||
635 952 ( dataMap.wgfsjd[0].st <= kssj && kssj <= dataMap.wgfsjd[0].ed))
636 953 tag = true;
... ... @@ -1152,12 +1469,12 @@ var BaseFun = function() {
1152 1469 while(kssj<=endTime) {
1153 1470 cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
1154 1471 fxTagDm = 1;
1155   - var cfdd = baseF.getcfdd(map.cfdd,cctag);
  1472 + /*var cfdd = baseF.getcfdd(map.cfdd,cctag);
1156 1473 if(kssj> new Date (baseF.getCFDate(10,30)) &&
1157 1474 kssj<new Date (baseF.getCFDate(11,30)) && $_cfn<1 && cfdd == cctag) {
1158 1475 $_cfn++;
1159 1476 rs.push(baseF.getbcObj(
1160   - kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
  1477 + kssj,dataMap.zwcAr r[0],cara[c],dataMap.bcTypeArr.cf,
1161 1478 dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 午餐班次
1162 1479 }else if(kssj> new Date (baseF.getCFDate(18,30)) &&
1163 1480 kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
... ... @@ -1166,15 +1483,15 @@ var BaseFun = function() {
1166 1483 rs.push(baseF.getbcObj(
1167 1484 kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
1168 1485 dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 晚餐班次
1169   - }
  1486 + }*/
1170 1487 var tzsj = baseF.isgfsjd01(kssj,dataMap) ? dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
1171 1488 // var tzsj = dataMap.ztjxA[cctag];
1172 1489 var _xxsj = baseF.getxssj(dataMap.zgfsjd,dataMap.wgfsjd,kssj,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag);// 获取行驶时间
1173   - tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj) ? 0 :　tzsj;
  1490 + var xs_tzsj = baseF.isLastbc(kssj,endTime,tzsj,_xxsj) ? 0 :　tzsj;
1174 1491 rs.push(baseF.getbcObj(
1175 1492 kssj,_xxsj,cara[c],dataMap.bcTypeArr.normal,
1176 1493 dataMap.dira[cctag],xhNo++,dataMap.pcxslcArr[cctag],map,0,
1177   - dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,tzsj,0));// 正常班次
  1494 + dataMap.qdzArr[cctag],dataMap.zdzArr[cctag],null,xs_tzsj,0));// 正常班次
1178 1495 kssj = new Date(kssj.setMinutes(kssj.getMinutes() + tzsj));
1179 1496 }
1180 1497 }
... ... @@ -1336,8 +1653,8 @@ var BaseFun = function() {
1336 1653 var _obj = baseF.getsxAndxxbc(list);
1337 1654 baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj);// 剔除上行不在时间范围内的班次
1338 1655 baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj);// 剔除下行不在时间范围内的班次
1339   - baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
1340 1656 baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
  1657 + baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
1341 1658 baseF.tzqtbc(_obj.sxbc,_obj.qt,sj,cl,zd,lbsj);
1342 1659 baseF.tzqtbc(_obj.xxbc,_obj.qt,sj,cl,zd,lbsj);
1343 1660 return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
... ... @@ -1353,8 +1670,14 @@ var BaseFun = function() {
1353 1670 var _obj = baseF.getsxAndxxbc(list,dm);
1354 1671 baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj ,_obj.xxbc);// 剔除上行不在时间范围内的班次
1355 1672 baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 剔除下行不在时间范围内的班次
1356   - baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
1357   - baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
  1673 + if(smbcsj[1].jssj < smbcsj[0].jssj ) {
  1674 + baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
  1675 + baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
  1676 + }else {
  1677 + baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
  1678 + baseF.dzsmsj(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 调整下行首末班车时间
  1679 + }
  1680 +
1358 1681 return _obj.sxbc.concat(_obj.xxbc).concat(_obj.qt);
1359 1682 },
1360 1683 tcbc : function(ar,kssj,jssj,ppar) {
... ...
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
  View file @41237e5
... ... @@ -947,11 +947,30 @@ var RelationshipGraph = function () {
947 947 key : 'statistics',
948 948 value : function statistics() {
949 949 var $_this = this,
950   - array = $_this.getSvgyAxisTransformY(),
951   - gdata = d3.selectAll('rect.data')[0],
952   - arrayTemp = new Array(),
953   - minValue = 0,timeNum;
  950 + // array = $_this.getSvgyAxisTransformY(),
  951 + array = $_this.configuration.taskTypes,
  952 + tza = $_this.getDataArray();
954 953 for(var a=0;a<array.length;a++) {
  954 + var lpNo = array[a].lpNo;
  955 + var timeNum = 0 ,tempNum = 0;
  956 + for(var z = 0 ;z < tza.length;z++) {
  957 + if(tza[z].lpNo == lpNo) {
  958 + timeNum = timeNum + tza[z].bcsj + tza[z].STOPTIME;
  959 + tempNum ++;
  960 + }
  961 + }
  962 + var className = 'statis_container_' + lpNo;
  963 + var textNodes = $("."+className).children("text");
  964 + var hours = parseInt(timeNum/60);
  965 + var mimus = timeNum%60, zgs = hours + (mimus==0? "": "." + mimus);
  966 + var zgs = parseFloat((timeNum/60).toFixed(2));
  967 + // var zgs = timeNum;
  968 + $(textNodes[0]).text("总工时:" + zgs);
  969 + $(textNodes[1]).text("总班次:"+(tempNum));
  970 + // $_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
  971 + }
  972 + /*for(var a=0;a<array.length;a++) {
  973 + debugger;
955 974 var tempNum = 0,timeNum = 0,lpNo = '';
956 975 for(var g = 0 ; g <gdata.length;g++) {
957 976 var temp_i = parseInt(d3.select(gdata[g]).attr('y'))-this.configuration.offsetY;
... ... @@ -968,13 +987,14 @@ var RelationshipGraph = function () {
968 987 minValue = array[a];
969 988 var className = 'statis_container_' + array[a];
970 989 var textNodes = $("."+className).children("text");
971   - /*var hours = parseInt(timeNum/60);
972   - var mimus = timeNum%60,zgs = hours + (mimus==0? "": "." + mimus);*/
  990 + var hours = parseInt(timeNum/60);
  991 + var mimus = timeNum%60,zgs = hours + (mimus==0? "": "." + mimus);
973 992 var zgs = parseFloat((timeNum/60).toFixed(2));
  993 + var zgs = timeNum;
974 994 $(textNodes[0]).text("总工时:" + zgs);
975 995 $(textNodes[1]).text("总班次:"+(tempNum));
976 996 $_this.pptjbx($("."+className).children("rect")[2],zgs*1,lpNo,$_this);
977   - }
  997 + }*/
978 998 }
979 999  
980 1000 }, {
... ... @@ -1025,11 +1045,12 @@ var RelationshipGraph = function () {
1025 1045 value : function createStatistics() {
1026 1046 var svg = d3.select('.gantt-chart'),
1027 1047 _this = this,
1028   - array = _this.getSvgyAxisTransformY();
  1048 + yAyxisA = _this.getSvgyAxisTransformY();
  1049 + array = _this.configuration.taskTypes;
1029 1050 var g_statis = svg.selectAll('.g_statis').data([1]).enter().append('g').classed({'g_statis':true}).attr("transform", "translate(" + _this.configuration.offsetX + ", " + _this.configuration.offsetY + ")");
1030 1051 for(var c = 0 ;c<array.length;c++) {
1031   - var className = 'statis_container_' + array[c];
1032   - var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + array[c] + ")");
  1052 + var className = 'statis_container_' + array[c].lpNo;
  1053 + var statis_container = g_statis.append('g').attr("class",className).attr("transform", "translate(" + 0 + ", " + yAyxisA[c] + ")");
1033 1054 statis_container.append('rect').classed({'rect_shift':true})
1034 1055 .attr("x",-_this.configuration.offsetX)
1035 1056 .attr("y",9)
... ... @@ -1527,7 +1548,8 @@ var RelationshipGraph = function () {
1527 1548 key : 'setIdValue',
1528 1549 value : function setIdValue(obj) {
1529 1550 // 设置id属性值. 由一个 常量字符串 + 班次数 + 常量字符串 + 发车序号 + 常量字符 + 对应的y轴值.
1530   - return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
  1551 + // return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent);
  1552 + return 'shift-rect-' + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName);
1531 1553 }
1532 1554 }, {
1533 1555 /**
... ... @@ -1615,7 +1637,8 @@ var RelationshipGraph = function () {
1615 1637 * */
1616 1638 key : 'setRectParenNodeIdV',
1617 1639 value : function setRectParenNodeIdV(obj) {
1618   - return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
  1640 + // return 'parent_' + $_GlobalGraph.configuration.y(obj.parent) + '_' + obj.bcs + "_node_" + obj.fcno;
  1641 + return 'parent_' + $_GlobalGraph.configuration.y(obj.lpName) + '_' + obj.bcs + "_node_" + obj.fcno;
1619 1642 }
1620 1643 }, {
1621 1644 /**
... ... @@ -1629,7 +1652,8 @@ var RelationshipGraph = function () {
1629 1652 * */
1630 1653 key : 'setNextNodeIdV',
1631 1654 value : function setNextNodeIdV(obj) {
1632   - return "shift-rect-" + (obj.bcs+1) + '_' + (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
  1655 + // return "shift-rect-" + (obj.bcs+1) + '_' + (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.parent);
  1656 + return "shift-rect-" + (obj.bcs+1) + '_' + (obj.fcno+1) + '_' + $_GlobalGraph.configuration.y(obj.lpName);
1633 1657 }
1634 1658 }, {
1635 1659 /**
... ... @@ -1643,7 +1667,8 @@ var RelationshipGraph = function () {
1643 1667 * */
1644 1668 key : 'setLastNodeIdV',
1645 1669 value : function setLastNodeIdV(obj) {
1646   - return "shift-rect-" + (obj.bcs-1) + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
  1670 + // return "shift-rect-" + (obj.bcs-1) + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.parent);
  1671 + return "shift-rect-" + (obj.bcs-1) + '_' + (obj.fcno-1)+ '_' + $_GlobalGraph.configuration.y(obj.lpName);
1647 1672 }
1648 1673 }, {
1649 1674 /**
... ... @@ -1671,7 +1696,8 @@ var RelationshipGraph = function () {
1671 1696 * */
1672 1697 key : 'setText01IdV',
1673 1698 value : function setText01IdV(obj) {
1674   - return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1699 + // return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1700 + return "shift-rect-text01-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
1675 1701 }
1676 1702 }, {
1677 1703 /**
... ... @@ -1755,7 +1781,8 @@ var RelationshipGraph = function () {
1755 1781 * */
1756 1782 key : 'setCircleIdV',
1757 1783 value : function setCircleIdV(obj) {
1758   - return "shift-rect-circle-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1784 + // return "shift-rect-circle-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1785 + return "shift-rect-circle-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
1759 1786 }
1760 1787 }, {
1761 1788 /**
... ... @@ -1833,7 +1860,8 @@ var RelationshipGraph = function () {
1833 1860 * */
1834 1861 key : 'setText02IdV',
1835 1862 value : function setText02IdV(obj) {
1836   - return "shift-rect-text02-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1863 + // return "shift-rect-text02-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1864 + return "shift-rect-text02-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
1837 1865 }
1838 1866 }, {
1839 1867 /**
... ... @@ -1873,7 +1901,9 @@ var RelationshipGraph = function () {
1873 1901 * */
1874 1902 key : 'setText03IdV',
1875 1903 value : function setText03IdV(obj) {
1876   - return "shift-rect-text03-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1904 + /*return "shift-rect-text03-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
  1905 + return "shift-rect-text03-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
  1906 +
1877 1907 }
1878 1908 }, {
1879 1909 /**
... ... @@ -1911,7 +1941,8 @@ var RelationshipGraph = function () {
1911 1941 * */
1912 1942 key : 'setText04IdV',
1913 1943 value : function (obj) {
1914   - return "shift-rect-text04-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  1944 + /*return "shift-rect-text04-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
  1945 + return "shift-rect-text04-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
1915 1946 }
1916 1947 }, {
1917 1948 /**
... ... @@ -2011,7 +2042,8 @@ var RelationshipGraph = function () {
2011 2042 * */
2012 2043 key : 'setCoverRectIdV',
2013 2044 value : function setCoverRectIdV(obj) {
2014   - return "shift-rect-cover-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);
  2045 + /*return "shift-rect-cover-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.parent);*/
  2046 + return "shift-rect-cover-" + obj.bcs + '_' + obj.fcno + $_GlobalGraph.configuration.y(obj.lpName);
2015 2047 }
2016 2048 }, {
2017 2049 /**
... ... @@ -2039,7 +2071,8 @@ var RelationshipGraph = function () {
2039 2071 * */
2040 2072 key : 'setCoverRectParentV',
2041 2073 value : function setCoverRectParentV(obj) {
2042   - return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
  2074 + //return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.parent) + '-cover';
  2075 + return "shift-rect-" + obj.bcs + '_' + obj.fcno + '_' + $_GlobalGraph.configuration.y(obj.lpName) + '-cover';
2043 2076 }
2044 2077 }, {
2045 2078 /**
... ... @@ -2053,7 +2086,8 @@ var RelationshipGraph = function () {
2053 2086 * */
2054 2087 key : 'setCoverRectLastIdV',
2055 2088 value : function setCoverRectLastIdV(obj) {
2056   - return "shift-rect-cover-" + obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
  2089 + // return "shift-rect-cover-" + obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.parent);
  2090 + return "shift-rect-cover-" + obj.bcs + '_' + (obj.fcno+1) + $_GlobalGraph.configuration.y(obj.lpName);
2057 2091 }
2058 2092 }, {
2059 2093 key : 'mouseUpEvent',
... ...
src/main/resources/static/pages/base/timesmodel/js/gantt.js
  View file @41237e5
... ... @@ -388,7 +388,8 @@
388 388 * @return 返回甘特图的参数配置信息.
389 389 * */
390 390 function getGraphArgus(p) {
391   - var VALUEKEYNAME = 'Worldwide Gross',MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) : 3 ,
  391 + var MULTIPLE = Math.round(105/parseInt(p.stopAraay[0].sxsj)) >=4 ? Math.round(90/parseInt(p.stopAraay[0].sxsj)) : Math.round(90/parseInt(p.stopAraay[0].sxsj)) *2;
  392 + var VALUEKEYNAME = 'Worldwide Gross' ,
392 393 DXHOURS = 24,MINUTE = 60,WIDTH = DXHOURS*MINUTE,MARGINLEFT = 380,HEIGHT = p.yAxisCarArray.length*60 + 240,
393 394 MARGINBOTTOM = 240,OFFSETX = 90,OFFSETY = 180,OFFSETUPY = 120,OFFSETDOWNY = 60,
394 395 STARTDATETIME = p.startDateTime ,ENDDATETIME = p.endDateTime ,TASKTYPES =p.yAxisCarArray ,TICKFORMAT ='%H:%M' ,SHOWTOOLTIPS = true;
... ...
src/main/resources/static/pages/forms/mould/correctForm.xls
View file @41237e5
No preview for this file type
src/main/resources/static/pages/forms/statement/correctForm.html
  View file @41237e5
... ... @@ -32,13 +32,13 @@
32 32 <select class="form-control" name="line" id="line" style="width: 136px;"></select>
33 33 </div>
34 34 <div style="display: inline-block;margin-left: 15px;">
35   - <span class="item-label" style="width: 80px;">开始时间: </span>
36   - <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
37   - </div>
38   - <div style="display: inline-block;margin-left: 15px;">
39   - <span class="item-label" style="width: 80px;">结束时间: </span>
40   - <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
  35 + <span class="item-label" style="width: 80px;">时间: </span>
  36 + <input class="form-control" type="text" id="date" style="width: 120px;"/>
41 37 </div>
  38 +<!-- <div style="display: inline-block;margin-left: 15px;"> -->
  39 +<!-- <span class="item-label" style="width: 80px;">结束时间: </span> -->
  40 +<!-- <input class="form-control" type="text" id="endDate" style="width: 120px;"/> -->
  41 +<!-- </div> -->
42 42 <div style="display: inline-block;margin-left: 15px">
43 43 <span class="item-label" style="width: 140px;">路牌： </span>
44 44 <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
... ... @@ -46,6 +46,7 @@
46 46 <div style="display: inline-block;margin-left: 15px">
47 47 <span class="item-label" style="width: 140px;">内部编码： </span>
48 48 <select class="form-control" name="code" id="code" style="width: 145px;"></select>
  49 + <input class="btn btn-default" type="button" id="czcl" value="X"/>
49 50 </div>
50 51 <div class="form-group">
51 52 <input class="btn btn-default" type="button" id="query" value="筛选"/>
... ... @@ -58,28 +59,15 @@
58 59 <table class="table table-bordered table-hover table-checkable" id="forms">
59 60 <thead>
60 61 <tr>
61   - <th colspan="12">营运车辆修正统计表</th>
62   - </tr>
63   - <tr>
64   - <td colspan="12">车队 站 <span id="sDate"></span>至<span id="eDate"></span></td>
  62 + <th colspan="6">营运车辆修正统计表</th>
65 63 </tr>
66 64 <tr>
67   - <td rowspan="2">线路名</td>
68   - <td rowspan="2">路牌</td>
69   - <td rowspan="2">车号</td>
70   - <td rowspan="2">司机</td>
71   - <td rowspan="2">售票员</td>
72   - <td colspan="2">发车时间</td>
73   - <td colspan="2">结束时间</td>
74   - <td rowspan="2">修改人</td>
75   - <td rowspan="2">修改时间</td>
76   - <td rowspan="2">备注</td>
77   - </tr>
78   - <tr>
79   - <td>计划</td>
80   - <td>实际</td>
81   - <td>计划</td>
82   - <td>实际</td>
  65 + <td>编号</td>
  66 + <td>路牌</td>
  67 + <td>车号</td>
  68 + <td>司机</td>
  69 + <td>计发</td>
  70 + <td>修改详细</td>
83 71 </tr>
84 72 </thead>
85 73 <tbody class="list_correctForm">
... ... @@ -104,11 +92,19 @@
104 92 if (!$('body').hasClass('page-sidebar-closed'))
105 93 $('.menu-toggler.sidebar-toggler').click();
106 94  
107   - $("#startDate,#endDate").datetimepicker({
  95 + $("#date").datetimepicker({
108 96 format : 'YYYY-MM-DD',
109 97 locale : 'zh-cn'
110 98 });
111   -
  99 + var d = new Date();
  100 + var year = d.getFullYear();
  101 + var month = d.getMonth() + 1;
  102 + var day = d.getDate();
  103 + if(month < 10)
  104 + month = "0" + month;
  105 + if(day < 10)
  106 + day = "0" + day;
  107 + $("#date").val(year + "-" + month + "-" + day);
112 108  
113 109 $.get('/basic/lineCode2Name',function(result){
114 110 var data=[];
... ... @@ -116,11 +112,12 @@
116 112 for(var code in result){
117 113 data.push({id: code, text: result[code]});
118 114 }
119   - console.log(data);
120 115 initPinYinSelect2('#line',data,'');
121 116  
122 117 })
123   -
  118 + $('#czcl').on('click', function () {
  119 + $('#code').val('').change();
  120 + });
124 121  
125 122 $('#lpName').select2({
126 123 ajax: {
... ... @@ -200,44 +197,16 @@
200 197 });
201 198  
202 199 var line = $("#line").val();
203   - var startDate = $("#startDate").val();
204   - var endDate = $("#endDate").val();
  200 + var date = $("#startDate").val();
205 201 var lpName = $("#lpName").val();
206 202 var code = $("#code").val();
207 203 $("#query").on("click",function(){
208   - if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
209   - layer.msg("请选择范围！");
210   - return;
211   - }
212   - if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
213   - layer.msg("请选择范围！");
214   - return;
215   - }
216 204 line = $("#line").val();
217   - startDate = $("#startDate").val();
218   - endDate = $("#endDate").val();
  205 + date = $("#date").val();
219 206 lpName = $("#lpName").val();
220 207 code = $("#code").val();
221 208 var type = "query";
222   - $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
223   - $("#sDate").text(startDate);
224   - $("#eDate").text(endDate);
225   - var temp = {};
226   - var today_account = 0;
227   - temp["line"] = $("#line").text() ;
228   - temp["totalAdjustment"] = result.length;
229   -
230   - $.each(result, function(i, obj) {
231   - if(moment(obj.scheduleDate).format("YYYY-MM-DD") == moment(obj.updateDate).format("YYYY-MM-DD")){
232   - today_account++;
233   - }
234   - obj.updateDate = moment(obj.updateDate).format("YYYY-MM-DD HH:mm:ss");
235   - });
236   -
237   - temp["todayAdjustment"] = today_account;
238   - temp["beforeAdjustment"] = result.length-today_account;
239   - temp["historyAdjustment"] = 0;
240   -
  209 + $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
241 210 var list_correctForm = template('list_correctForm',{list:result});
242 211 // 把渲染好的模版html文本追加到表格中
243 212 $('#forms .list_correctForm').html(list_correctForm);
... ... @@ -255,8 +224,8 @@
255 224  
256 225 $("#export").on("click",function(){
257 226 var type = "export";
258   - $get('/realSchedule/correctForm',{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
259   - window.open("/downloadFile/download?fileName=修正报表"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
  227 + $get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
  228 + window.open("/downloadFile/download?fileName=修正报表"+date);
260 229 });
261 230 });
262 231  
... ... @@ -264,38 +233,18 @@
264 233 </script>
265 234 <script type="text/html" id="list_correctForm">
266 235 {{each list as obj i}}
267   - <tr>
268   - <td>{{obj.xlName}}</td>
  236 + <tr>
  237 + <td>{{i+1}}</td>
269 238 <td>{{obj.lpName}}</td>
270 239 <td>{{obj.clZbh}}</td>
271   - <td>{{obj.jName}}</td>
272   - <td>{{obj.sName}}</td>
  240 + <td>{{obj.jName}}/{{obj.jGh}}</td>
273 241 <td>{{obj.fcsj}}</td>
274   - <td>{{obj.fcsjActual}}</td>
275   - <td>{{obj.zdsj}}</td>
276   - <td>{{obj.zdsjActual}}</td>
277   - <td>{{obj.updateBy}}</td>
278   - <td>{{obj.updateDate}}</td>
279   - <td>{{obj.remarks}}</td>
  242 + <td>{{obj.type2}}</td>
280 243 </tr>
281 244 {{/each}}
282 245 {{if list.length == 0}}
283 246 <tr>
284   - <td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
  247 + <td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
285 248 </tr>
286 249 {{/if}}
287 250 </script>
288   -<script type="text/html" id="list_correctForm_statistics">
289   - <tr>
290   - <td colspan="2">线路:</td>
291   - <td>{{line}}</td>
292   - <td>调整总数</td>
293   - <td>{{totalAdjustment}}</td>
294   - <td>事先调整</td>
295   - <td>{{beforeAdjustment}}</td>
296   - <td>当日调整</td>
297   - <td>{{todayAdjustment}}</td>
298   - <td>历史调整</td>
299   - <td colspan="2">{{historyAdjustment}}</td>
300   - </tr>
301   -</script>
302 251 \ No newline at end of file
... ...