潘钊 / bsth_control · Commits

Commit 6d0f7a97f80b0301d9a656a2965f283bb0d9742c

Authored by 廖磊
2 parents 8280bfd3 8314d699
build: skipped

Merge branch 'minhang' of 

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Inline Side-by-side
Showing 13 changed files with 390 additions and 126 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @6d0f7a9
... ... @@ -175,13 +175,14 @@ public class DlbController extends BaseController<Dlb, Integer>{
175 175 resList.add(m);
176 176 }
177 177 try {
  178 + map.put("sheetName", map.get("rq"));
178 179 listI.add(resList.iterator());
179 180 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
180 181 ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
181 182 path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
182 183 } catch (Exception e) {
183 184 e.printStackTrace();
184   - }
  185 + }
185 186  
186 187 return resList;
187 188  
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @6d0f7a9
... ... @@ -276,6 +276,7 @@ public class YlbController extends BaseController<Ylb, Integer>{
276 276 resList.add(m);
277 277 }
278 278 try {
  279 + map.put("sheetName", map.get("rq"));
279 280 listI.add(resList.iterator());
280 281 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
281 282 ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
... ...
src/main/java/com/bsth/data/BasicData.java
  View file @6d0f7a9
... ... @@ -289,7 +289,7 @@ public class BasicData implements CommandLineRunner {
289 289 num = 1;
290 290 lineCode = tempArray[0]+"";
291 291 }
292   - key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
  292 + key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[3];
293 293 tempStationName2YgcNumber.put(key,num++);
294 294 }
295 295 }
... ...
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
  View file @6d0f7a9
... ... @@ -43,7 +43,7 @@ public class CarOutInfoHandler {
43 43 bcTypeMap.put("ldks", "两点间空驶");
44 44 }
45 45  
46   - private static ScheduleComparator.FCSJ schFCSJComparator = new ScheduleComparator.FCSJ();
  46 + private static ScheduleComparator.DFSJ schDFSJComparator = new ScheduleComparator.DFSJ();
47 47  
48 48 @Autowired
49 49 JdbcTemplate jdbcTemplate;
... ... @@ -165,9 +165,9 @@ public class CarOutInfoHandler {
165 165 */
166 166 private ScheduleRealInfo[] nexts(List<ScheduleRealInfo> list) {
167 167 ScheduleRealInfo[] array = new ScheduleRealInfo[3];
168   - Collections.sort(list, schFCSJComparator);
  168 + Collections.sort(list, schDFSJComparator);
169 169  
170   - int count = 0, threshold = 1000 * 60 * 30;
  170 + int count = 0, threshold = 1000 * 60 * 60;
171 171 long t = System.currentTimeMillis();
172 172 for (ScheduleRealInfo sch : list) {
173 173 if (count == 3)
... ...
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
  View file @6d0f7a9
... ... @@ -28,4 +28,12 @@ public class ScheduleComparator {
28 28 return (int) (s1.getFcsjT() - s2.getFcsjT());
29 29 }
30 30 }
  31 +
  32 + public static class DFSJ implements Comparator<ScheduleRealInfo>{
  33 +
  34 + @Override
  35 + public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
  36 + return (int) (s1.getDfsjT() - s2.getDfsjT());
  37 + }
  38 + }
31 39 }
... ...
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @6d0f7a9
... ... @@ -3,7 +3,6 @@ package com.bsth.repository;
3 3 import java.util.List;
4 4 import java.util.Map;
5 5  
6   -import com.bsth.entity.schedule.CarConfigInfo;
7 6 import org.springframework.data.domain.Page;
8 7 import org.springframework.data.domain.Pageable;
9 8 import org.springframework.data.domain.Sort;
... ... @@ -15,7 +14,6 @@ import org.springframework.stereotype.Repository;
15 14 import org.springframework.transaction.annotation.Transactional;
16 15  
17 16 import com.bsth.entity.Line;
18   -import com.bsth.entity.LineInformation;
19 17 import com.bsth.entity.StationRoute;
20 18  
21 19 /**
... ... @@ -262,7 +260,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
262 260 List<StationRoute> findByLineCode(String lineCode);
263 261  
264 262 @Query("SELECT " +
265   - "lineCode,directions,stationName,stationRouteCode " +
  263 + "lineCode,directions,stationName,stationCode " +
266 264 "FROM " +
267 265 "StationRoute s " +
268 266 "WHERE " +
... ...
src/main/java/com/bsth/service/impl/StationServiceImpl.java
  View file @6d0f7a9
... ... @@ -335,7 +335,7 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
335 335 arg0.setDestroy(destroy);
336 336 // 版本号
337 337 arg0.setVersions(versions);
338   - /*arg0.setbJwpoints(bJwpoints);*/
  338 + arg0.setbJwpoints(bJwpoints);
339 339 // 插入站点信息
340 340 repository.save(arg0);
341 341  
... ...
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @6d0f7a9
... ... @@ -140,51 +140,45 @@ public class TrafficManageServiceImpl implements TrafficManageService{
140 140 try {
141 141 Iterator<Line> lineIterator = lineRepository.findAll().iterator();
142 142 Line line = null;
143   - List<StationRoute> stationsList = null;// 站点路由集
  143 + List<StationRoute> upStationsList = null;// 上行站点路由集
  144 + List<StationRoute> downStationsList = null;// 下行站点路由集
144 145 List<LineInformation> lineInformationsList = null;
145 146 LineInformation lineInformation = null;
146   - sBuffer.append("<XLs>");
  147 + sBuffer.append("<Data>");
  148 + sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
  149 + sBuffer.append("<DataList>");
147 150 while(lineIterator.hasNext()){
148 151 line = lineIterator.next();
  152 + if(!line.getName().equals("浦江4路")){
  153 + continue;
  154 + }
149 155 if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
150 156 || line.getInUse() == 0){
151 157 continue;
152 158 }
153   - sBuffer.append("<XL>");
154   - sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
155   - sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
156   - sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
157   - sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
158   - // 线路标准信息实体
159   - lineInformationsList = lineInformationRepository.findByLine(line);
160   - int size = lineInformationsList.size();
161   - if(lineInformationsList != null && size > 0){
162   - double upMileage = 0.0; // 上行里程
163   - double downMileage = 0.0; // 下行里程
164   - // 如果线路标准有多个，累加上行里程和下行里程
165   - for (int i = 0; i < size; i++) {
166   - lineInformation = lineInformationsList.get(i);
167   - upMileage +=lineInformation.getUpMileage();
168   - downMileage +=lineInformation.getDownMileage();
169   - }
170   - sBuffer.append("<QZLC>").append(upMileage).append("</QZLC>");
171   - sBuffer.append("<ZQLC>").append(downMileage).append("</ZQLC>");
172   - }
173   - sBuffer.append("<XLGH>").append(line.getLinePlayType() == null ?"0":line.getLinePlayType())
174   - .append("</XLGH>");
  159 + sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
  160 + sBuffer.append("<LINE_CODE>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</LINE_CODE>");
  161 + sBuffer.append("<LINE_NAME>").append(line.getName()).append("</LINE_NAME>");
175 162 // 循环添加站点信息
176   - sBuffer.append("<StationList>");
  163 + sBuffer.append("<LineStationList>");
177 164 // 先查上行
178   - stationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
  165 + upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
179 166 int startId = 1;
180   - startId = packagStationXml(stationsList, sBuffer, startId);
  167 + startId = packagStationXml(upStationsList, sBuffer, startId);
181 168 // 再查下行
182   - stationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
183   - packagStationXml(stationsList, sBuffer, startId);
184   - sBuffer.append("</StationList>");
185   - sBuffer.append("</XL>");
  169 + downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
  170 + packagStationXml(downStationsList, sBuffer, startId);
  171 + sBuffer.append("</LineStationList>");
  172 +
  173 + // 循环添加站点点位信息
  174 + sBuffer.append("<LinePointList>");
  175 + startId = 1;
  176 + startId = packagStationPointXml(upStationsList, sBuffer, startId);
  177 + packagStationPointXml(downStationsList, sBuffer, startId);
  178 + sBuffer.append("</LinePointList>");
186 179 }
187   - sBuffer.append("</XLs>");
  180 + sBuffer.append("</DataList>");
  181 + sBuffer.append("</Data>");
188 182 System.out.println(sBuffer.toString());
189 183 if(sBuffer.indexOf("<XL>") != -1){
190 184 portType = new Internal().getInternalHttpSoap11Endpoint();
... ... @@ -329,7 +323,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
329 323 sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
330 324 sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
331 325 sf.append("<LDList>");
332   -
333 326 for(ScheduleRealInfo scheduleRealInfo:list){
334 327 if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
335 328 .equals(scheduleRealInfo.getLpName())
... ... @@ -355,7 +348,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
355 348 sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
356 349 sf.append("<FCZDMC>"+scheduleRealInfo.getQdzName()+"</FCZDMC>");
357 350 sf.append("<FCZDXH>" + getYgcStationNumByLineCodeAndDirectionAndStationName(
358   - scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzName()) + "</FCZDXH>");
  351 + scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getQdzCode()) + "</FCZDXH>");
359 352 sf.append("<FCZDBM>"+scheduleRealInfo.getQdzCode()+"</FCZDBM>");
360 353 sf.append("<JHFCSJ>"+scheduleRealInfo.getFcsj()+"</JHFCSJ>");
361 354 sf.append("<DFSJ>"+scheduleRealInfo.getDfsj()+"</DFSJ>");
... ... @@ -363,7 +356,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
363 356 sf.append("<FCZDLX>"+""+"</FCZDLX>");
364 357 sf.append("<DDZDMC>"+scheduleRealInfo.getZdzName()+"</DDZDMC>");
365 358 sf.append("<DDZDXH>"+ getYgcStationNumByLineCodeAndDirectionAndStationName(
366   - scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzName()) +"</DDZDXH>");
  359 + scheduleRealInfo.getXlBm(), scheduleRealInfo.getXlDir(), scheduleRealInfo.getZdzCode()) +"</DDZDXH>");
367 360 sf.append("<DDZDBM>"+scheduleRealInfo.getZdzCode()+"</DDZDBM>");
368 361 sf.append("<JHDDSJ>"+scheduleRealInfo.getZdsj()+"</JHDDSJ>");
369 362 sf.append("<SJDDSJ>"+scheduleRealInfo.getZdsjActual()+"</SJDDSJ>");
... ... @@ -382,6 +375,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
382 375 Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
383 376 if(results.isSuccess()){
384 377 result = "success";
  378 + }else{
  379 + result = "failure";
385 380 }
386 381 logger.info("setLD:"+sf.toString());
387 382 logger.info("setLD:"+result);
... ... @@ -393,11 +388,33 @@ public class TrafficManageServiceImpl implements TrafficManageService{
393 388 Results results = ssop.setLD(userNameOther, passwordOther, sf.toString());
394 389 if(results.isSuccess()){
395 390 result = "success";
  391 + }else{
  392 + result = "failure";
396 393 }
397 394 logger.info("setLD:"+sf.toString());
398 395 logger.info("setLD:"+result);
399 396 }
  397 + } catch (Exception e) {
  398 + logger.error("setLD:",e);
  399 + e.printStackTrace();
  400 + }finally{
400 401  
  402 + }
  403 + return result;
  404 + }
  405 +
  406 + /**
  407 + * 上传路单 xml来自文件
  408 + * @return 上传成功标识
  409 + */
  410 + public String setLDFile(){
  411 + String result = "failure";
  412 + try {
  413 + String tmp = readXmlFromFile("E:/ld.txt");
  414 + Results rss = ssop.setLD(userNameOther, passwordOther, tmp);
  415 + if(rss.isSuccess()){
  416 + result = "success";
  417 + }
401 418 } catch (Exception e) {
402 419 logger.error("setLD:",e);
403 420 e.printStackTrace();
... ... @@ -660,11 +677,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
660 677 sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
661 678 sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
662 679 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
663   - schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzName())).append("</ZDXH>");
  680 + schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getQdzCode())).append("</ZDXH>");
664 681 sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
665 682 sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
666 683 sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
667   - schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzName())).append("</DDXH>");
  684 + schedulePlanInfo.getXlBm(), schedulePlanInfo.getXlDir(), schedulePlanInfo.getZdzCode())).append("</DDXH>");
668 685 sBuffer.append("<JHDDSJ>").append(calcDdsj(schedulePlanInfo.getFcsj(),schedulePlanInfo.getBcsj()))
669 686 .append("</JHDDSJ>");
670 687 sBuffer.append("</BC>");
... ... @@ -767,11 +784,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
767 784 sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
768 785 sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
769 786 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
770   - lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");
  787 + lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationCod())).append("</ZDXH>");
771 788 sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
772 789 sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
773 790 sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
774   - lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</DDXH>");
  791 + lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationCod())).append("</DDXH>");
775 792 sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
776 793 sBuffer.append("</BC>");
777 794 }
... ... @@ -1131,15 +1148,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1131 1148 zdlx = "2";
1132 1149 }
1133 1150 sBuffer.append("<Station>");
1134   - sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationName())).append("</ZDXH>");
1135   - sBuffer.append("<SXX>").append(srRoute.getDirections()).append("</SXX>");
1136   - sBuffer.append("<ZDMC>").append(srRoute.getStationName()).append("</ZDMC>");
1137   - sBuffer.append("<ZDBM>").append(srRoute.getStationCode()).append("</ZDBM>");
1138   - sBuffer.append("<ZDJD>").append(srRoute.getStation().getgLonx()).append("</ZDJD>");
1139   - sBuffer.append("<ZDWD>").append(srRoute.getStation().getgLaty()).append("</ZDWD>");
1140   - sBuffer.append("<ZZ>").append(srRoute.getStation().getAddr()).append("</ZZ>");//站点的具体地址
1141   - sBuffer.append("<ZDLX>").append(zdlx).append("</ZDLX>");
1142   - sBuffer.append("<ZJLC>").append(srRoute.getDistances()).append("</ZJLC>");
  1151 + sBuffer.append("<STATION_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_ID>");
  1152 + sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
  1153 + sBuffer.append("<STATION_NO>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</STATION_NO>");
  1154 + sBuffer.append("<STATION_CODE>").append(srRoute.getStationCode()).append("</STATION_CODE>");
  1155 + sBuffer.append("<STATION_NAME>").append(srRoute.getStationName()).append("</STATION_NAME>");
  1156 + sBuffer.append("<STATION_LON>").append(srRoute.getStation().getgLonx()).append("</STATION_LON>");
  1157 + sBuffer.append("<STATION_LAT>").append(srRoute.getStation().getgLaty()).append("</STATION_LAT>");
  1158 + sBuffer.append("<STATION_TYPE>").append(zdlx).append("</STATION_TYPE>");
  1159 + sBuffer.append("<STATION_DISTANCE>").append(srRoute.getDistances()).append("</STATION_DISTANCE>");
1143 1160 sBuffer.append("</Station>");
1144 1161 startId++;
1145 1162 }
... ... @@ -1147,15 +1164,47 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1147 1164 }
1148 1165  
1149 1166 /**
  1167 + * @param stationsList 站点路由集
  1168 + * @param sBuffer sBuffer
  1169 + * @param startId 站点序号起始ID
  1170 + *
  1171 + * @return 站点序号累加后的ID
  1172 + */
  1173 + private int packagStationPointXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
  1174 + int size = stationsList.size();
  1175 + StationRoute srRoute;
  1176 + String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
  1177 + for (int i = 0; i < size; i++) {
  1178 + srRoute = stationsList.get(i);
  1179 + zdlx = srRoute.getStationMark();
  1180 + if(zdlx.equals("B")){
  1181 + zdlx = "0";
  1182 + }else if(zdlx.equals("E")){
  1183 + zdlx = "1";
  1184 + }else{
  1185 + zdlx = "2";
  1186 + }
  1187 + sBuffer.append("<Point>");
  1188 + sBuffer.append("<POINT_ID>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(srRoute.getLineCode(),srRoute.getDirections()+"",srRoute.getStationCode())).append("</POINT_ID>");
  1189 + sBuffer.append("<UPDDOWN>").append(srRoute.getDirections()).append("</UPDDOWN>");
  1190 + sBuffer.append("<POINTLON>").append(srRoute.getStation().getgLonx()).append("</POINTLON>");
  1191 + sBuffer.append("<POINTLAT>").append(srRoute.getStation().getgLaty()).append("</POINTLAT>");
  1192 + sBuffer.append("</Point>");
  1193 + startId++;
  1194 + }
  1195 + return startId;
  1196 + }
  1197 +
  1198 + /**
1150 1199 *
1151 1200 * @param lineCode 线路编码
1152 1201 * @param direction 线路方向
1153   - * @param stationName 让点名称
  1202 + * @param stationCode 让点名称
1154 1203 * @return 运管处站点序号
1155 1204 */
1156   - private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){
  1205 + private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationCode){
1157 1206 Integer number = 0;
1158   - number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationName);
1159   - return number;
  1207 + number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationCode);
  1208 + return number == null ? 0 : number;
1160 1209 }
1161 1210 }
... ...
src/main/java/com/bsth/util/ReportUtils.java
  View file @6d0f7a9
... ... @@ -47,6 +47,10 @@ public class ReportUtils {
47 47 POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
48 48 sourcePath));
49 49 HSSFWorkbook wb = new HSSFWorkbook(fs);
  50 + Map<String, Object> m = (Map<String, Object>)tArray[0];
  51 + if(m.containsKey("sheetName") && m.get("sheetName")!=null
  52 + && m.get("sheetName").toString().trim().length()!=0)
  53 + wb.setSheetName(0, m.get("sheetName").toString());
50 54 HSSFSheet sheet = wb.getSheetAt(0);
51 55 HSSFRow row;
52 56 HSSFCell cell = null;
... ...
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @6d0f7a9
... ... @@ -325,11 +325,9 @@ var BaseFun = function() {
325 325 },
326 326  
327 327 BXPplaceClassesTime01 : function(saa,cara,map,seMap,dataMap,lpNoA) {
328   - var allJsonD = baseF.plgfbc(saa,cara,map,seMap,dataMap);
329   - var jsonArray = baseF.tzsmbcsj01(baseF.setbcsAndfcno(allJsonD),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
  328 + var jsonArray = baseF.plgfbc(saa,cara,map,seMap,dataMap);
330 329 var list = baseF.splitBxRc(map.bxrc);
331 330 baseF.fprclp01(list,cara);
332   - console.log(list);
333 331 var bxrclist = list.data;
334 332 var rs = new Array(),bxrcgs= new Array();
335 333 // 遍历已分配好路牌的班型人次数组.
... ... @@ -356,12 +354,19 @@ var BaseFun = function() {
356 354 // 按照发车序号顺序排序.
357 355 lpbc.sort(function(a,b){return b.fcno-a.fcno});
358 356 // 调整班次数.也就是说调整工时.
359   - baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa);
360   - rs = rs.concat(lpbc);
  357 + rs = rs.concat(baseF.tzlpgs01(lpbc,hoursV,map,dataMap,lpNo,saa,bxrclist[x].type,lpNo,cara.length));
361 358 }
362 359 }
363   - var jar = baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
364   - //var jar = baseF.tzsmbcsj(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj),lpNoA,dataMap;
  360 + var jar01 = baseF.tzsmbcsj01(
  361 + baseF.setbcsAndfcno(
  362 + baseF.tzsztest(cara,
  363 + baseF.tzsmbcsj01(baseF.setbcsAndfcno(rs),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap),
  364 + dataMap)),
  365 + dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
  366 + baseF.jhfcjx01(jar01,dataMap);
  367 + var jar = baseF.tzsmbcsj01(
  368 + baseF.setbcsAndfcno(baseF.tzsmbcsj01(baseF.setbcsAndfcno(baseF.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap)),
  369 + dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,saa[0].lbsj,dataMap);
365 370 var resultJA = new Array();
366 371 for(var m = 0 ; m < cara.length; m++) {
367 372 // 获取路牌编号.
... ... @@ -369,17 +374,138 @@ var BaseFun = function() {
369 374 // 定义路牌下的所有班次.
370 375 var lpbc_ = new Array();
371 376 // 遍历班次数.
372   - for(var j =0 ; j <jar.length; j++) {
  377 + for(var x =0 ; x <jar.length; x++) {
373 378 // 判断当期遍历的班次是否属于当前的路牌.
374   - if(jar[j].lpNo == lpNo_)
375   - lpbc_.push(jar[j]);
  379 + if(jar[x].lpNo == lpNo_)
  380 + lpbc_.push(jar[x]);
376 381 }
377 382 // 按照发车序号顺序排序.
378 383 lpbc_.sort(function(a,b){return a.fcno-b.fcno});
379 384 resultJA = resultJA.concat(baseF.addjclbbc01(lpbc_,dataMap,saa[0].lbsj,map));
380   - // resultJA = resultJA.concat(lpbc_);
381 385 }
382   - return {'json':resultJA,'bxrcgs':null};
  386 + return {'json':resultJA,'bxrcgs':bxrcgs};
  387 + },
  388 +
  389 + tzsztest : function(cara,tempa,dataMap) {
  390 + var jsrs = new Array();
  391 + for(var t = 0 ; t < cara.length; t++) {
  392 + var sslpbcA = new Array();
  393 + for(var j =0 ; j <tempa.length; j++) {
  394 + // 判断当期遍历的班次是否属于当前的路牌.
  395 + if(tempa[j].lpNo == cara[t].lpNo)
  396 + sslpbcA.push(tempa[j]);
  397 + }
  398 + sslpbcA.sort(function(a,b){return a.fcno-b.fcno});
  399 + baseF.isbczt(sslpbcA,dataMap);
  400 + baseF.istccf(sslpbcA,dataMap);
  401 + baseF.tztzsjInit01(sslpbcA,dataMap);
  402 + jsrs = jsrs.concat(sslpbcA);
  403 + }
  404 + return jsrs;
  405 + },
  406 +
  407 + isbczt : function(ar,dataMap) {
  408 + for(var r = 0 ; r< ar.length-1;r++) {
  409 + if(ar[r].bcType==dataMap.bcTypeArr.cf)
  410 + continue;
  411 + if(ar[r].xlDir == ar[r+1].xlDir) {
  412 + ar.splice(r, 1);
  413 + r--;
  414 + }
  415 +
  416 + }
  417 + },
  418 +
  419 + istccf : function(ar,dataMap) {
  420 + for(var r = 0 ; r < ar.length;r++) {
  421 + if(ar[r].bcType==dataMap.bcTypeArr.cf){
  422 + if(r == ar.length-1){
  423 + ar.splice(r, 1);
  424 + break;
  425 + }else {
  426 + var xbcsj = baseF.getDateTime(ar[r+1].fcsj);
  427 + if(dataMap.wgfsjd[0].st <= xbcsj && xbcsj <= dataMap.wgfsjd[0].ed) {
  428 + ar.splice(r, 1);
  429 + r--;
  430 + }
  431 + }
  432 + }
  433 + }
  434 +
  435 + },
  436 +
  437 + tztzsjInit01 : function(ar,dataMap) {
  438 + for(var r = 0 ; r< ar.length-1;r++) {
  439 + var sgbcfcsj = baseF.getDateTime(ar[r+1].fcsj),dqbcddsj = baseF.getDateTime(ar[r].ARRIVALTIME);
  440 + var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
  441 + if(dxmin<0 || ar[r].STOPTIME<0) {
  442 + var cctag = baseF.dirDmToIndex(ar[r].xlDir);
  443 + dxmin = ar[r].bcType == dataMap.bcTypeArr.cf ? 0 : baseF.isgfsjd01(baseF.getDateTime(ar[r].fcsj),dataMap) ? dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
  444 + dqbcddsj.setMinutes(dqbcddsj.getMinutes() + dxmin);
  445 + ar[r+1].fcsj = baseF.getTimeStr(dqbcddsj);
  446 + dqbcddsj.setMinutes(dqbcddsj.getMinutes() + ar[r+1].bcsj);
  447 + ar[r+1].ARRIVALTIME = baseF.getTimeStr(dqbcddsj);
  448 + /*sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - dxmin);
  449 + ar[r].ARRIVALTIME = baseF.getTimeStr(sgbcfcsj);
  450 + sgbcfcsj.setMinutes(sgbcfcsj.getMinutes() - ar[r].bcsj);
  451 + ar[r].fcsj = baseF.getTimeStr(sgbcfcsj);*/
  452 + }
  453 + ar[r].STOPTIME = dxmin>180 ? 0 : dxmin;
  454 + }
  455 + },
  456 +
  457 + /**
  458 + * @description : (TODO) 均匀发车间隙
  459 + *
  460 + * @params : [arr--某个方向下的班次数组;dir--方向;zzsj--周转时间]
  461 + *
  462 + * @return : 返回一个数组.这里返回的是调整过后 发车间距均匀的班次数组
  463 + **/
  464 + jhfcjx01 : function(bcArr,dataMap) {
  465 + if(bcArr.length<=0)
  466 + return;
  467 + var dirA = dataMap.dira;
  468 + for(var d = 0 ; d < dirA.length; d++) {
  469 + var fxdm = dirA[d],fxbc = new Array();
  470 + var cctag = baseF.dirDmToIndex(fxdm);
  471 + for(var b = 0;b<bcArr.length ; b++) {
  472 + bcArr[b].fcint = baseF.getDateTime(bcArr[b].fcsj).getTime();
  473 + if(bcArr[b].xlDir == fxdm)
  474 + fxbc.push(bcArr[b]);
  475 + }
  476 + var kssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].kssj),// 开始时间.
  477 + jssj = baseF.getDateTime(dataMap.smbcsjArr[cctag].jssj);// 结束时间.
  478 + fxbc.sort(function(m,n){return m.fcint - n.fcint});
  479 + while(kssj<=jssj) {
  480 + var tagboolean = baseF.isgfsjd01(kssj,dataMap);
  481 + var zzsj = tagboolean ? dataMap.zzsj.gfzzsj : dataMap.zzsj.dgzzsj;
  482 + if(!tagboolean){
  483 + var temp = new Date();
  484 + temp.setHours(kssj.getHours());
  485 + temp.setMinutes(kssj.getMinutes()+zzsj);
  486 + var sjdbcArr = baseF.getObjRegion(kssj,temp,fxbc,dataMap);
  487 + var len_ = sjdbcArr.length;
  488 + var bcCount = baseF.getlpNum(sjdbcArr);// 定长度
  489 + if(len_>0 && bcCount > 0) {
  490 + var _fcjx = parseInt(Math.ceil(zzsj/bcCount));
  491 + var fcnosj = new Date(kssj);
  492 + for(var l = 0 ; l< len_ ; l++) {
  493 + sjdbcArr[l].fcsj = baseF.getTimeStr(fcnosj);
  494 + var _xxsj = baseF.getxssj(dataMap.zgfsjd,
  495 + dataMap.wgfsjd,fcnosj,dataMap.pcxssjArr,
  496 + dataMap.gfxxsjArr,baseF.dirDmToIndex(sjdbcArr[l].xlDir));// 获取行驶时间
  497 + sjdbcArr[l].bcsj = _xxsj;
  498 + var ddsj = new Date();
  499 + ddsj.setHours(fcnosj.getHours());
  500 + ddsj.setMinutes(fcnosj.getMinutes()+_xxsj);
  501 + sjdbcArr[l].ARRIVALTIME = baseF.getTimeStr(ddsj);
  502 + fcnosj.setMinutes(fcnosj.getMinutes() + _fcjx);
  503 + }
  504 + }
  505 + }
  506 + kssj = new Date(kssj.setMinutes(kssj.getMinutes() + zzsj));
  507 + }
  508 + }
383 509 },
384 510  
385 511 /**
... ... @@ -432,20 +558,10 @@ var BaseFun = function() {
432 558 * @param [arr--当前路牌下的班次数组;gs--当前路牌的总工时;dataMap--参数信息;lpNo--路牌编码;saa--参数信息]
433 559 *
434 560 * */
435   - tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa) {
  561 + tzlpgs01 : function(arr,gs,map,dataMap,lpNo,saa,type,lpNo,cla) {
436 562 // 定义当前路牌的进场时间、早晚例保时间.
437 563 var jczwsj = saa[0].lbsj*2 + dataMap.ccsjArr[baseF.dirDmToIndex(arr[0].xlDir)] +
438 564 dataMap.jcsjArr[baseF.dirDmToIndex(arr[arr.length-1].xlDir)];
439   - // 定义开始、结束时间.
440   - //var st = null , ed = null;
441   - // 根据路牌编码依次轮流取高峰之间和晚高峰之后的时间段.
442   - /*if(lpNo%2!=0) {
443   - st = dataMap.gfzjsjd[0].st;
444   - ed = dataMap.gfzjsjd[0].ed;
445   - }else {
446   - st = dataMap.wgfzhsjd[0].st;
447   - ed = dataMap.wgfzhsjd[0].ed;
448   - }*/
449 565 // 定义路牌总工时.第一次切高峰之间和晚高峰之后的班次.
450 566 var lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
451 567 while(lpdqzgs>gs) {
... ... @@ -453,31 +569,66 @@ var BaseFun = function() {
453 569 // 得到当前路牌下的发车时间.
454 570 var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
455 571 // 判断时间范围.
456   - if(!baseF.isgfsjd01(dqbcfcsj,dataMap)) {
  572 + if(!baseF.issplice(dqbcfcsj,dataMap,type,lpNo,cla)) {
457 573 arr.splice(t,1);
458 574 break;
459 575 }
460 576 }
461 577 lpdqzgs = parseFloat(((baseF.getlpzgs(arr) + jczwsj)/60).toFixed(2));
462 578 }
463   - // 判断总工时是否大于班型对应的工时.
464   - /*if(lpdqzgs>gs) {
465   - // 定义相差值.
466   - var dx = parseFloat((lpdqzgs - gs).toFixed(2));
467   - // 定义圈数.
468   - var qs = Math.round(dx*60/70);
469   - for(var t = 0 ; t<arr.length;t++) {
470   - // 得到当前路牌下的发车时间.
471   - var dqbcfcsj = baseF.getDateTime(arr[t].fcsj);
472   - // 判断时间范围.
473   - if(dqbcfcsj>st && dqbcfcsj<ed) {
474   - arr[t-1].STOPTIME = 0;
475   - // 切割.
476   - arr.splice(t,qs*2);
477   - break;
  579 + for(var c = 0 ; c<arr.length;c++) {
  580 + var cfsjbc = baseF.getDateTime(arr[c].fcsj);
  581 + if(dataMap.gfzjsjd[0].st <= cfsjbc && cfsjbc <= dataMap.gfzjsjd[0].ed && arr[c].bcType == dataMap.bcTypeArr.cf )
  582 + gfzjst = baseF.getDateTime(arr[c].ARRIVALTIME);
  583 + }
  584 + gfzjst == null ? dataMap.gfzjsjd[0].st : gfzjst;
  585 + var gfzjbc = new Array(),wgfbc = new Array(),zgfbc = new Array();
  586 + for(var a = 0 ; a<arr.length;a++) {
  587 + var tmkssj = baseF.getDateTime(arr[a].fcsj)
  588 + if(gfzjst <= tmkssj && tmkssj <= dataMap.gfzjsjd[0].ed)
  589 + gfzjbc.push(arr[a]);
  590 + else if(dataMap.wgfsjd[0].st <= tmkssj && tmkssj <= dataMap.wgfsjd[0].ed)
  591 + wgfbc.push(arr[a]);
  592 + else
  593 + zgfbc.push(arr[a]);
  594 + }
  595 + gfzjbc.sort(function(a,b){return a.fcno-b.fcno});
  596 + wgfbc.sort(function(a,b){return a.fcno-b.fcno});
  597 + if(gfzjbc[gfzjbc.length-1].xlDir == wgfbc[0].xlDir)
  598 + gfzjbc.splice(gfzjbc.length-1,1);
  599 + if(type!='五工二休') {
  600 + var gfzjst = null;
  601 + var dxmin = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
  602 + var addmin = parseInt(dxmin/gfzjbc.length);
  603 + for(var g = 0 ;g < gfzjbc.length;g++) {
  604 + if(gfzjbc[g].bcType != dataMap.bcTypeArr.cf)
  605 + gfzjbc[g].STOPTIME = gfzjbc[g].STOPTIME + addmin;
  606 + if(g==0) {
  607 + continue;
  608 + }else {
  609 + var tempd = baseF.getDateTime(gfzjbc[g-1].ARRIVALTIME);
  610 + tempd.setMinutes(tempd.getMinutes() + gfzjbc[g-1].STOPTIME);
  611 + gfzjbc[g].fcsj = baseF.getTimeStr(tempd);
  612 + tempd.setMinutes(tempd.getMinutes() + gfzjbc[g].bcsj);
  613 + gfzjbc[g].ARRIVALTIME = baseF.getTimeStr(tempd);
478 614 }
479 615 }
480   - }*/
  616 + gfzjbc[gfzjbc.length-1].STOPTIME = parseInt((baseF.getDateTime(wgfbc[0].fcsj) - baseF.getDateTime(gfzjbc[gfzjbc.length-1].ARRIVALTIME))/60000);
  617 + }
  618 + return gfzjbc.concat(wgfbc).concat(zgfbc);
  619 + },
  620 +
  621 + issplice : function (kssj,dataMap,type,lpNo,cla){
  622 + var tag = false;
  623 + if(type=='五工二休' || lpNo <Math.round(cla/2)) {
  624 + if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) ||
  625 + ( dataMap.wgfsjd[0].st <= kssj && kssj <= dataMap.wgfsjd[0].ed))
  626 + tag = true;
  627 + }else {
  628 + if(dataMap.zgfsjd[0].ed >= kssj || kssj >= dataMap.wgfsjd[0].st)
  629 + tag = true;
  630 + }
  631 + return tag;
481 632 },
482 633  
483 634 /**
... ... @@ -966,6 +1117,15 @@ var BaseFun = function() {
966 1117 return tag;
967 1118 },
968 1119  
  1120 + getcfdd : function(value,dirc) {
  1121 + var inv;
  1122 + if(value =='allYes')
  1123 + inv = parseInt(dirc);
  1124 + else
  1125 + inv = parseInt(value);
  1126 + return inv;
  1127 + },
  1128 +
969 1129 plgfbc : function(saa , cara , map, seMap ,dataMap) {
970 1130 var len = cara.length,rs = new Array();
971 1131 var lbsj = map.lb=='' ? 0:parseInt(map.lb);
... ... @@ -982,14 +1142,16 @@ var BaseFun = function() {
982 1142 while(kssj<=endTime) {
983 1143 cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
984 1144 fxTagDm = 1;
  1145 + var cfdd = baseF.getcfdd(map.cfdd,cctag);
985 1146 if(kssj> new Date (baseF.getCFDate(10,30)) &&
986   - kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
  1147 + kssj<new Date (baseF.getCFDate(11,30)) && $_cfn<1 && cfdd == cctag) {
987 1148 $_cfn++;
988 1149 rs.push(baseF.getbcObj(
989 1150 kssj,dataMap.zwcArr[0],cara[c],dataMap.bcTypeArr.cf,
990 1151 dataMap.dira[cctag],xhNo++,0,map,0,null,null,null,0,0));// 午餐班次
991 1152 }else if(kssj> new Date (baseF.getCFDate(18,30)) &&
992   - kssj<new Date (baseF.getCFDate(20,0)) && $_cfw<1 ) {
  1153 + kssj<new Date (baseF.getCFDate(19,30)) && $_cfw<1 && cfdd == cctag &&
  1154 + parseInt((endTime-kssj)/60000) > parseInt(dataMap.zwcArr[1])) {
993 1155 $_cfw++;
994 1156 rs.push(baseF.getbcObj(
995 1157 kssj,dataMap.zwcArr[1],cara[c],dataMap.bcTypeArr.cf,
... ... @@ -1009,8 +1171,7 @@ var BaseFun = function() {
1009 1171 return rs;
1010 1172 },
1011 1173  
1012   - isgfsjd01 :　function(kssj,dataMap) {
1013   -
  1174 + isgfsjd01 :　function(kssj,dataMap,type) {
1014 1175 var tag = false;
1015 1176 if((dataMap.zgfsjd[0].st <=kssj && kssj<= dataMap.zgfsjd[0].ed ) || ( dataMap.wgfsjd[0].st <= kssj && kssj <= dataMap.wgfsjd[0].ed))
1016 1177 tag = true;
... ... @@ -1178,8 +1339,8 @@ var BaseFun = function() {
1178 1339 *
1179 1340 * @return : 返回一个数组对象。这里返回的是时刻表明细数据
1180 1341 **/
1181   - tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj) {
1182   - var _obj = baseF.getsxAndxxbc(list);
  1342 + tzsmbcsj01 : function(list,smbcsj,sj,cl,zd,lbsj,dm) {
  1343 + var _obj = baseF.getsxAndxxbc(list,dm);
1183 1344 baseF.tcbc(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj ,_obj.xxbc);// 剔除上行不在时间范围内的班次
1184 1345 baseF.tcbc(_obj.xxbc,smbcsj[1].kssj,smbcsj[1].jssj,_obj.sxbc);// 剔除下行不在时间范围内的班次
1185 1346 baseF.dzsmsj(_obj.sxbc,smbcsj[0].kssj,smbcsj[0].jssj,_obj.xxbc);// 调整上行首末班车时间
... ... @@ -1191,7 +1352,7 @@ var BaseFun = function() {
1191 1352 if(baseF.isDelete(baseF.getDateTime(kssj),
1192 1353 baseF.getDateTime(jssj),
1193 1354 baseF.getDateTime(ar[s].fcsj))) {
1194   - var tempa = ar.concat(ppar),sslpA = new Array();
  1355 + /*var tempa = ar.concat(ppar),sslpA = new Array();
1195 1356 for(var r = 0 ; r<tempa.length;r++) {
1196 1357 if(tempa[r].lpNo == ar[s].lpNo)
1197 1358 sslpA.push(tempa[r]);
... ... @@ -1211,7 +1372,7 @@ var BaseFun = function() {
1211 1372 break;
1212 1373 }
1213 1374 }
1214   - }
  1375 + }*/
1215 1376 ar.splice(s, 1);
1216 1377 s--;
1217 1378 }
... ... @@ -1331,15 +1492,19 @@ var BaseFun = function() {
1331 1492 return tag;
1332 1493 },
1333 1494  
1334   - getsxAndxxbc : function(json) {
  1495 + getsxAndxxbc : function(json,dataMap) {
1335 1496 var upArray = new Array(),downArray = new Array(),qt = new Array();
1336 1497 for(var j = 0 ; j< json.length ; j++) {
1337   - if(json[j].bcType=='normal' || json[j].bcType=='region') {
  1498 + //json[j].fcint = baseF.getDateTime(json[j].fcsj).getTime();
  1499 + if(json[j].bcType== dataMap.bcTypeArr.normal ||
  1500 + json[j].bcType== dataMap.bcTypeArr.region ||
  1501 + json[j].bcType== dataMap.bcTypeArr.major ||
  1502 + json[j].bcType== dataMap.bcTypeArr.venting) {
1338 1503 if(json[j].xlDir == 'relationshipGraph-up')
1339 1504 upArray.push(json[j]);
1340 1505 else if(json[j].xlDir == 'relationshipGraph-down')
1341 1506 downArray.push(json[j]);
1342   - }else {
  1507 + }else if(json[j].bcType == dataMap.bcTypeArr.cf) {
1343 1508 qt.push(json[j]);
1344 1509 }
1345 1510 }
... ... @@ -1676,24 +1841,26 @@ var BaseFun = function() {
1676 1841 dqbcddsj.setMinutes(dqbcddsj.getMinutes() + _xxsj);
1677 1842 xgbc.ARRIVALTIME = baseF.getTimeStr(dqbcddsj);// 修改下个班次的到达时间
1678 1843 },
1679   - getObjRegion : function(t1,t2,arr) {
  1844 + getObjRegion : function(t1,t2,arr,dataMap) {
1680 1845 var _r = new Array();
1681 1846 for(var p= 0; p<arr.length ; p++) {
1682 1847 var _t = baseF.getDateTime(arr[p].fcsj);
1683   - if(_t >= t1 && _t <= t2)
  1848 + if(_t >= t1 && _t <= t2 && arr[p].bcType != dataMap.bcTypeArr.cf )
1684 1849 _r.push(arr[p]);
1685 1850 }
1686   - /*return baseF.sortDirArray(_r);*/
1687 1851 return _r.sort(function(a,b){return a.fcno-b.fcno});
1688 1852 },
1689 1853  
1690   - getlpNum : function(arr) {
1691   - var array = new Array();
1692   - for(var r = 0 ; r < arr.length ; r++) {
1693   - if(array.indexOf(arr[r].lpNo)<0)
1694   - array.push(arr[r].lpNo);
  1854 + getlpNum : function(sz) {
  1855 + var temparray = new Array(),len_ = 0;
  1856 + for(var r = 0 ; r <sz.length ; r++) {
  1857 + if(temparray.indexOf(sz[r].lpNo)<0){
  1858 + temparray.push(sz[r].lpNo);
  1859 + }
1695 1860 }
1696   - return (array.length-1);
  1861 + len_ = temparray.length;
  1862 + temparray = null;
  1863 + return len_;
1697 1864 },
1698 1865 /**
1699 1866 * @description : (TODO)更新进场与离场班次
... ...
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
  View file @6d0f7a9
... ... @@ -219,11 +219,11 @@ $(&#39;.updownread&#39;).on(&#39;click&#39;,function() {
219 219 // 执行选择框关闭函数.
220 220 RelationshipGraph.gClose();
221 221 // 执行均匀发车间隙函数.
222   - RelationshipGraph.updownread();
  222 + RelationshipGraph.updownread01();
223 223 });
224 224 }else {
225 225 // 执行均匀发车间隙函数
226   - RelationshipGraph.updownread();
  226 + RelationshipGraph.updownread01();
227 227 }
228 228 });
229 229 /************************************************************************************************************************************************/
... ... @@ -1226,6 +1226,43 @@ var RelationshipGraph = function () {
1226 1226 }
1227 1227 }
1228 1228 }, {
  1229 + key : 'updownread01',
  1230 + value : function updownread01() {
  1231 + // 1、获取所有班次数.
  1232 + var list = $_GlobalGraph.getDataArray();
  1233 + var dataMap = $_GlobalGraph.configuration.dataMap;
  1234 + var rsmap = BaseFun.getsxAndxxbc(list,dataMap);
  1235 + var cara = $_GlobalGraph.configuration.taskTypes;
  1236 + var jar01 = rsmap.qt.concat(rsmap.sxbc).concat(rsmap.xxbc);
  1237 + BaseFun.jhfcjx01(jar01,dataMap);
  1238 + var jar = BaseFun.tzsmbcsj01(
  1239 + BaseFun.setbcsAndfcno(BaseFun.tzsmbcsj01(BaseFun.setbcsAndfcno(BaseFun.tzsztest(cara,jar01,dataMap)),dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap)),
  1240 + dataMap.smbcsjArr,dataMap.ccsjArr,dataMap.cclcArr,dataMap.qdzArr,dataMap.lbsj,dataMap);
  1241 + var resultJA = new Array();
  1242 + for(var m = 0 ; m < cara.length; m++) {
  1243 + // 获取路牌编号.
  1244 + var lpNo_ = cara[m].lpNo;
  1245 + // 定义路牌下的所有班次.
  1246 + var lpbc_ = new Array();
  1247 + // 遍历班次数.
  1248 + for(var x =0 ; x <jar.length; x++) {
  1249 + // 判断当期遍历的班次是否属于当前的路牌.
  1250 + if(jar[x].lpNo == lpNo_)
  1251 + lpbc_.push(jar[x]);
  1252 + }
  1253 + // 按照发车序号顺序排序.
  1254 + lpbc_.sort(function(a,b){return a.fcno-b.fcno});
  1255 + resultJA = resultJA.concat(BaseFun.addjclbbc01(lpbc_,dataMap,dataMap.lbsj,dataMap.map));
  1256 + }
  1257 + // 删除图形.
  1258 + $('svg.svg-chart').remove();
  1259 + // 重新创建图形.
  1260 + var graph_ = d3.select('#ganttSvg').relationshipGraph($_GlobalGraph.configuration);
  1261 + // 根据数据重新渲染图形.
  1262 + graph_.data(resultJA);
  1263 + $_GlobalGraph = graph_;
  1264 + }
  1265 + }, {
1229 1266 key :　'updownread',
1230 1267 value : function updownread() {
1231 1268 //var index = layer.load(1, {shade: [0.1,'#fff'] });//0.1透明度的白色背景
... ...
src/main/resources/static/pages/base/timesmodel/js/gantt.js
  View file @6d0f7a9
... ... @@ -32,7 +32,6 @@
32 32 });
33 33 $('.tipso-animation').tipso('show');
34 34 setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
35   - console.log(map);
36 35 //debugger;
37 36 // 1、定义开始与结束时间点字符串.
38 37 var seMap = getStartAndEndDate(map);
... ...
src/main/resources/static/pages/base/timesmodel/tepms/bctype_temp.html
  View file @6d0f7a9
... ... @@ -267,8 +267,8 @@
267 267 <div class="col-md-5">
268 268 <select type="text" class="form-control" name="cfdd" id="cfddSelect">
269 269 <option value="">请选择...</option>
270   - <option value="{{map.line.startStationName}}">{{map.line.startStationName}}</option>
271   - <option value="{{map.line.endStationName}}">{{map.line.endStationName}}</option>
  270 + <option value="0">{{map.line.startStationName}}</option>
  271 + <option value="1">{{map.line.endStationName}}</option>
272 272 <option value="allYes">起终点站都可以</option>
273 273 </select>
274 274 </div>
... ...