潘钊 / bsth_control · Commits

Commit 966e73ff8abe92ddb51cad8ac6321fd126e49bfb

Authored by 廖磊
2 parents 0aec0bd1 5bf9656a
build: skipped

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into 

minhang
Inline Side-by-side
Showing 47 changed files with 2196 additions and 1807 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 47 of 113 files are displayed.

src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
  View file @966e73f
1 package com.bsth.controller.realcontrol; 1 package com.bsth.controller.realcontrol;
2 2
3 -import java.util.Map;  
4 -  
5 -import org.springframework.beans.factory.annotation.Autowired;  
6 -import org.springframework.web.bind.annotation.PathVariable;  
7 -import org.springframework.web.bind.annotation.RequestMapping;  
8 -import org.springframework.web.bind.annotation.RequestMethod;  
9 -import org.springframework.web.bind.annotation.RequestParam;  
10 -import org.springframework.web.bind.annotation.RestController;  
11 -  
12 import com.bsth.controller.BaseController; 3 import com.bsth.controller.BaseController;
13 import com.bsth.entity.realcontrol.LineConfig; 4 import com.bsth.entity.realcontrol.LineConfig;
14 import com.bsth.service.realcontrol.LineConfigService; 5 import com.bsth.service.realcontrol.LineConfigService;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.web.bind.annotation.*;
  8 +
  9 +import java.util.Map;
15 10
16 @RestController 11 @RestController
17 @RequestMapping("/lineConfig") 12 @RequestMapping("/lineConfig")
@@ -39,4 +34,9 @@ public class LineConfigController extends BaseController<LineConfig, Integer>{ @@ -39,4 +34,9 @@ public class LineConfigController extends BaseController<LineConfig, Integer>{
39 public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){ 34 public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
40 return lineConfigService.editOutTimeType(lineCode, type); 35 return lineConfigService.editOutTimeType(lineCode, type);
41 } 36 }
  37 +
  38 + @RequestMapping(value = "/getByLineCode")
  39 + public LineConfig getByLineCode(@RequestParam String lineCode){
  40 + return lineConfigService.getByLineCode(lineCode);
  41 + }
42 } 42 }
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
  View file @966e73f
@@ -26,4 +26,13 @@ public class RealMapController { @@ -26,4 +26,13 @@ public class RealMapController {
26 public Map<String, Object> stationSpatialData(@RequestParam String idx){ 26 public Map<String, Object> stationSpatialData(@RequestParam String idx){
27 return realMapService.stationSpatialData(idx); 27 return realMapService.stationSpatialData(idx);
28 } 28 }
  29 +
  30 + /**
  31 + * 停车场
  32 + * @return
  33 + */
  34 + @RequestMapping(value = "/carParkSpatialData")
  35 + public Map<String, Object> carParkSpatialData(){
  36 + return realMapService.carParkSpatialData();
  37 + }
29 } 38 }
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
  View file @966e73f
@@ -3,25 +3,24 @@ package com.bsth.controller.schedule; @@ -3,25 +3,24 @@ package com.bsth.controller.schedule;
3 import com.bsth.service.TrafficManageService; 3 import com.bsth.service.TrafficManageService;
4 4
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 -import org.springframework.web.bind.annotation.PathVariable;  
7 import org.springframework.web.bind.annotation.RequestMapping; 6 import org.springframework.web.bind.annotation.RequestMapping;
8 import org.springframework.web.bind.annotation.RequestMethod; 7 import org.springframework.web.bind.annotation.RequestMethod;
9 import org.springframework.web.bind.annotation.RequestParam; 8 import org.springframework.web.bind.annotation.RequestParam;
10 import org.springframework.web.bind.annotation.RestController; 9 import org.springframework.web.bind.annotation.RestController;
11 10
12 /** 11 /**
13 - * 12 + *
14 * @author BSTH 13 * @author BSTH
15 * 14 *
16 */ 15 */
17 @RestController 16 @RestController
18 @RequestMapping("trmg") 17 @RequestMapping("trmg")
19 public class TrafficManageController { 18 public class TrafficManageController {
20 - 19 +
21 @Autowired 20 @Autowired
22 - private TrafficManageService trManageService;  
23 -  
24 - 21 + private TrafficManageService trManageService;
  22 +
  23 +
25 @RequestMapping(value = "/setXL", method = RequestMethod.GET) 24 @RequestMapping(value = "/setXL", method = RequestMethod.GET)
26 public String setXL() throws Exception { 25 public String setXL() throws Exception {
27 try { 26 try {
@@ -30,7 +29,7 @@ public class TrafficManageController { @@ -30,7 +29,7 @@ public class TrafficManageController {
30 throw new Exception(exp.getCause()); 29 throw new Exception(exp.getCause());
31 } 30 }
32 } 31 }
33 - 32 +
34 @RequestMapping(value = "/setCL", method = RequestMethod.GET) 33 @RequestMapping(value = "/setCL", method = RequestMethod.GET)
35 public String setCL() throws Exception { 34 public String setCL() throws Exception {
36 try { 35 try {
@@ -39,7 +38,7 @@ public class TrafficManageController { @@ -39,7 +38,7 @@ public class TrafficManageController {
39 throw new Exception(exp.getCause()); 38 throw new Exception(exp.getCause());
40 } 39 }
41 } 40 }
42 - 41 +
43 @RequestMapping(value = "/setSJ", method = RequestMethod.GET) 42 @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
44 public String setSJ() throws Exception { 43 public String setSJ() throws Exception {
45 try { 44 try {
@@ -48,16 +47,43 @@ public class TrafficManageController { @@ -48,16 +47,43 @@ public class TrafficManageController {
48 throw new Exception(exp.getCause()); 47 throw new Exception(exp.getCause());
49 } 48 }
50 } 49 }
51 -  
52 - @RequestMapping(value = "/setCS", method = RequestMethod.GET)  
53 - public String setCS() throws Exception { 50 +
  51 + @RequestMapping(value = "/setLD", method = RequestMethod.GET)
  52 + public String setLD() throws Exception {
54 try { 53 try {
55 - return trManageService.setCS(); 54 + return trManageService.setLD();
  55 + } catch (Exception exp) {
  56 + throw new Exception(exp.getCause());
  57 + }
  58 + }
  59 +
  60 + @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
  61 + public String setLCYH() throws Exception {
  62 + try {
  63 + return trManageService.setLCYH();
  64 + } catch (Exception exp) {
  65 + throw new Exception(exp.getCause());
  66 + }
  67 + }
  68 +
  69 + @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
  70 + public String setDDRB() throws Exception {
  71 + try {
  72 + return trManageService.setDDRB();
56 } catch (Exception exp) { 73 } catch (Exception exp) {
57 throw new Exception(exp.getCause()); 74 throw new Exception(exp.getCause());
58 } 75 }
59 } 76 }
60 - 77 +
  78 + @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
  79 + public String setJHBC() throws Exception {
  80 + try {
  81 + return trManageService.setJHBC();
  82 + } catch (Exception exp) {
  83 + throw new Exception(exp.getCause());
  84 + }
  85 + }
  86 +
61 @RequestMapping(value = "/setSKB", method = RequestMethod.GET) 87 @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
62 public String setSKB(@RequestParam("ids") String ids) throws Exception { 88 public String setSKB(@RequestParam("ids") String ids) throws Exception {
63 try { 89 try {
@@ -66,7 +92,7 @@ public class TrafficManageController { @@ -66,7 +92,7 @@ public class TrafficManageController {
66 throw new Exception(exp.getCause()); 92 throw new Exception(exp.getCause());
67 } 93 }
68 } 94 }
69 - 95 +
70 @RequestMapping(value = "/setXLPC", method = RequestMethod.GET) 96 @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
71 public String setXLPC() throws Exception { 97 public String setXLPC() throws Exception {
72 try { 98 try {
@@ -75,13 +101,23 @@ public class TrafficManageController { @@ -75,13 +101,23 @@ public class TrafficManageController {
75 throw new Exception(exp.getCause()); 101 throw new Exception(exp.getCause());
76 } 102 }
77 } 103 }
78 -  
79 - @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)  
80 - public String setJHBC() throws Exception { 104 +
  105 + @RequestMapping(value = "/setCS", method = RequestMethod.GET)
  106 + public String setCS() throws Exception {
81 try { 107 try {
82 - return trManageService.setDDRB(); 108 + return trManageService.setCS();
83 } catch (Exception exp) { 109 } catch (Exception exp) {
84 throw new Exception(exp.getCause()); 110 throw new Exception(exp.getCause());
85 } 111 }
86 } 112 }
  113 +
  114 + @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
  115 + public String getDownLoadAllDataFile() throws Exception {
  116 + try {
  117 + return trManageService.getDownLoadAllDataFile();
  118 + } catch (Exception exp) {
  119 + throw new Exception(exp.getCause());
  120 + }
  121 + }
  122 +
87 } 123 }
src/main/java/com/bsth/data/BasicData.java
  View file @966e73f
@@ -70,7 +70,7 @@ public class BasicData implements CommandLineRunner { @@ -70,7 +70,7 @@ public class BasicData implements CommandLineRunner {
70 public static Map<String, String> allPerson; 70 public static Map<String, String> allPerson;
71 71
72 //站点名和运管处编号 对照 72 //站点名和运管处编号 对照
73 - public static Map<String, Map<String, Map>> stationName2YgcNumber; 73 + public static Map<String,Integer> stationName2YgcNumber;
74 74
75 75
76 static Logger logger = LoggerFactory.getLogger(BasicData.class); 76 static Logger logger = LoggerFactory.getLogger(BasicData.class);
@@ -233,13 +233,6 @@ public class BasicData implements CommandLineRunner { @@ -233,13 +233,6 @@ public class BasicData implements CommandLineRunner {
233 * @Description: TODO(加载线路相关信息) 233 * @Description: TODO(加载线路相关信息)
234 */ 234 */
235 public void loadLineInfo(){ 235 public void loadLineInfo(){
236 - List<StationRoute> stationsList = null;// 站点路由集  
237 - StationRoute stationRoute = null;  
238 - int size = 0;  
239 - Map<String, Integer> station2Number ;  
240 - Map<String, Map> dirs2Statioin ;  
241 - int[] dirs = {0,1};// 运行方向 上下行  
242 - int num = 1;  
243 Iterator<Line> iterator = lineRepository.findAll().iterator(); 236 Iterator<Line> iterator = lineRepository.findAll().iterator();
244 237
245 Line line; 238 Line line;
@@ -247,7 +240,7 @@ public class BasicData implements CommandLineRunner { @@ -247,7 +240,7 @@ public class BasicData implements CommandLineRunner {
247 Map<String, String> code2name = new HashMap<>(); 240 Map<String, String> code2name = new HashMap<>();
248 Map<Integer, String> id2SHcode = new HashMap<Integer, String>(); 241 Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
249 Map<String, String> code2SHcode = new HashMap<String, String>(); 242 Map<String, String> code2SHcode = new HashMap<String, String>();
250 - Map<String, Map<String, Map>> tempStationName2YgcNumber = new HashMap<String, Map<String, Map>>(); 243 + Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
251 244
252 while(iterator.hasNext()){ 245 while(iterator.hasNext()){
253 line = iterator.next(); 246 line = iterator.next();
@@ -259,27 +252,26 @@ public class BasicData implements CommandLineRunner { @@ -259,27 +252,26 @@ public class BasicData implements CommandLineRunner {
259 /** 252 /**
260 * 加载运管处的站点及序号 253 * 加载运管处的站点及序号
261 * 上行从1开始，下行顺序续编 254 * 上行从1开始，下行顺序续编
262 -  
263 - num = 1;  
264 - dirs2Statioin = new HashMap<String, Map>();  
265 - for (int i = 0; i < dirs.length; i++) {  
266 - // 分别取得上下行的站点  
267 - stationsList = stationRouteRepository.findByLine(line.getLineCode(), dirs[i]);  
268 - size = stationsList == null ? 0 :stationsList.size();  
269 - if(size > 0 ){  
270 - station2Number = new HashMap<String, Integer>();  
271 - for (int j = 0; j < size; j++) {  
272 - stationRoute = stationsList.get(j);  
273 - // map保存为（站点名称 -->序号）  
274 - station2Number.put(stationRoute.getStationName(), num++); 255 + */
  256 + List<Object[]> ygcLines = stationRouteRepository.findAllLineWithYgc();
  257 + if(ygcLines != null && ygcLines.size() > 0){
  258 + int size = ygcLines.size();
  259 + Object[] tempArray ;
  260 + int num = 1;
  261 + String key;
  262 + String lineCode = "";
  263 + for (int i = 0; i < size; i ++){
  264 + tempArray = ygcLines.get(i);
  265 + if(lineCode.equals("")){
  266 + lineCode = tempArray[0]+"";
  267 + }else if(!lineCode.equals(tempArray[0]+"")){
  268 + num = 1;
  269 + lineCode = tempArray[0]+"";
275 } 270 }
276 - // 保存两个数据，（0 --> station2Number）（1 --> station2Number） 0上行 1 下行  
277 - dirs2Statioin.put(dirs[i]+"", station2Number); 271 + key = tempArray[0] + "_"+tempArray[1] + "_"+tempArray[2];
  272 + tempStationName2YgcNumber.put(key,num++);
278 } 273 }
279 } 274 }
280 - // 保存(站点编码 --> dirs2Statioin)  
281 - tempStationName2YgcNumber.put(line.getLineCode(), dirs2Statioin);  
282 - */  
283 } 275 }
284 276
285 lineId2CodeMap = biMap; 277 lineId2CodeMap = biMap;
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
  View file @966e73f
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata; @@ -2,6 +2,7 @@ package com.bsth.data.gpsdata;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
  5 +import com.bsth.Application;
5 import com.bsth.data.BasicData; 6 import com.bsth.data.BasicData;
6 import com.bsth.data.forecast.ForecastRealServer; 7 import com.bsth.data.forecast.ForecastRealServer;
7 import com.bsth.data.schedule.DayOfSchedule; 8 import com.bsth.data.schedule.DayOfSchedule;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Component; @@ -23,6 +24,7 @@ import org.springframework.stereotype.Component;
23 import java.io.BufferedReader; 24 import java.io.BufferedReader;
24 import java.io.InputStreamReader; 25 import java.io.InputStreamReader;
25 import java.util.*; 26 import java.util.*;
  27 +import java.util.concurrent.TimeUnit;
26 28
27 /** 29 /**
28 * 30 *
@@ -65,7 +67,7 @@ public class GpsRealData implements CommandLineRunner{ @@ -65,7 +67,7 @@ public class GpsRealData implements CommandLineRunner{
65 @Override 67 @Override
66 public void run(String... arg0) throws Exception { 68 public void run(String... arg0) throws Exception {
67 logger.info("gpsDataLoader,20,6"); 69 logger.info("gpsDataLoader,20,6");
68 - //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS); 70 + Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
69 } 71 }
70 72
71 public GpsEntity add(GpsEntity gps) { 73 public GpsEntity add(GpsEntity gps) {
src/main/java/com/bsth/entity/Line.java
  View file @966e73f
@@ -144,6 +144,9 @@ public class Line implements Serializable { @@ -144,6 +144,9 @@ public class Line implements Serializable {
144 /** 修改日期 timestamp */ 144 /** 修改日期 timestamp */
145 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") 145 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
146 private Date updateDate; 146 private Date updateDate;
  147 +
  148 + /** 是否在使用 <1:是;0:否> bit length(50) */
  149 + private Integer inUse;
147 150
148 public Integer getWarrantCar() { 151 public Integer getWarrantCar() {
149 return warrantCar; 152 return warrantCar;
@@ -448,4 +451,8 @@ public class Line implements Serializable { @@ -448,4 +451,8 @@ public class Line implements Serializable {
448 public void setUpdateDate(Date updateDate) { 451 public void setUpdateDate(Date updateDate) {
449 this.updateDate = updateDate; 452 this.updateDate = updateDate;
450 } 453 }
  454 +
  455 + public Integer getInUse() { return inUse; }
  456 +
  457 + public void setInUse(Integer inUse) { this.inUse = inUse; }
451 } 458 }
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @966e73f
@@ -257,4 +257,15 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int @@ -257,4 +257,15 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
257 @EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH) 257 @EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
258 @Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1") 258 @Query("select s from StationRoute s where s.destroy=0 and s.lineCode=?1")
259 List<StationRoute> findByLineCode(String lineCode); 259 List<StationRoute> findByLineCode(String lineCode);
  260 +
  261 + @Query("SELECT " +
  262 + "lineCode,directions,stationName,stationRouteCode " +
  263 + "FROM " +
  264 + "StationRoute s " +
  265 + "WHERE " +
  266 + "s.destroy = 0 " +
  267 + "and s.lineCode in(select lineCode from Line where inUse = 1) " +
  268 + "ORDER BY " +
  269 + "lineCode,directions,stationRouteCode")
  270 + List<Object[]> findAllLineWithYgc();
260 } 271 }
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @966e73f
1 package com.bsth.service.impl; 1 package com.bsth.service.impl;
2 2
3 -import java.io.BufferedOutputStream;  
4 -import java.io.File;  
5 -import java.io.FileOutputStream;  
6 -import java.io.IOException;  
7 -import java.sql.Connection;  
8 -import java.sql.PreparedStatement;  
9 -import java.sql.ResultSet;  
10 -import java.text.DecimalFormat;  
11 -import java.text.SimpleDateFormat;  
12 -import java.util.Date;  
13 -import java.util.HashMap;  
14 -import java.util.Iterator;  
15 -import java.util.List;  
16 -import java.util.Map;  
17 -import java.util.Set;  
18 -  
19 -import org.apache.commons.lang.time.DateUtils;  
20 -import org.slf4j.Logger;  
21 -import org.slf4j.LoggerFactory;  
22 -import org.springframework.beans.factory.annotation.Autowired;  
23 -import org.springframework.data.domain.Sort;  
24 -import org.springframework.data.domain.Sort.Direction;  
25 -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;  
26 -import org.springframework.stereotype.Service;  
27 -  
28 import com.bsth.data.BasicData; 3 import com.bsth.data.BasicData;
29 -import com.bsth.entity.Cars;  
30 -import com.bsth.entity.Line;  
31 -import com.bsth.entity.LineInformation;  
32 -import com.bsth.entity.Personnel;  
33 -import com.bsth.entity.StationRoute; 4 +import com.bsth.entity.*;
34 import com.bsth.entity.realcontrol.ChildTaskPlan; 5 import com.bsth.entity.realcontrol.ChildTaskPlan;
35 import com.bsth.entity.realcontrol.ScheduleRealInfo; 6 import com.bsth.entity.realcontrol.ScheduleRealInfo;
36 import com.bsth.entity.schedule.SchedulePlanInfo; 7 import com.bsth.entity.schedule.SchedulePlanInfo;
37 import com.bsth.entity.schedule.TTInfo; 8 import com.bsth.entity.schedule.TTInfo;
38 import com.bsth.entity.schedule.TTInfoDetail; 9 import com.bsth.entity.schedule.TTInfoDetail;
39 import com.bsth.entity.search.CustomerSpecs; 10 import com.bsth.entity.search.CustomerSpecs;
40 -import com.bsth.repository.CarsRepository;  
41 -import com.bsth.repository.LineInformationRepository;  
42 -import com.bsth.repository.LineRepository;  
43 -import com.bsth.repository.PersonnelRepository;  
44 -import com.bsth.repository.StationRouteRepository;  
45 -import com.bsth.repository.schedule.CarConfigInfoRepository;  
46 -import com.bsth.repository.schedule.EmployeeConfigInfoRepository;  
47 -import com.bsth.repository.schedule.SchedulePlanInfoRepository;  
48 -import com.bsth.repository.schedule.TTInfoDetailRepository;  
49 -import com.bsth.repository.schedule.TTInfoRepository; 11 +import com.bsth.repository.*;
  12 +import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
  13 +import com.bsth.repository.schedule.*;
50 import com.bsth.service.TrafficManageService; 14 import com.bsth.service.TrafficManageService;
51 import com.bsth.util.TimeUtils; 15 import com.bsth.util.TimeUtils;
52 import com.bsth.util.db.DBUtils_MS; 16 import com.bsth.util.db.DBUtils_MS;
@@ -54,7 +18,25 @@ import com.bsth.webService.trafficManage.geotool.services.Internal; @@ -54,7 +18,25 @@ import com.bsth.webService.trafficManage.geotool.services.Internal;
54 import com.bsth.webService.trafficManage.geotool.services.InternalPortType; 18 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
55 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator; 19 import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
56 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap; 20 import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
57 -import com.bsth.repository.realcontrol.ScheduleRealInfoRepository; 21 +import org.apache.commons.lang.time.DateUtils;
  22 +import org.slf4j.Logger;
  23 +import org.slf4j.LoggerFactory;
  24 +import org.springframework.beans.factory.annotation.Autowired;
  25 +import org.springframework.data.domain.Sort;
  26 +import org.springframework.data.domain.Sort.Direction;
  27 +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
  28 +import org.springframework.stereotype.Service;
  29 +
  30 +import java.io.BufferedOutputStream;
  31 +import java.io.File;
  32 +import java.io.FileOutputStream;
  33 +import java.io.IOException;
  34 +import java.sql.Connection;
  35 +import java.sql.PreparedStatement;
  36 +import java.sql.ResultSet;
  37 +import java.text.DecimalFormat;
  38 +import java.text.SimpleDateFormat;
  39 +import java.util.*;
58 /** 40 /**
59 * 41 *
60 * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类) 42 * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
@@ -63,7 +45,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository; @@ -63,7 +45,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
63 * 45 *
64 * @Description: TODO(运管处接口service业务层) 46 * @Description: TODO(运管处接口service业务层)
65 * 47 *
66 - * @Author bsth@z 48 + * @Author bsth@zq
67 * 49 *
68 * @Date 2016年10月28日 上午9:21:17 50 * @Date 2016年10月28日 上午9:21:17
69 * 51 *
@@ -158,8 +140,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -158,8 +140,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
158 @Override 140 @Override
159 public String setXL() { 141 public String setXL() {
160 String result = "failure"; 142 String result = "failure";
  143 + StringBuffer sBuffer = new StringBuffer();
161 try { 144 try {
162 - StringBuffer sBuffer = new StringBuffer(); ;  
163 Iterator<Line> lineIterator = lineRepository.findAll().iterator(); 145 Iterator<Line> lineIterator = lineRepository.findAll().iterator();
164 Line line = null; 146 Line line = null;
165 List<StationRoute> stationsList = null;// 站点路由集 147 List<StationRoute> stationsList = null;// 站点路由集
@@ -168,7 +150,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -168,7 +150,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
168 sBuffer.append("<XLs>"); 150 sBuffer.append("<XLs>");
169 while(lineIterator.hasNext()){ 151 while(lineIterator.hasNext()){
170 line = lineIterator.next(); 152 line = lineIterator.next();
171 - if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){ 153 + if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
  154 + || line.getInUse() == 0){
172 continue; 155 continue;
173 } 156 }
174 sBuffer.append("<XL>"); 157 sBuffer.append("<XL>");
@@ -208,7 +191,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -208,7 +191,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
208 sBuffer.append("</XLs>"); 191 sBuffer.append("</XLs>");
209 System.out.println(sBuffer.toString()); 192 System.out.println(sBuffer.toString());
210 if(sBuffer.indexOf("<XL>") != -1){ 193 if(sBuffer.indexOf("<XL>") != -1){
211 - logger.info("setXL:"+sBuffer.toString());  
212 String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString()); 194 String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString());
213 String portArray[] = portResult.split("\n"); 195 String portArray[] = portResult.split("\n");
214 if(portArray.length >= 4){ 196 if(portArray.length >= 4){
@@ -224,8 +206,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -224,8 +206,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
224 } 206 }
225 } 207 }
226 } catch (Exception e) { 208 } catch (Exception e) {
  209 + logger.error("setXL:",e);
227 e.printStackTrace(); 210 e.printStackTrace();
228 }finally{ 211 }finally{
  212 + logger.info("setXL:"+sBuffer.toString());
229 logger.info("setXL:"+result); 213 logger.info("setXL:"+result);
230 } 214 }
231 return result; 215 return result;
@@ -237,8 +221,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -237,8 +221,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
237 @Override 221 @Override
238 public String setCL() { 222 public String setCL() {
239 String result = "failure"; 223 String result = "failure";
  224 + StringBuffer sBuffer =new StringBuffer();
240 try { 225 try {
241 - StringBuffer sBuffer =new StringBuffer();  
242 sBuffer.append("<CLs>"); 226 sBuffer.append("<CLs>");
243 Cars cars = null; 227 Cars cars = null;
244 String company; 228 String company;
@@ -258,13 +242,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -258,13 +242,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
258 sBuffer.append("</CL>"); 242 sBuffer.append("</CL>");
259 } 243 }
260 sBuffer.append("</CLs>"); 244 sBuffer.append("</CLs>");
261 - logger.info("setCL:"+sBuffer.toString());  
262 if(ssop.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 245 if(ssop.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
263 result = "success"; 246 result = "success";
264 } 247 }
265 } catch (Exception e) { 248 } catch (Exception e) {
  249 + logger.error("setCL:",e);
266 e.printStackTrace(); 250 e.printStackTrace();
267 }finally{ 251 }finally{
  252 + logger.info("setCL:"+sBuffer.toString());
268 logger.info("setCL:"+result); 253 logger.info("setCL:"+result);
269 } 254 }
270 return result; 255 return result;
@@ -276,8 +261,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -276,8 +261,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
276 @Override 261 @Override
277 public String setSJ() { 262 public String setSJ() {
278 String result = "failure"; 263 String result = "failure";
  264 + StringBuffer sBuffer =new StringBuffer();
279 try { 265 try {
280 - StringBuffer sBuffer =new StringBuffer();  
281 sBuffer.append("<SJs>"); 266 sBuffer.append("<SJs>");
282 Personnel personnel = null; 267 Personnel personnel = null;
283 String company; 268 String company;
@@ -295,13 +280,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -295,13 +280,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
295 sBuffer.append("</SJ>"); 280 sBuffer.append("</SJ>");
296 } 281 }
297 sBuffer.append("</SJs>"); 282 sBuffer.append("</SJs>");
298 - logger.info("setSJ:"+sBuffer.toString());  
299 if(ssop.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 283 if(ssop.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
300 result = "success"; 284 result = "success";
301 }; 285 };
302 } catch (Exception e) { 286 } catch (Exception e) {
  287 + logger.error("setSJ:",e);
303 e.printStackTrace(); 288 e.printStackTrace();
304 }finally{ 289 }finally{
  290 + logger.info("setSJ:"+sBuffer.toString());
305 logger.info("setSJ:"+result); 291 logger.info("setSJ:"+result);
306 } 292 }
307 return result; 293 return result;
@@ -309,15 +295,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -309,15 +295,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
309 295
310 /** 296 /**
311 * 上传路单 297 * 上传路单
312 - * @param date  
313 - * @return xml格式的字符串 298 + * @return 上传成功标识
314 */ 299 */
315 public String setLD(){ 300 public String setLD(){
316 String result = "failure"; 301 String result = "failure";
317 // 取昨天 的日期 302 // 取昨天 的日期
318 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1)); 303 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
  304 + StringBuffer sf = new StringBuffer();
319 try { 305 try {
320 - StringBuffer sf = new StringBuffer();  
321 sf.append("<DLDS>"); 306 sf.append("<DLDS>");
322 List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date); 307 List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
323 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLDGroup(date); 308 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLDGroup(date);
@@ -368,20 +353,19 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -368,20 +353,19 @@ public class TrafficManageServiceImpl implements TrafficManageService{
368 sf.append("</LD>"); 353 sf.append("</LD>");
369 } 354 }
370 } 355 }
371 -  
372 sf.append("</LDList>"); 356 sf.append("</LDList>");
373 sf.append("</DLD>"); 357 sf.append("</DLD>");
374 } 358 }
375 } 359 }
376 -  
377 sf.append("</DLDS>"); 360 sf.append("</DLDS>");
378 - logger.info("setLD:"+sf.toString());  
379 if(ssop.setLD(userNameOther, passwordOther, sf.toString()).isSuccess()){ 361 if(ssop.setLD(userNameOther, passwordOther, sf.toString()).isSuccess()){
380 result = "success"; 362 result = "success";
381 } 363 }
382 } catch (Exception e) { 364 } catch (Exception e) {
  365 + logger.error("setLD:",e);
383 e.printStackTrace(); 366 e.printStackTrace();
384 }finally{ 367 }finally{
  368 + logger.info("setLD:"+sf.toString());
385 logger.info("setLD:"+result); 369 logger.info("setLD:"+result);
386 } 370 }
387 return result; 371 return result;
@@ -389,15 +373,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -389,15 +373,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
389 373
390 /** 374 /**
391 * 上传里程油耗 375 * 上传里程油耗
392 - * @param date  
393 - * @return 376 + * @return 上传成功标识
394 */ 377 */
395 public String setLCYH(){ 378 public String setLCYH(){
396 String result = "failure"; 379 String result = "failure";
397 // 取昨天 的日期 380 // 取昨天 的日期
398 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1)); 381 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
  382 + StringBuffer sf = new StringBuffer();
399 try { 383 try {
400 - StringBuffer sf = new StringBuffer();  
401 sf.append("<LCYHS>"); 384 sf.append("<LCYHS>");
402 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLCYHGroup(date); 385 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
403 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date); 386 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
@@ -451,13 +434,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -451,13 +434,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
451 } 434 }
452 } 435 }
453 sf.append("</LCYHS>"); 436 sf.append("</LCYHS>");
454 - logger.info("setLCYH:"+sf.toString());  
455 if(ssop.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()){ 437 if(ssop.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()){
456 result = "success"; 438 result = "success";
457 } 439 }
458 } catch (Exception e) { 440 } catch (Exception e) {
  441 + logger.error("setLCYH:",e);
459 e.printStackTrace(); 442 e.printStackTrace();
460 }finally{ 443 }finally{
  444 + logger.info("setLCYH:"+sf.toString());
461 logger.info("setLCYH:"+result); 445 logger.info("setLCYH:"+result);
462 } 446 }
463 return result; 447 return result;
@@ -471,8 +455,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -471,8 +455,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
471 String result = "failure"; 455 String result = "failure";
472 // 取昨天 的日期 456 // 取昨天 的日期
473 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1)); 457 String date = sdfnyr.format(DateUtils.addDays(new Date(), -1));
  458 + StringBuffer sf = new StringBuffer();
474 try { 459 try {
475 - StringBuffer sf = new StringBuffer();  
476 sf.append("<DDRBS>"); 460 sf.append("<DDRBS>");
477 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setDDRBGroup(date); 461 List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
478 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date); 462 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
@@ -554,13 +538,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -554,13 +538,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
554 } 538 }
555 } 539 }
556 sf.append("</DDRBS>"); 540 sf.append("</DDRBS>");
557 - logger.info("setDDRB:"+sf.toString());  
558 if(ssop.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()){ 541 if(ssop.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()){
559 result = "success"; 542 result = "success";
560 } 543 }
561 } catch (Exception e) { 544 } catch (Exception e) {
  545 + logger.error("setDDRB:",e);
562 e.printStackTrace(); 546 e.printStackTrace();
563 }finally{ 547 }finally{
  548 + logger.info("setDDRB:"+sf.toString());
564 logger.info("setDDRB:"+result); 549 logger.info("setDDRB:"+result);
565 } 550 }
566 return result; 551 return result;
@@ -572,8 +557,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -572,8 +557,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
572 @Override 557 @Override
573 public String setJHBC() { 558 public String setJHBC() {
574 String result = "failure"; 559 String result = "failure";
  560 + StringBuffer sBuffer =new StringBuffer();
575 try { 561 try {
576 - StringBuffer sBuffer =new StringBuffer();  
577 sBuffer.append("<JHBCs>"); 562 sBuffer.append("<JHBCs>");
578 // 声明变量 563 // 声明变量
579 SchedulePlanInfo schedulePlanInfo = null; 564 SchedulePlanInfo schedulePlanInfo = null;
@@ -633,13 +618,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -633,13 +618,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
633 } 618 }
634 } 619 }
635 sBuffer.append("</JHBCs>"); 620 sBuffer.append("</JHBCs>");
636 - logger.info("setJHBC:"+sBuffer.toString());  
637 if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 621 if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
638 result = "success"; 622 result = "success";
639 } 623 }
640 } catch (Exception e) { 624 } catch (Exception e) {
  625 + logger.error("setJHBC:",e);
641 e.printStackTrace(); 626 e.printStackTrace();
642 }finally{ 627 }finally{
  628 + logger.info("setJHBC:"+sBuffer.toString());
643 logger.info("setJHBC:"+result); 629 logger.info("setJHBC:"+result);
644 } 630 }
645 return result; 631 return result;
@@ -651,14 +637,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -651,14 +637,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
651 @Override 637 @Override
652 public String setSKB(String ids) { 638 public String setSKB(String ids) {
653 String result = "failure"; 639 String result = "failure";
  640 + StringBuffer sBuffer = new StringBuffer();
654 try { 641 try {
655 String[] idArray = ids.split(","); 642 String[] idArray = ids.split(",");
656 - StringBuffer sBuffer = new StringBuffer(); 643 + StringBuffer sBufferA;
  644 + StringBuffer sBufferB;
657 TTInfo ttInfo; 645 TTInfo ttInfo;
658 - TTInfoDetail ttInfoDetail; 646 + TTInfoDetail ttInfoDetail = null;
659 Iterator<TTInfoDetail> ttInfoDetailIterator; 647 Iterator<TTInfoDetail> ttInfoDetailIterator;
660 HashMap<String,Object> param = new HashMap<String, Object>(); 648 HashMap<String,Object> param = new HashMap<String, Object>();
661 - String ttinfoJhlc = null;//计划总里程  
662 String lineCode ; 649 String lineCode ;
663 sBuffer.append("<SKBs>"); 650 sBuffer.append("<SKBs>");
664 for (int i = 0; i < idArray.length; i++) { 651 for (int i = 0; i < idArray.length; i++) {
@@ -668,57 +655,61 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -668,57 +655,61 @@ public class TrafficManageServiceImpl implements TrafficManageService{
668 param.put("ttinfo.id_eq", ttInfo.getId()); 655 param.put("ttinfo.id_eq", ttInfo.getId());
669 ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param), 656 ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
670 new Sort(Direction.ASC, "xlDir")).iterator(); 657 new Sort(Direction.ASC, "xlDir")).iterator();
671 - sBuffer.append("<SKB>");  
672 - sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))  
673 - .append("</XLBM>");  
674 - ttinfoJhlc = new String();  
675 - sBuffer.append("<JHZLC>").append(ttinfoJhlc).append("</JHZLC>");  
676 - sBuffer.append("<JHYYLC>").append(ttinfoJhlc).append("</JHYYLC>");  
677 - sBuffer.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");  
678 - sBuffer.append("<JSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</JSRQ>");/////////  
679 - sBuffer.append("<ZJZX>").append(changeRuleDay(ttInfo.getRule_days())).append("</ZJZX>");  
680 - sBuffer.append("<TBYY>").append("").append("</TBYY>");  
681 - sBuffer.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");  
682 - int num = 1;  
683 - // 加上<BCList>  
684 if(ttInfoDetailIterator.hasNext()){ 658 if(ttInfoDetailIterator.hasNext()){
685 - sBuffer.append("<BCList>");  
686 - }  
687 - while (ttInfoDetailIterator.hasNext()) {  
688 - ttInfoDetail = ttInfoDetailIterator.next();  
689 - if(ttInfoDetail.getBcType().equals("in") || ttInfoDetail.getBcType().equals("out")){  
690 - continue; 659 + sBuffer.append("<SKB>");
  660 + sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))
  661 + .append("</XLBM>");
  662 + sBufferB = new StringBuffer();
  663 + sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
  664 + // 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
  665 + sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
  666 + sBufferB.append("<ZJZX>").append(changeRuleDay(ttInfo.getRule_days())).append("</ZJZX>");
  667 + sBufferB.append("<TBYY>").append("").append("</TBYY>");
  668 + sBufferB.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
  669 + sBufferB.append("<BCList>");
  670 + int num = 1;
  671 + while (ttInfoDetailIterator.hasNext()) {
  672 + ttInfoDetail = ttInfoDetailIterator.next();
  673 + if(ttInfoDetail.getBcType().equals("in") || ttInfoDetail.getBcType().equals("out")){
  674 + continue;
  675 + }
  676 + if(num++ == 1){
  677 + sBufferA = new StringBuffer();
  678 + sBufferA.append("<JHZLC>").append(ttInfoDetail.getJhlc()).append("</JHZLC>");
  679 + sBufferA.append("<JHYYLC>").append(ttInfoDetail.getJhlc()).append("</JHYYLC>");
  680 + sBuffer.append(sBufferA).append(sBufferB);
  681 + }
  682 + lineCode = ttInfoDetail.getXl().getLineCode();
  683 + // 如果发车时间格式错误，忽略此条
  684 + if(changeTimeFormat(ttInfoDetail) == null){
  685 + continue;
  686 + }
  687 + sBuffer.append("<BC>");
  688 + sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
  689 + sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
  690 + sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");
  691 + sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
  692 + lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");
  693 + sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
  694 + sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");
  695 + sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(
  696 + lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</DDXH>");
  697 + sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
  698 + sBuffer.append("</BC>");
691 } 699 }
692 - ttinfoJhlc = ttInfoDetail.getJhlc()+"";// 设置计划总里程  
693 - lineCode = ttInfoDetail.getXl().getLineCode();  
694 - sBuffer.append("<BC>");  
695 - sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");  
696 - sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");  
697 - sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>");  
698 - sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(  
699 - lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getQdz().getStationName())).append("</ZDXH>");  
700 - sBuffer.append("<JHFCSJ>").append(ttInfoDetail.getFcsj()).append("</JHFCSJ>");  
701 - sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>");  
702 - sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(  
703 - lineCode, ttInfoDetail.getXlDir(), ttInfoDetail.getZdz().getStationName())).append("</ZDXH>");  
704 - sBuffer.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");  
705 - sBuffer.append("</BC>");  
706 -  
707 - num++;  
708 - }  
709 - if(sBuffer.indexOf("<BCList>") != -1){  
710 sBuffer.append("</BCList>"); 700 sBuffer.append("</BCList>");
  701 + sBuffer.append("</SKB>");
711 } 702 }
712 - sBuffer.append("</SKB>");  
713 } 703 }
714 sBuffer.append("</SKBs>"); 704 sBuffer.append("</SKBs>");
715 - logger.info("setSKB:"+sBuffer.toString());  
716 if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 705 if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
717 result = "success"; 706 result = "success";
718 } 707 }
719 } catch (Exception e) { 708 } catch (Exception e) {
  709 + logger.error("setSKB:", e);
720 e.printStackTrace(); 710 e.printStackTrace();
721 }finally{ 711 }finally{
  712 + logger.info("setSKB:"+sBuffer.toString());
722 logger.info("setSKB:"+result); 713 logger.info("setSKB:"+result);
723 } 714 }
724 return result; 715 return result;
@@ -730,8 +721,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -730,8 +721,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
730 @Override 721 @Override
731 public String setXLPC() { 722 public String setXLPC() {
732 String result = "failure"; 723 String result = "failure";
  724 + StringBuffer sBuffer =new StringBuffer();
733 try { 725 try {
734 - StringBuffer sBuffer =new StringBuffer();  
735 sBuffer.append("<XLPCs>"); 726 sBuffer.append("<XLPCs>");
736 // 声明变量 727 // 声明变量
737 Line line = null; 728 Line line = null;
@@ -773,13 +764,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -773,13 +764,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
773 sBuffer.append("</XLPC>"); 764 sBuffer.append("</XLPC>");
774 } 765 }
775 sBuffer.append("</XLPCs>"); 766 sBuffer.append("</XLPCs>");
776 - logger.info("setXLPC:"+sBuffer.toString());  
777 if(ssop.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 767 if(ssop.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
778 result = "success"; 768 result = "success";
779 } 769 }
780 } catch (Exception e) { 770 } catch (Exception e) {
  771 + logger.error("setXLPC:",e);
781 e.printStackTrace(); 772 e.printStackTrace();
782 }finally{ 773 }finally{
  774 + logger.info("setXLPC:"+sBuffer.toString());
783 logger.info("setXLPC:"+result); 775 logger.info("setXLPC:"+result);
784 } 776 }
785 return result; 777 return result;
@@ -832,13 +824,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -832,13 +824,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
832 sBuffer.append("</CS>"); 824 sBuffer.append("</CS>");
833 } 825 }
834 sBuffer.append("</CSs>"); 826 sBuffer.append("</CSs>");
835 - logger.info("setCS:"+sBuffer.toString());  
836 if(ssop.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 827 if(ssop.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
837 result = "success"; 828 result = "success";
838 } 829 }
839 } catch (Exception e) { 830 } catch (Exception e) {
  831 + logger.error("setCS:",e);
840 e.printStackTrace(); 832 e.printStackTrace();
841 } finally { 833 } finally {
  834 + logger.info("setCS:"+sBuffer.toString());
842 logger.info("setCS:"+result); 835 logger.info("setCS:"+result);
843 DBUtils_MS.close(rs, ps, conn); 836 DBUtils_MS.close(rs, ps, conn);
844 } 837 }
@@ -949,11 +942,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -949,11 +942,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
949 min = fullTime % 60; 942 min = fullTime % 60;
950 sumHour = Integer.valueOf(fcsjArray[0])+hour; 943 sumHour = Integer.valueOf(fcsjArray[0])+hour;
951 if(sumHour >= 24){ 944 if(sumHour >= 24){
952 - result = sumHour - 24+":"; 945 + result = String.format("%02d",sumHour - 24);
953 }else{ 946 }else{
954 - result = sumHour +":"; 947 + result = String.format("%02d",sumHour);;
955 } 948 }
956 - result +=String.format("%02d", min); 949 + result +=":"+String.format("%02d", min);
957 }else{ 950 }else{
958 result = fcsj; 951 result = fcsj;
959 } 952 }
@@ -961,6 +954,26 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -961,6 +954,26 @@ public class TrafficManageServiceImpl implements TrafficManageService{
961 } 954 }
962 955
963 /** 956 /**
  957 + * 改变时间格式
  958 + * @param ttInfoDetail 时刻表详细
  959 + * @return xx:yy
  960 + */
  961 + private String changeTimeFormat(TTInfoDetail ttInfoDetail){
  962 + String result = "00:00";
  963 + String fcsj = ttInfoDetail.getFcsj();
  964 + if(fcsj.indexOf(":") != -1){
  965 + // 时和分隔开
  966 + String[] fcsjArray = fcsj.split(":");
  967 + result = String.format("%02d", Integer.valueOf(fcsjArray[0]))+":";
  968 + result +=String.format("%02d", Integer.valueOf(fcsjArray[1]));
  969 + }else{
  970 + result = null;
  971 + logger.info("setSKB:发车时间错误：ttInfoDetail.id="+ttInfoDetail.getId());
  972 + }
  973 + return result;
  974 + }
  975 +
  976 + /**
964 * 拼装线路计划班次表的XML 977 * 拼装线路计划班次表的XML
965 * @param sBuffer 978 * @param sBuffer
966 * @param schedulePlanInfo 979 * @param schedulePlanInfo
@@ -993,7 +1006,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -993,7 +1006,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
993 flag = 0; 1006 flag = 0;
994 } 1007 }
995 result += flag; 1008 result += flag;
996 - if(i !=ruleDayArray.length ){ 1009 + if(i !=ruleDayArray.length -1){
997 result +=","; 1010 result +=",";
998 } 1011 }
999 } 1012 }
@@ -1017,15 +1030,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1017,15 +1030,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1017 } 1030 }
1018 } 1031 }
1019 /** 1032 /**
1020 - * @param stations 站点路由集 1033 + * @param stationsList 站点路由集
1021 * @param sBuffer sBuffer 1034 * @param sBuffer sBuffer
1022 - * @param StartId 站点序号起始ID 1035 + * @param startId 站点序号起始ID
1023 * 1036 *
1024 * @return 站点序号累加后的ID 1037 * @return 站点序号累加后的ID
1025 */ 1038 */
1026 private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){ 1039 private int packagStationXml(List<StationRoute> stationsList,StringBuffer sBuffer,int startId){
1027 int size = stationsList.size(); 1040 int size = stationsList.size();
1028 - StationRoute srRoute = null; 1041 + StationRoute srRoute;
1029 String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站 1042 String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站
1030 for (int i = 0; i < size; i++) { 1043 for (int i = 0; i < size; i++) {
1031 srRoute = stationsList.get(i); 1044 srRoute = stationsList.get(i);
@@ -1062,9 +1075,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1062,9 +1075,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1062 */ 1075 */
1063 private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){ 1076 private Integer getYgcStationNumByLineCodeAndDirectionAndStationName(String lineCode,String direction,String stationName){
1064 Integer number = 0; 1077 Integer number = 0;
1065 - Map<String, Map> dirs2Statioin = BasicData.stationName2YgcNumber.get(lineCode);  
1066 - Map<String, Integer> station2Number = dirs2Statioin.get(direction);  
1067 - number = station2Number.get(stationName); 1078 + number = BasicData.stationName2YgcNumber.get(lineCode+"_"+direction+"_"+stationName);
1068 return number; 1079 return number;
1069 } 1080 }
1070 } 1081 }
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
  View file @966e73f
1 package com.bsth.service.realcontrol; 1 package com.bsth.service.realcontrol;
2 2
3 -import java.util.Map;  
4 -  
5 import com.bsth.entity.realcontrol.LineConfig; 3 import com.bsth.entity.realcontrol.LineConfig;
6 import com.bsth.service.BaseService; 4 import com.bsth.service.BaseService;
7 5
  6 +import java.util.Map;
  7 +
8 public interface LineConfigService extends BaseService<LineConfig, Integer>{ 8 public interface LineConfigService extends BaseService<LineConfig, Integer>{
9 9
10 Map<String, Object> check(String[] codeArray); 10 Map<String, Object> check(String[] codeArray);
@@ -15,4 +15,5 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{ @@ -15,4 +15,5 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
15 15
16 Map<String, Object> editOutTimeType(String lineCode, int type); 16 Map<String, Object> editOutTimeType(String lineCode, int type);
17 17
  18 + LineConfig getByLineCode(String lineCode);
18 } 19 }
src/main/java/com/bsth/service/realcontrol/RealMapService.java
  View file @966e73f
@@ -7,4 +7,6 @@ import java.util.Map; @@ -7,4 +7,6 @@ import java.util.Map;
7 */ 7 */
8 public interface RealMapService { 8 public interface RealMapService {
9 Map<String, Object> stationSpatialData(String idx); 9 Map<String, Object> stationSpatialData(String idx);
  10 +
  11 + Map<String,Object> carParkSpatialData();
10 } 12 }
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
  View file @966e73f
1 package com.bsth.service.realcontrol.impl; 1 package com.bsth.service.realcontrol.impl;
2 2
3 -import java.util.ArrayList;  
4 -import java.util.HashMap;  
5 -import java.util.List;  
6 -import java.util.Map;  
7 -  
8 -import org.springframework.beans.factory.annotation.Autowired;  
9 -import org.springframework.stereotype.Service;  
10 -  
11 import com.bsth.common.ResponseCode; 3 import com.bsth.common.ResponseCode;
12 import com.bsth.data.LineConfigData; 4 import com.bsth.data.LineConfigData;
13 import com.bsth.entity.realcontrol.LineConfig; 5 import com.bsth.entity.realcontrol.LineConfig;
14 import com.bsth.repository.realcontrol.LineConfigRepository; 6 import com.bsth.repository.realcontrol.LineConfigRepository;
15 import com.bsth.service.impl.BaseServiceImpl; 7 import com.bsth.service.impl.BaseServiceImpl;
16 import com.bsth.service.realcontrol.LineConfigService; 8 import com.bsth.service.realcontrol.LineConfigService;
  9 +import org.springframework.beans.factory.annotation.Autowired;
  10 +import org.springframework.stereotype.Service;
  11 +
  12 +import java.util.ArrayList;
  13 +import java.util.HashMap;
  14 +import java.util.List;
  15 +import java.util.Map;
17 16
18 @Service 17 @Service
19 public class LineConfigServiceImpl extends BaseServiceImpl<LineConfig, Integer> implements LineConfigService{ 18 public class LineConfigServiceImpl extends BaseServiceImpl<LineConfig, Integer> implements LineConfigService{
@@ -78,4 +77,9 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; @@ -78,4 +77,9 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt;
78 rs.put("type", type); 77 rs.put("type", type);
79 return rs; 78 return rs;
80 } 79 }
  80 +
  81 + @Override
  82 + public LineConfig getByLineCode(String lineCode) {
  83 + return lineConfigData.get(lineCode);
  84 + }
81 } 85 }
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
  View file @966e73f
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol.impl; @@ -2,6 +2,7 @@ package com.bsth.service.realcontrol.impl;
2 2
3 import com.bsth.common.ResponseCode; 3 import com.bsth.common.ResponseCode;
4 import com.bsth.controller.realcontrol.dto.StationSpatialData; 4 import com.bsth.controller.realcontrol.dto.StationSpatialData;
  5 +import com.bsth.entity.CarPark;
5 import com.bsth.service.realcontrol.RealMapService; 6 import com.bsth.service.realcontrol.RealMapService;
6 import com.google.common.base.Splitter; 7 import com.google.common.base.Splitter;
7 import org.slf4j.Logger; 8 import org.slf4j.Logger;
@@ -52,4 +53,22 @@ public class RealMapServiceImpl implements RealMapService { @@ -52,4 +53,22 @@ public class RealMapServiceImpl implements RealMapService {
52 53
53 return rs; 54 return rs;
54 } 55 }
  56 +
  57 + @Override
  58 + public Map<String, Object> carParkSpatialData() {
  59 + Map<String, Object> rs = new HashMap();
  60 +
  61 + try {
  62 + String sql = "select ID, AREA,PARK_CODE,PARK_NAME,ST_AsText(G_PARK_POINT) as G_PARK_POINT,G_CENTER_POINT,RADIUS,SHAPES_TYPE from bsth_c_car_park WHERE destroy=0";
  63 +
  64 + List<CarPark> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(CarPark.class));
  65 + rs.put("status", ResponseCode.SUCCESS);
  66 + rs.put("list", list);
  67 + } catch (Exception e) {
  68 + logger.error("", e);
  69 + rs.put("status", ResponseCode.ERROR);
  70 + rs.put("msg", "查询停车场空间数据出现异常！");
  71 + }
  72 + return rs;
  73 + }
55 } 74 }
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @966e73f
@@ -276,8 +276,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -276,8 +276,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
276 return rs; 276 return rs;
277 } 277 }
278 //截取工号 278 //截取工号
279 - if(t.getsGh().indexOf("-") != -1){  
280 - t.setsGh(t.getsGh().split("-")[1]); 279 + if(t.getjGh().indexOf("-") != -1){
  280 + t.setjGh(t.getjGh().split("-")[1]);
281 } 281 }
282 282
283 t.setScheduleDateStr(schDate); 283 t.setScheduleDateStr(schDate);
@@ -1638,7 +1638,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1638,7 +1638,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1638 */ 1638 */
1639 @Override 1639 @Override
1640 public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) { 1640 public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) {
1641 - Map<String, Object> rs = new HashMap<>(); 1641 + Map<String, Object> rs = new HashMap<>()
  1642 + ,tempMap = new HashMap<>();
1642 List<ScheduleRealInfo> list = new ArrayList<>(); 1643 List<ScheduleRealInfo> list = new ArrayList<>();
1643 1644
1644 ScheduleRealInfo sch,next; 1645 ScheduleRealInfo sch,next;
@@ -1646,20 +1647,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1646,20 +1647,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1646 if(StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj())) 1647 if(StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
1647 continue; 1648 continue;
1648 1649
1649 - sch = dayOfSchedule.get(dc.getSchId()); 1650 + /*sch = dayOfSchedule.get(dc.getSchId());
1650 if(sch==null) 1651 if(sch==null)
1651 continue; 1652 continue;
1652 1653
1653 sch.setDfsjAll(dc.getNew_dfsj()); 1654 sch.setDfsjAll(dc.getNew_dfsj());
1654 //重新计算终点时间 1655 //重新计算终点时间
1655 sch.calcEndTime(); 1656 sch.calcEndTime();
1656 - list.add(sch); 1657 + list.add(sch);*/
  1658 + tempMap = outgoAdjust(dc.getSchId(),"", dc.getNew_dfsj());
1657 1659
1658 - next=dayOfSchedule.next(sch);  
1659 - if(next.getQdzName().equals(sch.getZdzName())){ 1660 + if(tempMap.get("status").equals(ResponseCode.SUCCESS)){
  1661 + list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
  1662 + }
  1663 + //next=dayOfSchedule.next(sch);
  1664 + /*if(next.getQdzName().equals(sch.getZdzName())){
1660 next.setQdzArrDateJH(sch.getZdsj()); 1665 next.setQdzArrDateJH(sch.getZdsj());
1661 list.add(next); 1666 list.add(next);
1662 - } 1667 + }*/
1663 } 1668 }
1664 1669
1665 rs.put("status", ResponseCode.SUCCESS); 1670 rs.put("status", ResponseCode.SUCCESS);
src/main/resources/application-dev.properties
  View file @966e73f
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 spring.jpa.database= MYSQL 8 spring.jpa.database= MYSQL
9 spring.jpa.show-sql= false 9 spring.jpa.show-sql= false
10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11 -spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false 11 +spring.datasource.url= jdbc:mysql://192.168.168.201/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
12 spring.datasource.username= root 12 spring.datasource.username= root
13 spring.datasource.password= 123456 13 spring.datasource.password= 123456
14 #DATASOURCE 14 #DATASOURCE
src/main/resources/ms-jdbc.properties
  View file @966e73f
1 -ms.mysql.driver= com.mysql.jdbc.Driver  
2 -ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false  
3 -ms.mysql.username= root  
4 -ms.mysql.password= 123456  
5 -  
6 #ms.mysql.driver= com.mysql.jdbc.Driver 1 #ms.mysql.driver= com.mysql.jdbc.Driver
7 -#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8 2 +#ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
8 #ms.mysql.username= root 3 #ms.mysql.username= root
9 -#ms.mysql.password= root2jsp  
10 \ No newline at end of file 4 \ No newline at end of file
  5 +#ms.mysql.password= 123456
  6 +
  7 +ms.mysql.driver= com.mysql.jdbc.Driver
  8 +ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
  9 +ms.mysql.username= root
  10 +ms.mysql.password= root2jsp
11 \ No newline at end of file 11 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/Gruntfile.js
  View file @966e73f
@@ -11,6 +11,9 @@ module.exports = function (grunt) { @@ -11,6 +11,9 @@ module.exports = function (grunt) {
11 clean: { 11 clean: {
12 concat_directive: { // 所有指令合并的js文件 12 concat_directive: { // 所有指令合并的js文件
13 src: ['module/common/prj-common-directive.js'] 13 src: ['module/common/prj-common-directive.js']
  14 + },
  15 + concat_route: { // 所有模块的route配置合并的js文件
  16 + src: ['module/common/prj-common-ui-route-state.js']
14 } 17 }
15 18
16 //, 19 //,
@@ -79,6 +82,28 @@ module.exports = function (grunt) { @@ -79,6 +82,28 @@ module.exports = function (grunt) {
79 'module/common/dts2/bcGroup/saBcgroup.js' // 班次选择整合指令 82 'module/common/dts2/bcGroup/saBcgroup.js' // 班次选择整合指令
80 ], 83 ],
81 dest: 'module/common/prj-common-directive.js' 84 dest: 'module/common/prj-common-directive.js'
  85 + },
  86 + route: {
  87 + options: {
  88 + banner: '//所有模块ui route 配置'
  89 + },
  90 + src: [
  91 + 'module/basicInfo/busInfoManage/route.js', // 车辆基础信息管理模块
  92 + 'module/basicInfo/deviceInfoManage/route.js', // 设备管理模块
  93 + 'module/basicInfo/employeeInfoManage/route.js', // 人员基础信息管理模块
  94 + 'module/core/busConfig/route.js', // 车辆配置模块
  95 + 'module/core/busLineInfoStat/route.js', // 线路运营概览模块
  96 + 'module/core/employeeConfig/route.js', // 人员配置模块
  97 + 'module/core/guideboardManage/route.js', // 路牌管理模块
  98 + 'module/core/rerunManage/route.js', // 套跑管理模块
  99 + 'module/core/schedulePlanManage/route.js', // 排班计划管理模块
  100 + 'module/core/schedulePlanManage/info/route.js', // 排班计划明细管理模块
  101 + 'module/core/schedulePlanManage/report/route.js', // 排班计划明日运营模块
  102 + 'module/core/scheduleRuleManage/route.js', // 排班规则管理模块
  103 + 'module/core/ttInfoManage/route.js', // 时刻表管理模块
  104 + 'module/core/ttInfoManage/detailedit/route.js' // 时刻表明细管理模块
  105 + ],
  106 + dest: 'module/common/prj-common-ui-route-state.js'
82 } 107 }
83 }, 108 },
84 109
@@ -401,6 +426,18 @@ module.exports = function (grunt) { @@ -401,6 +426,18 @@ module.exports = function (grunt) {
401 1、clean:concat_directive，清除合并生成的prj-common-directive.js文件 426 1、clean:concat_directive，清除合并生成的prj-common-directive.js文件
402 2、concat:directive，重新合并prj-common-directive.js文件 427 2、concat:directive，重新合并prj-common-directive.js文件
403 */ 428 */
404 - grunt.registerTask('directive', ['clean:concat_directive', 'concat:directive']); 429 + grunt.registerTask('directive', [
  430 + 'clean:concat_directive', 'concat:directive'
  431 + ]);
  432 +
  433 + /*
  434 + 定义了一个route的grunt任务
  435 + 任务组有顺序，如下说明：
  436 + 1、clean:concat_route，清除合并生成的prj-common-ui-route-state.js文件
  437 + 2、concat:route，重新合并prj-common-ui-route-state.js文件
  438 + */
  439 + grunt.registerTask('route', [
  440 + 'clean:concat_route', 'concat:route'
  441 + ]);
405 442
406 }; 443 };
407 \ No newline at end of file 444 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/dist/busInfoManage.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>车辆信息管理</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">基础信息</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">车辆信息管理</span>  
18 - </li>  
19 -  
20 -</ul>  
21 -  
22 -<div class="row">  
23 - <div class="col-md-12">  
24 - dfdfdfdfdf  
25 - </div>  
26 -</div>  
27 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js renamed to src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
  View file @966e73f
@@ -75,54 +75,54 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusInfoManageService&#39;, [&#39;BusInfoManageSer @@ -75,54 +75,54 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusInfoManageService&#39;, [&#39;BusInfoManageSer
75 }]); 75 }]);
76 76
77 angular.module('ScheduleApp').controller('BusInfoManageCtrl', [ 77 angular.module('ScheduleApp').controller('BusInfoManageCtrl', [
78 - 'BusInfoManageService','$state', '$uibModal', 'FileDownload_g',  
79 - function(busInfoManageService, $state, $uibModal, fileDownload) {  
80 - var self = this; 78 + 'BusInfoManageService','$state', '$uibModal', 'FileDownload_g',
  79 + function(busInfoManageService, $state, $uibModal, fileDownload) {
  80 + var self = this;
81 81
82 - // 切换到form状态  
83 - self.goForm = function() {  
84 - //alert("切换");  
85 - $state.go("busInfoManage_form");  
86 - }; 82 + // 切换到form状态
  83 + self.goForm = function() {
  84 + //alert("切换");
  85 + $state.go("busInfoManage_form");
  86 + };
87 87
88 - // 导入excel  
89 - self.importData = function() {  
90 - // large方式弹出模态对话框  
91 - var modalInstance = $uibModal.open({  
92 - templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/dataImport.html',  
93 - size: "lg",  
94 - animation: true,  
95 - backdrop: 'static',  
96 - resolve: {  
97 - // 可以传值给controller  
98 - },  
99 - windowClass: 'center-modal',  
100 - controller: "BusInfoManageToolsCtrl",  
101 - controllerAs: "ctrl",  
102 - bindToController: true  
103 - });  
104 - modalInstance.result.then(  
105 - function() {  
106 - console.log("dataImport.html打开");  
107 - },  
108 - function() {  
109 - console.log("dataImport.html消失");  
110 - }  
111 - );  
112 - }; 88 + // 导入excel
  89 + self.importData = function() {
  90 + // large方式弹出模态对话框
  91 + var modalInstance = $uibModal.open({
  92 + templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/dataImport.html',
  93 + size: "lg",
  94 + animation: true,
  95 + backdrop: 'static',
  96 + resolve: {
  97 + // 可以传值给controller
  98 + },
  99 + windowClass: 'center-modal',
  100 + controller: "BusInfoManageToolsCtrl",
  101 + controllerAs: "ctrl",
  102 + bindToController: true
  103 + });
  104 + modalInstance.result.then(
  105 + function() {
  106 + console.log("dataImport.html打开");
  107 + },
  108 + function() {
  109 + console.log("dataImport.html消失");
  110 + }
  111 + );
  112 + };
113 113
114 - // 导出excel  
115 - self.exportData = function() {  
116 - busInfoManageService.dataExport().then(  
117 - function(result) {  
118 - fileDownload.downloadFile(result.data, "application/octet-stream", "车辆基础信息.xls");  
119 - },  
120 - function(result) {  
121 - console.log("exportData failed：" + result);  
122 - }  
123 - );  
124 - };  
125 -}]); 114 + // 导出excel
  115 + self.exportData = function() {
  116 + busInfoManageService.dataExport().then(
  117 + function(result) {
  118 + fileDownload.downloadFile(result.data, "application/octet-stream", "车辆基础信息.xls");
  119 + },
  120 + function(result) {
  121 + console.log("exportData failed：" + result);
  122 + }
  123 + );
  124 + };
  125 + }]);
126 126
127 angular.module('ScheduleApp').controller('BusInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) { 127 angular.module('ScheduleApp').controller('BusInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
128 var self = this; 128 var self = this;
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 车辆基础信息模块配置route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("busInfoManage", { // index页面
  13 + url: '/busInfoManage',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/index.html'
  17 + },
  18 + "busInfoManage_list@busInfoManage": {
  19 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'busInfoManage_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  32 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  33 + ]
  34 + });
  35 + }]
  36 + }
  37 + })
  38 + .state("busInfoManage_form", { // 添加车辆form
  39 + url: '/busInfoManage_form',
  40 + views: {
  41 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/form.html'}
  42 + },
  43 + resolve: {
  44 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  45 + return $ocLazyLoad.load({
  46 + name: 'busInfoManage_form_module',
  47 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  48 + files: [
  49 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  50 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  51 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  52 + ]
  53 + });
  54 + }]
  55 + }
  56 + })
  57 + .state("busInfoManage_edit", { // 修改车辆form
  58 + url: '/busInfoManage_edit/:id',
  59 + views: {
  60 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/edit.html'}
  61 + },
  62 + resolve: {
  63 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  64 + return $ocLazyLoad.load({
  65 + name: 'busInfoManage_edit_module',
  66 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  67 + files: [
  68 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  69 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  70 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  71 + ]
  72 + });
  73 + }]
  74 + }
  75 + })
  76 + .state("busInfoManage_detail", { // 车辆详细信息
  77 + url: '/busInfoManage_detail/:id',
  78 + views: {
  79 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/detail.html'}
  80 + },
  81 + resolve: {
  82 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  83 + return $ocLazyLoad.load({
  84 + name: 'busInfoManage_detail_module',
  85 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  86 + files: [
  87 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  88 + ]
  89 + });
  90 + }]
  91 + }
  92 + })
  93 + }
  94 +]);
0 \ No newline at end of file 95 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/dist/deviceInfoManage.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>设备信息管理</h1>  
4 - </div>  
5 -</div>  
6 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js renamed to src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
  View file @966e73f
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 车辆设备信息模块配置route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("deviceInfoManage", { // index页面
  13 + url: '/deviceInfoManage',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html'
  17 + },
  18 + "deviceInfoManage_list@deviceInfoManage": {
  19 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'deviceInfoManage_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  32 + ]
  33 + });
  34 + }]
  35 + }
  36 + })
  37 + .state("deviceInfoManage_form", { // 添加设备信息form
  38 + url: '/deviceInfoManage_form',
  39 + views: {
  40 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html'}
  41 + },
  42 + resolve: {
  43 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  44 + return $ocLazyLoad.load({
  45 + name: 'deviceInfoManage_form_module',
  46 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  47 + files: [
  48 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  49 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  50 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  51 + ]
  52 + });
  53 + }]
  54 + }
  55 + })
  56 + .state("deviceInfoManage_edit", { // 修改设备信息form
  57 + url: '/deviceInfoManage_edit/:id',
  58 + views: {
  59 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html'}
  60 + },
  61 + resolve: {
  62 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  63 + return $ocLazyLoad.load({
  64 + name: 'deviceInfoManage_edit_module',
  65 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  66 + files: [
  67 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  68 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  69 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  70 + ]
  71 + });
  72 + }]
  73 + }
  74 + })
  75 + .state("deviceInfoManage_detail", { // 详细信息页面
  76 + url: '/deviceInfoManage_detail/:id',
  77 + views: {
  78 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html'}
  79 + },
  80 + resolve: {
  81 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  82 + return $ocLazyLoad.load({
  83 + name: 'deviceInfoManage_detail_module',
  84 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  85 + files: [
  86 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  87 + ]
  88 + });
  89 + }]
  90 + }
  91 + })
  92 +
  93 + }
  94 +]);
0 \ No newline at end of file 95 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/dist/employeeInfoManage.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -人员信息管理  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js renamed to src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @966e73f
@@ -77,54 +77,54 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService&#39;, [&#39;EmployeeInf @@ -77,54 +77,54 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService&#39;, [&#39;EmployeeInf
77 }]); 77 }]);
78 78
79 angular.module('ScheduleApp').controller('EmployeeInfoManageCtrl', [ 79 angular.module('ScheduleApp').controller('EmployeeInfoManageCtrl', [
80 - 'EmployeeInfoManageService', '$state', '$uibModal', 'FileDownload_g',  
81 - function(employeeInfoManageService, $state, $uibModal, fileDownload) {  
82 - var self = this; 80 + 'EmployeeInfoManageService', '$state', '$uibModal', 'FileDownload_g',
  81 + function(employeeInfoManageService, $state, $uibModal, fileDownload) {
  82 + var self = this;
83 83
84 - // 切换到form状态  
85 - self.goForm = function() {  
86 - //alert("切换");  
87 - $state.go("employeeInfoManage_form");  
88 - } 84 + // 切换到form状态
  85 + self.goForm = function() {
  86 + //alert("切换");
  87 + $state.go("employeeInfoManage_form");
  88 + }
89 89
90 - // 导入excel  
91 - self.importData = function() {  
92 - // large方式弹出模态对话框  
93 - var modalInstance = $uibModal.open({  
94 - templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/dataImport.html',  
95 - size: "lg",  
96 - animation: true,  
97 - backdrop: 'static',  
98 - resolve: {  
99 - // 可以传值给controller  
100 - },  
101 - windowClass: 'center-modal',  
102 - controller: "EmployInfoManageToolsCtrl",  
103 - controllerAs: "ctrl",  
104 - bindToController: true  
105 - });  
106 - modalInstance.result.then(  
107 - function() {  
108 - console.log("dataImport.html打开");  
109 - },  
110 - function() {  
111 - console.log("dataImport.html消失");  
112 - }  
113 - );  
114 - }; 90 + // 导入excel
  91 + self.importData = function() {
  92 + // large方式弹出模态对话框
  93 + var modalInstance = $uibModal.open({
  94 + templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/dataImport.html',
  95 + size: "lg",
  96 + animation: true,
  97 + backdrop: 'static',
  98 + resolve: {
  99 + // 可以传值给controller
  100 + },
  101 + windowClass: 'center-modal',
  102 + controller: "EmployInfoManageToolsCtrl",
  103 + controllerAs: "ctrl",
  104 + bindToController: true
  105 + });
  106 + modalInstance.result.then(
  107 + function() {
  108 + console.log("dataImport.html打开");
  109 + },
  110 + function() {
  111 + console.log("dataImport.html消失");
  112 + }
  113 + );
  114 + };
115 115
116 - // 导出excel  
117 - self.exportData = function() {  
118 - employeeInfoManageService.dataExport().then(  
119 - function(result) {  
120 - fileDownload.downloadFile(result.data, "application/octet-stream", "人员基础信息.xls");  
121 - },  
122 - function(result) {  
123 - console.log("exportData failed：" + result);  
124 - }  
125 - );  
126 - };  
127 -}]); 116 + // 导出excel
  117 + self.exportData = function() {
  118 + employeeInfoManageService.dataExport().then(
  119 + function(result) {
  120 + fileDownload.downloadFile(result.data, "application/octet-stream", "人员基础信息.xls");
  121 + },
  122 + function(result) {
  123 + console.log("exportData failed：" + result);
  124 + }
  125 + );
  126 + };
  127 + }]);
128 128
129 angular.module('ScheduleApp').controller('EmployInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) { 129 angular.module('ScheduleApp').controller('EmployInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
130 var self = this; 130 var self = this;
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 人员基础信息模块配置route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("employeeInfoManage", { // index页面
  13 + url: '/employeeInfoManage',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html'
  17 + },
  18 + "employeeInfoManage_list@employeeInfoManage": {
  19 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'employeeInfoManage_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  32 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  33 + ]
  34 + });
  35 + }]
  36 + }
  37 + })
  38 + .state("employeeInfoManage_form", { // 添加人员信息form
  39 + url: '/employeeInfoManage_form',
  40 + views: {
  41 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html'}
  42 + },
  43 + resolve: {
  44 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  45 + return $ocLazyLoad.load({
  46 + name: 'employeeInfoManage_form_module',
  47 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  48 + files: [
  49 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  50 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  51 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  52 + ]
  53 + });
  54 + }]
  55 + }
  56 + })
  57 + .state("employeeInfoManage_edit", { // 修改人员信息form
  58 + url: '/employeeInfoManage_edit/:id',
  59 + views: {
  60 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html'}
  61 + },
  62 + resolve: {
  63 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  64 + return $ocLazyLoad.load({
  65 + name: 'employeeInfoManage_edit_module',
  66 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  67 + files: [
  68 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  69 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  70 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  71 + ]
  72 + });
  73 + }]
  74 + }
  75 + })
  76 + .state("employeeInfoManage_detail", { // 详细信息页面
  77 + url: '/employeeInfoManage_detail/:id',
  78 + views: {
  79 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html'}
  80 + },
  81 + resolve: {
  82 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  83 + return $ocLazyLoad.load({
  84 + name: 'employeeInfoManage_detail_module',
  85 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  86 + files: [
  87 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  88 + ]
  89 + });
  90 + }]
  91 + }
  92 + })
  93 +
  94 +}]);
0 \ No newline at end of file 95 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @966e73f
@@ -118,105 +118,105 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [ @@ -118,105 +118,105 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [
118 } 118 }
119 ]); 119 ]);
120 120
121 -/**  
122 - * remoteValidatiot2指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel（专门用于时刻表sheet验证）。  
123 - * 属性如下：  
124 - * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"  
125 - * remotevparam（必须）：后端判定查询参数，如rvparam={{ {'xl.id_eq': '123'} | json }}  
126 - *  
127 - */  
128 -angular.module('ScheduleApp').directive('remoteValidationt2', [  
129 - '$$SearchInfoService_g',  
130 - function($$SearchInfoService_g) {  
131 - return {  
132 - restrict: "A", // 属性  
133 - require: "^ngModel", // 依赖所属指令的ngModel  
134 - compile: function(tElem, tAttrs) {  
135 - // 验证属性  
136 - if (!tAttrs["remotevtype"]) { // 验证类型  
137 - throw new Error("remotevtype属性必须填写");  
138 - } else if (!$$SearchInfoService_g.validate[tAttrs["remotevtype"]]) {  
139 - throw new Error(!tAttrs["remotevtype"] + "验证类型不存在");  
140 - }  
141 - if (!tAttrs["remotevparam"]) { // 查询参数  
142 - throw new Error("remotevparam属性必须填写");  
143 - }  
144 -  
145 - // 监听获取的数据  
146 - var $watch_rvtype = undefined;  
147 - var $watch_rvparam_obj = undefined;  
148 -  
149 - // 验证数据  
150 - var $$internal_validate = function(ngModelCtrl, scope) {  
151 - if ($watch_rvtype && $watch_rvparam_obj) {  
152 - // 获取查询参数模版  
153 - var paramTemplate = $$SearchInfoService_g.validate[$watch_rvtype].template;  
154 - if (!paramTemplate) {  
155 - throw new Error($watch_rvtype + "查询模版不存在");  
156 - }  
157 - // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证  
158 - var isParamAll = true;  
159 - for (var key in paramTemplate) {  
160 - if (!$watch_rvparam_obj[key]) {  
161 - isParamAll = false;  
162 - break;  
163 - }  
164 - }  
165 - if (!isParamAll) {  
166 - ngModelCtrl.$setValidity('remote', true);  
167 - } else { // 开始验证  
168 - $$SearchInfoService_g.validate[$watch_rvtype].remote.do(  
169 - $watch_rvparam_obj,  
170 - function(result) {  
171 - if (result.status == "SUCCESS") {  
172 - ngModelCtrl.$setValidity('remote', true);  
173 - } else {  
174 - ngModelCtrl.$setValidity('remote', false);  
175 - scope.ctrl.ttInfoDetailManageForForm.sheetvaliddesc = result.msg;  
176 - }  
177 - },  
178 - function(result) {  
179 - alert("出错拉");  
180 - ngModelCtrl.$setValidity('remote', true);  
181 - }  
182 - );  
183 - }  
184 - }  
185 - };  
186 -  
187 - return {  
188 - pre: function(scope, element, attr) {  
189 -  
190 - },  
191 -  
192 - post: function(scope, element, attr, ngModelCtrl) {  
193 - /**  
194 - * 监控验证类型属性变化。  
195 - */  
196 - attr.$observe("remotevtype", function(value) {  
197 - if (value && value != "") {  
198 - $watch_rvtype = value;  
199 - $$internal_validate(ngModelCtrl, scope);  
200 - }  
201 - });  
202 - /**  
203 - * 监控查询结果属性变化。  
204 - */  
205 - attr.$observe("remotevparam", function(value) {  
206 - if (value && value != "") {  
207 - //if (!ngModelCtrl.$dirty) { // 没有修改过模型数据，不验证  
208 - // return;  
209 - //}  
210 - $watch_rvparam_obj = JSON.parse(value);  
211 - $$internal_validate(ngModelCtrl, scope);  
212 - }  
213 - });  
214 - }  
215 - };  
216 - }  
217 - }  
218 - }  
219 -]); 121 +/**
  122 + * remoteValidatiot2指令，远程数据验证验证，作为属性放在某个指令上，依赖与指令的ngModel（专门用于时刻表sheet验证）。
  123 + * 属性如下：
  124 + * remotevtype（必须）：验证类型（在service中有对应映射），如rvtype="xl"
  125 + * remotevparam（必须）：后端判定查询参数，如rvparam={{ {'xl.id_eq': '123'} | json }}
  126 + *
  127 + */
  128 +angular.module('ScheduleApp').directive('remoteValidationt2', [
  129 + '$$SearchInfoService_g',
  130 + function($$SearchInfoService_g) {
  131 + return {
  132 + restrict: "A", // 属性
  133 + require: "^ngModel", // 依赖所属指令的ngModel
  134 + compile: function(tElem, tAttrs) {
  135 + // 验证属性
  136 + if (!tAttrs["remotevtype"]) { // 验证类型
  137 + throw new Error("remotevtype属性必须填写");
  138 + } else if (!$$SearchInfoService_g.validate[tAttrs["remotevtype"]]) {
  139 + throw new Error(!tAttrs["remotevtype"] + "验证类型不存在");
  140 + }
  141 + if (!tAttrs["remotevparam"]) { // 查询参数
  142 + throw new Error("remotevparam属性必须填写");
  143 + }
  144 +
  145 + // 监听获取的数据
  146 + var $watch_rvtype = undefined;
  147 + var $watch_rvparam_obj = undefined;
  148 +
  149 + // 验证数据
  150 + var $$internal_validate = function(ngModelCtrl, scope) {
  151 + if ($watch_rvtype && $watch_rvparam_obj) {
  152 + // 获取查询参数模版
  153 + var paramTemplate = $$SearchInfoService_g.validate[$watch_rvtype].template;
  154 + if (!paramTemplate) {
  155 + throw new Error($watch_rvtype + "查询模版不存在");
  156 + }
  157 + // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证
  158 + var isParamAll = true;
  159 + for (var key in paramTemplate) {
  160 + if (!$watch_rvparam_obj[key]) {
  161 + isParamAll = false;
  162 + break;
  163 + }
  164 + }
  165 + if (!isParamAll) {
  166 + ngModelCtrl.$setValidity('remote', true);
  167 + } else { // 开始验证
  168 + $$SearchInfoService_g.validate[$watch_rvtype].remote.do(
  169 + $watch_rvparam_obj,
  170 + function(result) {
  171 + if (result.status == "SUCCESS") {
  172 + ngModelCtrl.$setValidity('remote', true);
  173 + } else {
  174 + ngModelCtrl.$setValidity('remote', false);
  175 + scope.ctrl.ttInfoDetailManageForForm.sheetvaliddesc = result.msg;
  176 + }
  177 + },
  178 + function(result) {
  179 + alert("出错拉");
  180 + ngModelCtrl.$setValidity('remote', true);
  181 + }
  182 + );
  183 + }
  184 + }
  185 + };
  186 +
  187 + return {
  188 + pre: function(scope, element, attr) {
  189 +
  190 + },
  191 +
  192 + post: function(scope, element, attr, ngModelCtrl) {
  193 + /**
  194 + * 监控验证类型属性变化。
  195 + */
  196 + attr.$observe("remotevtype", function(value) {
  197 + if (value && value != "") {
  198 + $watch_rvtype = value;
  199 + $$internal_validate(ngModelCtrl, scope);
  200 + }
  201 + });
  202 + /**
  203 + * 监控查询结果属性变化。
  204 + */
  205 + attr.$observe("remotevparam", function(value) {
  206 + if (value && value != "") {
  207 + //if (!ngModelCtrl.$dirty) { // 没有修改过模型数据，不验证
  208 + // return;
  209 + //}
  210 + $watch_rvparam_obj = JSON.parse(value);
  211 + $$internal_validate(ngModelCtrl, scope);
  212 + }
  213 + });
  214 + }
  215 + };
  216 + }
  217 + }
  218 + }
  219 +]);
220 220
221 221
222 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) { 222 angular.module('ScheduleApp').directive("saSelect", ['$timeout', function($timeout) {
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @966e73f
1 -// ui route 配置 1 +//所有模块ui route 配置// ui route 配置
2 2
3 -/** 配置所有模块页面route */  
4 -ScheduleApp.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {  
5 - // 默认路由  
6 - //$urlRouterProvider.otherwise('/busConfig.html'); 3 +/** 车辆基础信息模块配置route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
7 10
8 - $stateProvider  
9 - // 车辆基础信息模块配置  
10 - .state("busInfoManage", {  
11 - url: '/busInfoManage',  
12 - views: {  
13 - "": {  
14 - templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/index.html' 11 + $stateProvider
  12 + .state("busInfoManage", { // index页面
  13 + url: '/busInfoManage',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/index.html'
  17 + },
  18 + "busInfoManage_list@busInfoManage": {
  19 + templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html'
  20 + }
15 }, 21 },
16 - "busInfoManage_list@busInfoManage": {  
17 - templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/list.html'  
18 - }  
19 - },  
20 -  
21 - resolve: {  
22 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
23 - return $ocLazyLoad.load({  
24 - name: 'busInfoManage_module',  
25 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
26 - files: [  
27 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
28 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
29 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
30 - "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"  
31 - ]  
32 - });  
33 - }]  
34 - }  
35 - })  
36 - .state("busInfoManage_form", {  
37 - url: '/busInfoManage_form',  
38 - views: {  
39 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/form.html'}  
40 - },  
41 - resolve: {  
42 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
43 - return $ocLazyLoad.load({  
44 - name: 'busInfoManage_form_module',  
45 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
46 - files: [  
47 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
48 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
49 - "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"  
50 - ]  
51 - });  
52 - }]  
53 - }  
54 - })  
55 - .state("busInfoManage_edit", {  
56 - url: '/busInfoManage_edit/:id',  
57 - views: {  
58 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/edit.html'}  
59 - },  
60 - resolve: {  
61 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
62 - return $ocLazyLoad.load({  
63 - name: 'busInfoManage_edit_module',  
64 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
65 - files: [  
66 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
67 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
68 - "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"  
69 - ]  
70 - });  
71 - }]  
72 - }  
73 - })  
74 - .state("busInfoManage_detail", {  
75 - url: '/busInfoManage_detail/:id',  
76 - views: {  
77 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/detail.html'}  
78 - },  
79 - resolve: {  
80 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
81 - return $ocLazyLoad.load({  
82 - name: 'busInfoManage_detail_module',  
83 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
84 - files: [  
85 - "pages/scheduleApp/module/basicInfo/busInfoManage/busInfoManage.js"  
86 - ]  
87 - });  
88 - }]  
89 - }  
90 - })  
91 22
92 - // 人员基础信息模块配置  
93 - .state("employeeInfoManage", {  
94 - url: '/employeeInfoManage',  
95 - views: {  
96 - "": {  
97 - templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html' 23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'busInfoManage_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  32 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  33 + ]
  34 + });
  35 + }]
  36 + }
  37 + })
  38 + .state("busInfoManage_form", { // 添加车辆form
  39 + url: '/busInfoManage_form',
  40 + views: {
  41 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/form.html'}
98 }, 42 },
99 - "employeeInfoManage_list@employeeInfoManage": {  
100 - templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html' 43 + resolve: {
  44 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  45 + return $ocLazyLoad.load({
  46 + name: 'busInfoManage_form_module',
  47 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  48 + files: [
  49 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  50 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  51 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  52 + ]
  53 + });
  54 + }]
101 } 55 }
102 - },  
103 -  
104 - resolve: {  
105 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
106 - return $ocLazyLoad.load({  
107 - name: 'employeeInfoManage_module',  
108 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
109 - files: [  
110 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
111 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
112 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
113 - "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"  
114 - ]  
115 - });  
116 - }]  
117 - }  
118 - })  
119 - .state("employeeInfoManage_form", {  
120 - url: '/employeeInfoManage_form',  
121 - views: {  
122 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html'}  
123 - },  
124 - resolve: {  
125 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
126 - return $ocLazyLoad.load({  
127 - name: 'employeeInfoManage_form_module',  
128 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
129 - files: [  
130 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
131 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
132 - "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"  
133 - ]  
134 - });  
135 - }]  
136 - }  
137 - })  
138 - .state("employeeInfoManage_edit", {  
139 - url: '/employeeInfoManage_edit/:id',  
140 - views: {  
141 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html'}  
142 - },  
143 - resolve: {  
144 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
145 - return $ocLazyLoad.load({  
146 - name: 'employeeInfoManage_edit_module',  
147 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
148 - files: [  
149 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
150 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
151 - "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"  
152 - ]  
153 - });  
154 - }]  
155 - }  
156 - })  
157 - .state("employeeInfoManage_detail", {  
158 - url: '/employeeInfoManage_detail/:id',  
159 - views: {  
160 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html'}  
161 - },  
162 - resolve: {  
163 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
164 - return $ocLazyLoad.load({  
165 - name: 'employeeInfoManage_detail_module',  
166 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
167 - files: [  
168 - "pages/scheduleApp/module/basicInfo/employeeInfoManage/employeeInfoManage.js"  
169 - ]  
170 - });  
171 - }]  
172 - }  
173 - })  
174 -  
175 - // 车辆设备信息模块配置  
176 - .state("deviceInfoManage", {  
177 - url: '/deviceInfoManage',  
178 - views: {  
179 - "": {  
180 - templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html' 56 + })
  57 + .state("busInfoManage_edit", { // 修改车辆form
  58 + url: '/busInfoManage_edit/:id',
  59 + views: {
  60 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/edit.html'}
181 }, 61 },
182 - "deviceInfoManage_list@deviceInfoManage": {  
183 - templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html' 62 + resolve: {
  63 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  64 + return $ocLazyLoad.load({
  65 + name: 'busInfoManage_edit_module',
  66 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  67 + files: [
  68 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  69 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  70 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  71 + ]
  72 + });
  73 + }]
184 } 74 }
185 - },  
186 -  
187 - resolve: {  
188 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
189 - return $ocLazyLoad.load({  
190 - name: 'deviceInfoManage_module',  
191 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
192 - files: [  
193 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
194 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
195 - "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"  
196 - ]  
197 - });  
198 - }]  
199 - }  
200 - })  
201 - .state("deviceInfoManage_form", {  
202 - url: '/deviceInfoManage_form',  
203 - views: {  
204 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html'}  
205 - },  
206 - resolve: {  
207 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
208 - return $ocLazyLoad.load({  
209 - name: 'deviceInfoManage_form_module',  
210 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
211 - files: [  
212 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
213 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
214 - "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"  
215 - ]  
216 - });  
217 - }]  
218 - }  
219 - })  
220 - .state("deviceInfoManage_edit", {  
221 - url: '/deviceInfoManage_edit/:id',  
222 - views: {  
223 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html'}  
224 - },  
225 - resolve: {  
226 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
227 - return $ocLazyLoad.load({  
228 - name: 'deviceInfoManage_edit_module',  
229 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
230 - files: [  
231 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
232 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
233 - "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"  
234 - ]  
235 - });  
236 - }]  
237 - }  
238 - })  
239 - .state("deviceInfoManage_detail", {  
240 - url: '/deviceInfoManage_detail/:id',  
241 - views: {  
242 - "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html'}  
243 - },  
244 - resolve: {  
245 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
246 - return $ocLazyLoad.load({  
247 - name: 'deviceInfoManage_detail_module',  
248 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
249 - files: [  
250 - "pages/scheduleApp/module/basicInfo/deviceInfoManage/deviceInfoManage.js"  
251 - ]  
252 - });  
253 - }]  
254 - }  
255 - })  
256 -  
257 - // 车辆配置模块  
258 - .state("busConfig", {  
259 - url: '/busConfig',  
260 - views: {  
261 - "": {  
262 - templateUrl: 'pages/scheduleApp/module/core/busConfig/index.html' 75 + })
  76 + .state("busInfoManage_detail", { // 车辆详细信息
  77 + url: '/busInfoManage_detail/:id',
  78 + views: {
  79 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/busInfoManage/detail.html'}
263 }, 80 },
264 - "busConfig_list@busConfig": {  
265 - templateUrl: 'pages/scheduleApp/module/core/busConfig/list.html' 81 + resolve: {
  82 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  83 + return $ocLazyLoad.load({
  84 + name: 'busInfoManage_detail_module',
  85 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  86 + files: [
  87 + "pages/scheduleApp/module/basicInfo/busInfoManage/module.js"
  88 + ]
  89 + });
  90 + }]
266 } 91 }
267 - }, 92 + })
  93 + }
  94 +]);
  95 +// ui route 配置
268 96
269 - resolve: {  
270 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
271 - return $ocLazyLoad.load({  
272 - name: 'busConfig_module',  
273 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
274 - files: [  
275 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
276 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
277 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
278 - "pages/scheduleApp/module/core/busConfig/busConfig.js"  
279 - ]  
280 - });  
281 - }]  
282 - }  
283 - })  
284 - .state("busConfig_form", {  
285 - url: '/busConfig_form',  
286 - views: {  
287 - "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/form.html'}  
288 - },  
289 - resolve: {  
290 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
291 - return $ocLazyLoad.load({  
292 - name: 'busConfig_form_module',  
293 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
294 - files: [  
295 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
296 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
297 - "pages/scheduleApp/module/core/busConfig/busConfig.js"  
298 - ]  
299 - });  
300 - }]  
301 - }  
302 - })  
303 - .state("busConfig_edit", {  
304 - url: '/busConfig_edit/:id',  
305 - views: {  
306 - "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/edit.html'}  
307 - },  
308 - resolve: {  
309 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
310 - return $ocLazyLoad.load({  
311 - name: 'busConfig_edit_module',  
312 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
313 - files: [  
314 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
315 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
316 - "pages/scheduleApp/module/core/busConfig/busConfig.js"  
317 - ]  
318 - });  
319 - }]  
320 - }  
321 - })  
322 - .state("busConfig_detail", {  
323 - url: '/busConfig_detail/:id',  
324 - views: {  
325 - "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/detail.html'}  
326 - },  
327 - resolve: {  
328 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
329 - return $ocLazyLoad.load({  
330 - name: 'busConfig_detail_module',  
331 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
332 - files: [  
333 - "pages/scheduleApp/module/core/busConfig/busConfig.js"  
334 - ]  
335 - });  
336 - }]  
337 - }  
338 - }) 97 +/** 车辆设备信息模块配置route */
  98 +ScheduleApp.config([
  99 + '$stateProvider',
  100 + '$urlRouterProvider',
  101 + function($stateProvider, $urlRouterProvider) {
  102 + // 默认路由
  103 + //$urlRouterProvider.otherwise('/busConfig.html');
339 104
340 - // 人员配置模块  
341 - .state("employeeConfig", {  
342 - url: '/employeeConfig',  
343 - views: {  
344 - "": {  
345 - templateUrl: 'pages/scheduleApp/module/core/employeeConfig/index.html' 105 + $stateProvider
  106 + .state("deviceInfoManage", { // index页面
  107 + url: '/deviceInfoManage',
  108 + views: {
  109 + "": {
  110 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html'
  111 + },
  112 + "deviceInfoManage_list@deviceInfoManage": {
  113 + templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html'
  114 + }
346 }, 115 },
347 - "employeeConfig_list@employeeConfig": {  
348 - templateUrl: 'pages/scheduleApp/module/core/employeeConfig/list.html'  
349 - }  
350 - },  
351 -  
352 - resolve: {  
353 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
354 - return $ocLazyLoad.load({  
355 - name: 'employeeConfig_module',  
356 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
357 - files: [  
358 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
359 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
360 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
361 - "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"  
362 - ]  
363 - });  
364 - }]  
365 - }  
366 - })  
367 - .state("employeeConfig_form", {  
368 - url: '/employeeConfig_form',  
369 - views: {  
370 - "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/form.html'}  
371 - },  
372 - resolve: {  
373 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
374 - return $ocLazyLoad.load({  
375 - name: 'employeeConfig_form_module',  
376 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
377 - files: [  
378 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
379 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
380 - "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"  
381 - ]  
382 - });  
383 - }]  
384 - }  
385 - })  
386 - .state("employeeConfig_edit", {  
387 - url: '/employeeConfig_edit/:id',  
388 - views: {  
389 - "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/edit.html'}  
390 - },  
391 - resolve: {  
392 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
393 - return $ocLazyLoad.load({  
394 - name: 'employeeConfig_edit_module',  
395 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
396 - files: [  
397 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
398 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
399 - "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"  
400 - ]  
401 - });  
402 - }]  
403 - }  
404 - })  
405 - .state("employeeConfig_detail", {  
406 - url: '/employeeConfig_detail/:id',  
407 - views: {  
408 - "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/detail.html'}  
409 - },  
410 - resolve: {  
411 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
412 - return $ocLazyLoad.load({  
413 - name: 'employeeConfig_detail_module',  
414 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
415 - files: [  
416 - "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"  
417 - ]  
418 - });  
419 - }]  
420 - }  
421 - })  
422 116
423 - // 路牌管理  
424 - .state("guideboardManage", {  
425 - url: '/guideboardManage',  
426 - views: {  
427 - "": {  
428 - templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html' 117 + resolve: {
  118 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  119 + return $ocLazyLoad.load({
  120 + name: 'deviceInfoManage_module',
  121 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  122 + files: [
  123 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  124 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  125 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  126 + ]
  127 + });
  128 + }]
  129 + }
  130 + })
  131 + .state("deviceInfoManage_form", { // 添加设备信息form
  132 + url: '/deviceInfoManage_form',
  133 + views: {
  134 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html'}
429 }, 135 },
430 - "guideboardManage_list@guideboardManage": {  
431 - templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html' 136 + resolve: {
  137 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  138 + return $ocLazyLoad.load({
  139 + name: 'deviceInfoManage_form_module',
  140 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  141 + files: [
  142 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  143 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  144 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  145 + ]
  146 + });
  147 + }]
432 } 148 }
433 - }, 149 + })
  150 + .state("deviceInfoManage_edit", { // 修改设备信息form
  151 + url: '/deviceInfoManage_edit/:id',
  152 + views: {
  153 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html'}
  154 + },
  155 + resolve: {
  156 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  157 + return $ocLazyLoad.load({
  158 + name: 'deviceInfoManage_edit_module',
  159 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  160 + files: [
  161 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  162 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  163 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  164 + ]
  165 + });
  166 + }]
  167 + }
  168 + })
  169 + .state("deviceInfoManage_detail", { // 详细信息页面
  170 + url: '/deviceInfoManage_detail/:id',
  171 + views: {
  172 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html'}
  173 + },
  174 + resolve: {
  175 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  176 + return $ocLazyLoad.load({
  177 + name: 'deviceInfoManage_detail_module',
  178 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  179 + files: [
  180 + "pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js"
  181 + ]
  182 + });
  183 + }]
  184 + }
  185 + })
434 186
435 - resolve: {  
436 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
437 - return $ocLazyLoad.load({  
438 - name: 'guideboardManage_module',  
439 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
440 - files: [  
441 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
442 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
443 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
444 - "pages/scheduleApp/module/core/guideboardManage/guideboardManage.js"  
445 - ]  
446 - });  
447 - }]  
448 - }  
449 - })  
450 - .state("guideboardManage_detail", {  
451 - url: '/guideboardManage_detail/:id',  
452 - views: {  
453 - "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}  
454 - },  
455 - resolve: {  
456 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
457 - return $ocLazyLoad.load({  
458 - name: 'guideboardManage_detail_module',  
459 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
460 - files: [  
461 - "pages/scheduleApp/module/core/guideboardManage/guideboardManage.js"  
462 - ]  
463 - });  
464 - }]  
465 - }  
466 - }) 187 + }
  188 +]);
  189 +// ui route 配置
467 190
  191 +/** 人员基础信息模块配置route */
  192 +ScheduleApp.config([
  193 + '$stateProvider',
  194 + '$urlRouterProvider',
  195 + function($stateProvider, $urlRouterProvider) {
  196 + // 默认路由
  197 + //$urlRouterProvider.otherwise('/busConfig.html');
468 198
469 - // 时刻表管理  
470 - .state("timeTableManage", {  
471 - url: '/timeTableManage',  
472 - views: {  
473 - "": {  
474 - templateUrl: 'pages/scheduleApp/module/core/timeTableManage/index.html' 199 + $stateProvider
  200 + .state("employeeInfoManage", { // index页面
  201 + url: '/employeeInfoManage',
  202 + views: {
  203 + "": {
  204 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html'
  205 + },
  206 + "employeeInfoManage_list@employeeInfoManage": {
  207 + templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html'
  208 + }
475 }, 209 },
476 - "timeTableManage_list@timeTableManage": {  
477 - templateUrl: 'pages/scheduleApp/module/core/timeTableManage/list.html'  
478 - }  
479 - },  
480 210
481 - resolve: {  
482 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
483 - return $ocLazyLoad.load({  
484 - name: 'timeTableManage_module',  
485 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
486 - files: [  
487 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
488 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
489 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
490 - "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"  
491 - ]  
492 - });  
493 - }]  
494 - }  
495 - })  
496 - .state("timeTableManage_form", {  
497 - url: '/timeTableManage_form',  
498 - views: {  
499 - "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/form.html'}  
500 - },  
501 - resolve: {  
502 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
503 - return $ocLazyLoad.load({  
504 - name: 'timeTableManage_form_module',  
505 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
506 - files: [  
507 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
508 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
509 - "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"  
510 - ]  
511 - });  
512 - }]  
513 - }  
514 - })  
515 - .state("timeTableManage_edit", {  
516 - url: '/timeTableManage_edit/:id',  
517 - views: {  
518 - "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/edit.html'}  
519 - },  
520 - resolve: {  
521 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
522 - return $ocLazyLoad.load({  
523 - name: 'timeTableManage_edit_module',  
524 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
525 - files: [  
526 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
527 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
528 - "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"  
529 - ]  
530 - });  
531 - }]  
532 - }  
533 - })  
534 - .state("timeTableManage_detail", {  
535 - url: '/timeTableManage_detail/:id',  
536 - views: {  
537 - "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/detail.html'}  
538 - },  
539 - resolve: {  
540 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
541 - return $ocLazyLoad.load({  
542 - name: 'timeTableManage_detail_module',  
543 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
544 - files: [  
545 - "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"  
546 - ]  
547 - });  
548 - }]  
549 - }  
550 - })  
551 - .state("timeTableDetailInfoManage", {  
552 - url: '/timeTableDetailInfoManage/:xlid/:ttid/:xlname/:ttname',  
553 - views: {  
554 - "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/detail_info.html'}  
555 - },  
556 - resolve: {  
557 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
558 - return $ocLazyLoad.load({  
559 - name: 'timeTableDetailInfoManage_module',  
560 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
561 - files: [  
562 - "pages/scheduleApp/module/core/timeTableManage/timeTableDetailManage.js"  
563 - ]  
564 - });  
565 - }]  
566 - }  
567 - })  
568 - .state("timeTableDetailInfoManage_detail_edit", {  
569 - url: '/timeTableDetailInfoManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',  
570 - views: {  
571 - "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/detail_info_edit.html'}  
572 - },  
573 - resolve: {  
574 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
575 - return $ocLazyLoad.load({  
576 - name: 'timeTableDetailInfoManage_module',  
577 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
578 - files: [  
579 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
580 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
581 - "pages/scheduleApp/module/core/timeTableManage/timeTableDetailManage.js"  
582 - ]  
583 - });  
584 - }]  
585 - }  
586 - })  
587 -  
588 - // 时刻表管理（新版本）  
589 - .state("ttInfoManage", { // 时刻表基础信息界面  
590 - url: '/ttInfoManage',  
591 - views: {  
592 - "": {  
593 - templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/index.html' 211 + resolve: {
  212 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  213 + return $ocLazyLoad.load({
  214 + name: 'employeeInfoManage_module',
  215 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  216 + files: [
  217 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  218 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  219 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  220 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  221 + ]
  222 + });
  223 + }]
  224 + }
  225 + })
  226 + .state("employeeInfoManage_form", { // 添加人员信息form
  227 + url: '/employeeInfoManage_form',
  228 + views: {
  229 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html'}
  230 + },
  231 + resolve: {
  232 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  233 + return $ocLazyLoad.load({
  234 + name: 'employeeInfoManage_form_module',
  235 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  236 + files: [
  237 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  238 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  239 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  240 + ]
  241 + });
  242 + }]
  243 + }
  244 + })
  245 + .state("employeeInfoManage_edit", { // 修改人员信息form
  246 + url: '/employeeInfoManage_edit/:id',
  247 + views: {
  248 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html'}
  249 + },
  250 + resolve: {
  251 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  252 + return $ocLazyLoad.load({
  253 + name: 'employeeInfoManage_edit_module',
  254 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  255 + files: [
  256 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  257 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  258 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  259 + ]
  260 + });
  261 + }]
  262 + }
  263 + })
  264 + .state("employeeInfoManage_detail", { // 详细信息页面
  265 + url: '/employeeInfoManage_detail/:id',
  266 + views: {
  267 + "": {templateUrl: 'pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html'}
594 }, 268 },
595 - "ttInfoManage_list@ttInfoManage": {  
596 - templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/list.html' 269 + resolve: {
  270 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  271 + return $ocLazyLoad.load({
  272 + name: 'employeeInfoManage_detail_module',
  273 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  274 + files: [
  275 + "pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js"
  276 + ]
  277 + });
  278 + }]
597 } 279 }
598 - }, 280 + })
599 281
600 - resolve: {  
601 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
602 - return $ocLazyLoad.load({  
603 - name: 'ttInfoManage_module',  
604 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
605 - files: [  
606 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
607 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
608 - "pages/scheduleApp/module/core/ttInfoManage/main.js"  
609 - ]  
610 - });  
611 - }]  
612 - }  
613 - })  
614 - .state("ttInfoManage_form", {  
615 - url: '/ttInfoManage_form',  
616 - views: {  
617 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/form.html'}  
618 - },  
619 - resolve: {  
620 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
621 - return $ocLazyLoad.load({  
622 - name: 'ttInfoManage_form_module',  
623 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
624 - files: [  
625 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
626 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
627 - "pages/scheduleApp/module/core/ttInfoManage/main.js"  
628 - ]  
629 - });  
630 - }]  
631 - }  
632 - })  
633 - .state("ttInfoManage_edit", {  
634 - url: '/ttInfoManage_edit/:id',  
635 - views: {  
636 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/edit.html'}  
637 - },  
638 - resolve: {  
639 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
640 - return $ocLazyLoad.load({  
641 - name: 'ttInfoManage_edit_module',  
642 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
643 - files: [  
644 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
645 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
646 - "pages/scheduleApp/module/core/ttInfoManage/main.js"  
647 - ]  
648 - });  
649 - }]  
650 - }  
651 - })  
652 - .state("ttInfoManage_detail", {  
653 - url: '/ttInfoManage_detail/:id',  
654 - views: {  
655 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detail.html'}  
656 - },  
657 - resolve: {  
658 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
659 - return $ocLazyLoad.load({  
660 - name: 'ttInfoManage_detail_module',  
661 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
662 - files: [  
663 - "pages/scheduleApp/module/core/ttInfoManage/main.js"  
664 - ]  
665 - });  
666 - }]  
667 - }  
668 - })  
669 - .state("ttInfoDetailManage_form", {  
670 - url: '/ttInfoDetailManage_form/:xlid/:ttid/:xlname/:ttname',  
671 - views: {  
672 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoDetailManage/form.html'}  
673 - },  
674 - resolve: {  
675 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
676 - return $ocLazyLoad.load({  
677 - name: 'ttInfoDetailManage_form_module',  
678 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
679 - files: [  
680 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
681 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
682 - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",  
683 - "pages/scheduleApp/module/core/ttInfoDetailManage/main.js"  
684 - ]  
685 - });  
686 - }]  
687 - }  
688 - })  
689 - .state("ttInfoDetailManage_edit", {  
690 - url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname',  
691 - views: {  
692 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoDetailManage/edit.html'}  
693 - },  
694 - resolve: {  
695 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
696 - return $ocLazyLoad.load({  
697 - name: 'ttInfoDetailManage_edit_module',  
698 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
699 - files: [  
700 - "pages/scheduleApp/module/core/ttInfoDetailManage/timeTableDetailManage_old.js"  
701 - ]  
702 - });  
703 - }]  
704 - }  
705 - })  
706 - .state("ttInfoDetailManage_detail_edit", {  
707 - url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',  
708 - views: {  
709 - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoDetailManage/edit-detail.html'}  
710 - },  
711 - resolve: {  
712 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
713 - return $ocLazyLoad.load({  
714 - name: 'ttInfoDetailManage_detail_edit_module',  
715 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
716 - files: [  
717 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
718 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
719 - "pages/scheduleApp/module/core/ttInfoDetailManage/timeTableDetailManage_old.js"  
720 - ]  
721 - });  
722 - }]  
723 - }  
724 - }) 282 +}]);
  283 +// ui route 配置
725 284
  285 +/** 车辆配置模块页面route */
  286 +ScheduleApp.config([
  287 + '$stateProvider',
  288 + '$urlRouterProvider',
  289 + function($stateProvider, $urlRouterProvider) {
  290 + // 默认路由
  291 + //$urlRouterProvider.otherwise('/busConfig.html');
726 292
  293 + $stateProvider
  294 + .state("busConfig", { // index主页面
  295 + url: '/busConfig',
  296 + views: {
  297 + "": {
  298 + templateUrl: 'pages/scheduleApp/module/core/busConfig/index.html'
  299 + },
  300 + "busConfig_list@busConfig": {
  301 + templateUrl: 'pages/scheduleApp/module/core/busConfig/list.html'
  302 + }
  303 + },
727 304
  305 + resolve: {
  306 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  307 + return $ocLazyLoad.load({
  308 + name: 'busConfig_module',
  309 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  310 + files: [
  311 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  312 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  313 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  314 + "pages/scheduleApp/module/core/busConfig/module.js"
  315 + ]
  316 + });
  317 + }]
  318 + }
  319 + })
  320 + .state("busConfig_form", { // 添加页面
  321 + url: '/busConfig_form',
  322 + views: {
  323 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/form.html'}
  324 + },
  325 + resolve: {
  326 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  327 + return $ocLazyLoad.load({
  328 + name: 'busConfig_form_module',
  329 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  330 + files: [
  331 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  332 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  333 + "pages/scheduleApp/module/core/busConfig/module.js"
  334 + ]
  335 + });
  336 + }]
  337 + }
  338 + })
  339 + .state("busConfig_edit", { // 修改页面
  340 + url: '/busConfig_edit/:id',
  341 + views: {
  342 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/edit.html'}
  343 + },
  344 + resolve: {
  345 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  346 + return $ocLazyLoad.load({
  347 + name: 'busConfig_edit_module',
  348 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  349 + files: [
  350 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  351 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  352 + "pages/scheduleApp/module/core/busConfig/module.js"
  353 + ]
  354 + });
  355 + }]
  356 + }
  357 + })
  358 + .state("busConfig_detail", { // 详细信息页面
  359 + url: '/busConfig_detail/:id',
  360 + views: {
  361 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/detail.html'}
  362 + },
  363 + resolve: {
  364 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  365 + return $ocLazyLoad.load({
  366 + name: 'busConfig_detail_module',
  367 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  368 + files: [
  369 + "pages/scheduleApp/module/core/busConfig/module.js"
  370 + ]
  371 + });
  372 + }]
  373 + }
  374 + });
  375 + }
  376 +]);
728 377
729 378
730 379
  380 +// ui route 配置
731 381
  382 +/** 线路运营概览配置route */
  383 +ScheduleApp.config([
  384 + '$stateProvider',
  385 + '$urlRouterProvider',
  386 + function($stateProvider, $urlRouterProvider) {
  387 + // 默认路由
  388 + //$urlRouterProvider.otherwise('/busConfig.html');
732 389
  390 + $stateProvider
  391 + .state("busLineInfoStat", { // index页面
  392 + url: '/busLineInfoStat',
  393 + views: {
  394 + "": {
  395 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/index.html'
  396 + },
  397 + "busLineInfoStat_list@busLineInfoStat": {
  398 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/list.html'
  399 + }
  400 + },
733 401
  402 + resolve: {
  403 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  404 + return $ocLazyLoad.load({
  405 + name: 'busLineInfoStat_module',
  406 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  407 + files: [
  408 + "pages/scheduleApp/module/core/busLineInfoStat/module.js"
  409 + ]
  410 + });
  411 + }]
  412 + }
  413 + });
734 414
  415 + }
  416 +]);
  417 +// ui route 配置
735 418
  419 +/** 人员配置模块页面route */
  420 +ScheduleApp.config([
  421 + '$stateProvider',
  422 + '$urlRouterProvider',
  423 + function($stateProvider, $urlRouterProvider) {
  424 + // 默认路由
  425 + //$urlRouterProvider.otherwise('/busConfig.html');
736 426
  427 + $stateProvider
  428 + .state("employeeConfig", { // index页面
  429 + url: '/employeeConfig',
  430 + views: {
  431 + "": {
  432 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/index.html'
  433 + },
  434 + "employeeConfig_list@employeeConfig": {
  435 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/list.html'
  436 + }
  437 + },
737 438
  439 + resolve: {
  440 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  441 + return $ocLazyLoad.load({
  442 + name: 'employeeConfig_module',
  443 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  444 + files: [
  445 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  446 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  447 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  448 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  449 + ]
  450 + });
  451 + }]
  452 + }
  453 + })
  454 + .state("employeeConfig_form", { // 添加人员配置form
  455 + url: '/employeeConfig_form',
  456 + views: {
  457 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/form.html'}
  458 + },
  459 + resolve: {
  460 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  461 + return $ocLazyLoad.load({
  462 + name: 'employeeConfig_form_module',
  463 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  464 + files: [
  465 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  466 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  467 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  468 + ]
  469 + });
  470 + }]
  471 + }
  472 + })
  473 + .state("employeeConfig_edit", { // 修改人员配置form
  474 + url: '/employeeConfig_edit/:id',
  475 + views: {
  476 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/edit.html'}
  477 + },
  478 + resolve: {
  479 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  480 + return $ocLazyLoad.load({
  481 + name: 'employeeConfig_edit_module',
  482 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  483 + files: [
  484 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  485 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  486 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  487 + ]
  488 + });
  489 + }]
  490 + }
  491 + })
  492 + .state("employeeConfig_detail", { // 详细信息页面
  493 + url: '/employeeConfig_detail/:id',
  494 + views: {
  495 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/detail.html'}
  496 + },
  497 + resolve: {
  498 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  499 + return $ocLazyLoad.load({
  500 + name: 'employeeConfig_detail_module',
  501 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  502 + files: [
  503 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  504 + ]
  505 + });
  506 + }]
  507 + }
  508 + })
738 509
  510 + }
  511 +]);
  512 +// ui route 配置
739 513
  514 +/** 路牌管理配置所有模块页面route */
  515 +ScheduleApp.config([
  516 + '$stateProvider',
  517 + '$urlRouterProvider',
  518 + function($stateProvider, $urlRouterProvider) {
  519 + // 默认路由
  520 + //$urlRouterProvider.otherwise('/busConfig.html');
740 521
  522 + $stateProvider
  523 + .state("guideboardManage", { // index页面
  524 + url: '/guideboardManage',
  525 + views: {
  526 + "": {
  527 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
  528 + },
  529 + "guideboardManage_list@guideboardManage": {
  530 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
  531 + }
  532 + },
741 533
  534 + resolve: {
  535 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  536 + return $ocLazyLoad.load({
  537 + name: 'guideboardManage_module',
  538 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  539 + files: [
  540 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  541 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  542 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  543 + "pages/scheduleApp/module/core/guideboardManage/module.js"
  544 + ]
  545 + });
  546 + }]
  547 + }
  548 + })
  549 + .state("guideboardManage_detail", { // 详细信息页面
  550 + url: '/guideboardManage_detail/:id',
  551 + views: {
  552 + "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}
  553 + },
  554 + resolve: {
  555 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  556 + return $ocLazyLoad.load({
  557 + name: 'guideboardManage_detail_module',
  558 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  559 + files: [
  560 + "pages/scheduleApp/module/core/guideboardManage/module.js"
  561 + ]
  562 + });
  563 + }]
  564 + }
  565 + })
742 566
  567 +}]);
  568 +// ui route 配置
743 569
  570 +/** 套跑管理模块配置页面route */
  571 +ScheduleApp.config([
  572 + '$stateProvider',
  573 + '$urlRouterProvider',
  574 + function($stateProvider, $urlRouterProvider) {
  575 + // 默认路由
  576 + //$urlRouterProvider.otherwise('/busConfig.html');
744 577
  578 + $stateProvider
  579 + .state("rerunManage", { // index页面
  580 + url: '/rerunManage',
  581 + views: {
  582 + "": {
  583 + templateUrl: 'pages/scheduleApp/module/core/rerunManage/index.html'
  584 + },
  585 + "rerunManage_list@rerunManage": {
  586 + templateUrl: 'pages/scheduleApp/module/core/rerunManage/list.html'
  587 + }
  588 + },
745 589
746 - // 排班规则管理模块  
747 - .state("scheduleRuleManage", {  
748 - url: '/scheduleRuleManage',  
749 - views: {  
750 - "": {  
751 - templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/index.html' 590 + resolve: {
  591 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  592 + return $ocLazyLoad.load({
  593 + name: 'rerunManage_module',
  594 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  595 + files: [
  596 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  597 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  598 + "pages/scheduleApp/module/core/rerunManage/module.js"
  599 + ]
  600 + });
  601 + }]
  602 + }
  603 + })
  604 + .state("rerunManage_form", { // 添加套跑form
  605 + url: '/rerunManage_form',
  606 + views: {
  607 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/form.html'}
752 }, 608 },
753 - "scheduleRuleManage_list@scheduleRuleManage": {  
754 - templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/list.html' 609 + resolve: {
  610 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  611 + return $ocLazyLoad.load({
  612 + name: 'rerunManage_form_module',
  613 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  614 + files: [
  615 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  616 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  617 + "pages/scheduleApp/module/core/rerunManage/module.js"
  618 + ]
  619 + });
  620 + }]
755 } 621 }
756 - },  
757 -  
758 - resolve: {  
759 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
760 - return $ocLazyLoad.load({  
761 - name: 'scheduleRuleManage_module',  
762 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
763 - files: [  
764 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
765 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
766 - "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"  
767 - ]  
768 - });  
769 - }]  
770 - }  
771 - })  
772 - .state("scheduleRuleManage_form", {  
773 - url: '/scheduleRuleManage_form',  
774 - views: {  
775 - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/form.html'}  
776 - },  
777 - resolve: {  
778 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
779 - return $ocLazyLoad.load({  
780 - name: 'scheduleRuleManage_form_module',  
781 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
782 - files: [  
783 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
784 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
785 - "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"  
786 - ]  
787 - });  
788 - }]  
789 - }  
790 - })  
791 - .state("scheduleRuleManage_edit", {  
792 - url: '/scheduleRuleManage_edit/:id',  
793 - views: {  
794 - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/edit.html'}  
795 - },  
796 - resolve: {  
797 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
798 - return $ocLazyLoad.load({  
799 - name: 'scheduleRuleManage_edit_module',  
800 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
801 - files: [  
802 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
803 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
804 - "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"  
805 - ]  
806 - });  
807 - }]  
808 - }  
809 - })  
810 - .state("scheduleRuleManage_detail", {  
811 - url: '/scheduleRuleManage_detail/:id',  
812 - views: {  
813 - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/detail.html'}  
814 - },  
815 - resolve: {  
816 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
817 - return $ocLazyLoad.load({  
818 - name: 'scheduleRuleManage_detail_module',  
819 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
820 - files: [  
821 - "pages/scheduleApp/module/core/scheduleRuleManage/scheduleRuleManage.js"  
822 - ]  
823 - });  
824 - }]  
825 - }  
826 - })  
827 -  
828 - // 套跑管理模块  
829 - .state("rerunManage", {  
830 - url: '/rerunManage',  
831 - views: {  
832 - "": {  
833 - templateUrl: 'pages/scheduleApp/module/core/rerunManage/index.html' 622 + })
  623 + .state("rerunManage_edit", { // 修改套跑form
  624 + url: '/rerunManage_edit/:id',
  625 + views: {
  626 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/edit.html'}
  627 + },
  628 + resolve: {
  629 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  630 + return $ocLazyLoad.load({
  631 + name: 'rerunManage_edit_module',
  632 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  633 + files: [
  634 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  635 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  636 + "pages/scheduleApp/module/core/rerunManage/module.js"
  637 + ]
  638 + });
  639 + }]
  640 + }
  641 + })
  642 + .state("rerunManage_detail", { // 详细信息页面
  643 + url: '/rerunManage_detail/:id',
  644 + views: {
  645 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/detail.html'}
834 }, 646 },
835 - "rerunManage_list@rerunManage": {  
836 - templateUrl: 'pages/scheduleApp/module/core/rerunManage/list.html' 647 + resolve: {
  648 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  649 + return $ocLazyLoad.load({
  650 + name: 'rerunManage_detail_module',
  651 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  652 + files: [
  653 + "pages/scheduleApp/module/core/rerunManage/module.js"
  654 + ]
  655 + });
  656 + }]
837 } 657 }
838 - }, 658 + })
  659 + }
  660 +]);
  661 +// ui route 配置
839 662
840 - resolve: {  
841 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
842 - return $ocLazyLoad.load({  
843 - name: 'rerunManage_module',  
844 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
845 - files: [  
846 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
847 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
848 - "pages/scheduleApp/module/core/rerunManage/main.js"  
849 - ]  
850 - });  
851 - }]  
852 - }  
853 - })  
854 - .state("rerunManage_form", {  
855 - url: '/rerunManage_form',  
856 - views: {  
857 - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/form.html'}  
858 - },  
859 - resolve: {  
860 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
861 - return $ocLazyLoad.load({  
862 - name: 'rerunManage_form_module',  
863 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
864 - files: [  
865 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
866 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
867 - "pages/scheduleApp/module/core/rerunManage/main.js"  
868 - ]  
869 - });  
870 - }]  
871 - }  
872 - })  
873 - .state("rerunManage_edit", {  
874 - url: '/rerunManage_edit/:id',  
875 - views: {  
876 - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/edit.html'}  
877 - },  
878 - resolve: {  
879 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
880 - return $ocLazyLoad.load({  
881 - name: 'rerunManage_edit_module',  
882 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
883 - files: [  
884 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
885 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
886 - "pages/scheduleApp/module/core/rerunManage/main.js"  
887 - ]  
888 - });  
889 - }]  
890 - }  
891 - })  
892 - .state("rerunManage_detail", {  
893 - url: '/rerunManage_detail/:id',  
894 - views: {  
895 - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/detail.html'}  
896 - },  
897 - resolve: {  
898 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
899 - return $ocLazyLoad.load({  
900 - name: 'rerunManage_detail_module',  
901 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
902 - files: [  
903 - "pages/scheduleApp/module/core/rerunManage/main.js"  
904 - ]  
905 - });  
906 - }]  
907 - }  
908 - }) 663 +/** 排班计划管理配置route */
  664 +ScheduleApp.config([
  665 + '$stateProvider',
  666 + '$urlRouterProvider',
  667 + function($stateProvider, $urlRouterProvider) {
  668 + // 默认路由
  669 + //$urlRouterProvider.otherwise('/busConfig.html');
909 670
910 - // 排班计划管理模块  
911 - .state("schedulePlanManage", {  
912 - url: '/schedulePlanManage',  
913 - views: {  
914 - "": {  
915 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index.html' 671 + $stateProvider
  672 + .state("schedulePlanManage", { // index页面
  673 + url: '/schedulePlanManage',
  674 + views: {
  675 + "": {
  676 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index.html'
  677 + },
  678 + "schedulePlanManage_list@schedulePlanManage": {
  679 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list.html'
  680 + }
916 }, 681 },
917 - "schedulePlanManage_list@schedulePlanManage": {  
918 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list.html' 682 +
  683 + resolve: {
  684 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  685 + return $ocLazyLoad.load({
  686 + name: 'schedulePlanManage_module',
  687 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  688 + files: [
  689 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  690 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  691 + "pages/scheduleApp/module/core/schedulePlanManage/module.js"
  692 + ]
  693 + });
  694 + }]
919 } 695 }
920 - }, 696 + })
  697 + .state("schedulePlanManage_form", { // 添加排班计划form
  698 + url: '/schedulePlanManage_form',
  699 + views: {
  700 + "": {
  701 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/form.html'
  702 + }
  703 + },
921 704
922 - resolve: {  
923 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
924 - return $ocLazyLoad.load({  
925 - name: 'schedulePlanManage_module',  
926 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
927 - files: [  
928 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
929 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
930 - "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js"  
931 - ]  
932 - });  
933 - }]  
934 - }  
935 - })  
936 - .state("schedulePlanManage_form", {  
937 - url: '/schedulePlanManage_form',  
938 - views: {  
939 - "": {  
940 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/form.html' 705 + resolve: {
  706 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  707 + return $ocLazyLoad.load({
  708 + name: 'schedulePlanManage_form_module',
  709 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  710 + files: [
  711 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  712 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  713 + "pages/scheduleApp/module/core/schedulePlanManage/module.js"
  714 + ]
  715 + });
  716 + }]
941 } 717 }
942 - }, 718 + })
943 719
944 - resolve: {  
945 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
946 - return $ocLazyLoad.load({  
947 - name: 'schedulePlanManage_form_module',  
948 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
949 - files: [  
950 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
951 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
952 - "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js"  
953 - ]  
954 - });  
955 - }]  
956 - }  
957 - })  
958 720
959 - // 排班计划明细管理模块  
960 - .state("schedulePlanInfoManage", {  
961 - url: '/schedulePlanInfoManage/:spid/:xlname/:ttname/:stime/:etime',  
962 - views: {  
963 - "": {  
964 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index_info.html' 721 + }
  722 +]);
  723 +// ui route 配置
  724 +
  725 +/** 排班计划明细配置route */
  726 +ScheduleApp.config([
  727 + '$stateProvider',
  728 + '$urlRouterProvider',
  729 + function($stateProvider, $urlRouterProvider) {
  730 + // 默认路由
  731 + //$urlRouterProvider.otherwise('/busConfig.html');
  732 +
  733 + $stateProvider
  734 + // 排班计划明细管理模块
  735 + .state("schedulePlanInfoManage", {
  736 + url: '/schedulePlanInfoManage/:spid/:xlname/:ttname/:stime/:etime',
  737 + views: {
  738 + "": {
  739 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/index_info.html'
  740 + },
  741 + "schedulePlanInfoManage_list@schedulePlanInfoManage": {
  742 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html'
  743 + }
965 }, 744 },
966 - "schedulePlanInfoManage_list@schedulePlanInfoManage": {  
967 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list_info.html' 745 +
  746 + resolve: {
  747 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  748 + return $ocLazyLoad.load({
  749 + name: 'schedulePlanInfoManage_module',
  750 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  751 + files: [
  752 + "pages/scheduleApp/module/core/schedulePlanManage/info/module.js"
  753 + ]
  754 + });
  755 + }]
968 } 756 }
969 - }, 757 + });
  758 +
  759 + }
  760 +]);
  761 +// ui route 配置
970 762
971 - resolve: {  
972 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
973 - return $ocLazyLoad.load({  
974 - name: 'schedulePlanInfoManage_module',  
975 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
976 - files: [  
977 - "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js"  
978 - ]  
979 - });  
980 - }]  
981 - }  
982 - }) 763 +/** 排班调度值勤日报配置route */
  764 +ScheduleApp.config([
  765 + '$stateProvider',
  766 + '$urlRouterProvider',
  767 + function($stateProvider, $urlRouterProvider) {
  768 + // 默认路由
  769 + //$urlRouterProvider.otherwise('/busConfig.html');
983 770
984 - // 排班调度值勤日报模块  
985 - .state("schedulePlanReportManage", {  
986 - url: '/schedulePlanReportManage',  
987 - views: {  
988 - "": {  
989 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index_report.html' 771 + $stateProvider
  772 + .state("schedulePlanReportManage", {
  773 + url: '/schedulePlanReportManage',
  774 + views: {
  775 + "": {
  776 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/index_report.html'
  777 + },
  778 + "schedulePlanReportManage_list@schedulePlanReportManage": {
  779 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/list_report.html'
  780 + }
990 }, 781 },
991 - "schedulePlanReportManage_list@schedulePlanReportManage": {  
992 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list_report.html'  
993 - }  
994 - },  
995 782
996 - resolve: {  
997 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
998 - return $ocLazyLoad.load({  
999 - name: 'schedulePlanManage_module',  
1000 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1001 - files: [  
1002 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
1003 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
1004 - "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js"  
1005 - ]  
1006 - });  
1007 - }]  
1008 - }  
1009 - }) 783 + resolve: {
  784 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  785 + return $ocLazyLoad.load({
  786 + name: 'schedulePlanManage_module',
  787 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  788 + files: [
  789 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  790 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  791 + "pages/scheduleApp/module/core/schedulePlanManage/report/module.js"
  792 + ]
  793 + });
  794 + }]
  795 + }
  796 + })
  797 + .state("schedulePlanReportManage_edit", {
  798 + url: '/schedulePlanReportManage_edit',
  799 + params: {type: 0, groupInfo: null},
  800 + views: {
  801 + "": {
  802 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/edit_report.html'
  803 + }
  804 + },
1010 805
1011 - .state("schedulePlanReportManage_edit", {  
1012 - url: '/schedulePlanReportManage_edit',  
1013 - params: {type: 0, groupInfo: null},  
1014 - views: {  
1015 - "": {  
1016 - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/edit_report.html' 806 + resolve: {
  807 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  808 + return $ocLazyLoad.load({
  809 + name: 'schedulePlanReportManage_edit_module',
  810 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  811 + files: [
  812 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  813 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  814 + "pages/scheduleApp/module/core/schedulePlanManage/report/module.js"
  815 + ]
  816 + });
  817 + }]
1017 } 818 }
1018 - }, 819 + });
1019 820
1020 - resolve: {  
1021 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
1022 - return $ocLazyLoad.load({  
1023 - name: 'schedulePlanReportManage_edit_module',  
1024 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1025 - files: [  
1026 - "assets/bower_components/angular-ui-select/dist/select.min.css",  
1027 - "assets/bower_components/angular-ui-select/dist/select.min.js",  
1028 - "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js"  
1029 - ]  
1030 - });  
1031 - }]  
1032 - }  
1033 - }) 821 + }
  822 +]);
  823 +// ui route 配置
  824 +
  825 +/** 排班规则模块配置route */
  826 +ScheduleApp.config([
  827 + '$stateProvider',
  828 + '$urlRouterProvider',
  829 + function($stateProvider, $urlRouterProvider) {
  830 + // 默认路由
  831 + //$urlRouterProvider.otherwise('/busConfig.html');
1034 832
1035 - // 线路运营概览模块  
1036 - .state("busLineInfoStat", {  
1037 - url: '/busLineInfoStat',  
1038 - views: {  
1039 - "": {  
1040 - templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/index.html' 833 + $stateProvider
  834 + .state("scheduleRuleManage", { // index页面
  835 + url: '/scheduleRuleManage',
  836 + views: {
  837 + "": {
  838 + templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/index.html'
  839 + },
  840 + "scheduleRuleManage_list@scheduleRuleManage": {
  841 + templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/list.html'
  842 + }
1041 }, 843 },
1042 - "busLineInfoStat_list@busLineInfoStat": {  
1043 - templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/list.html' 844 +
  845 + resolve: {
  846 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  847 + return $ocLazyLoad.load({
  848 + name: 'scheduleRuleManage_module',
  849 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  850 + files: [
  851 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  852 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  853 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  854 + ]
  855 + });
  856 + }]
1044 } 857 }
1045 - }, 858 + })
  859 + .state("scheduleRuleManage_form", { // 添加排班规则form
  860 + url: '/scheduleRuleManage_form',
  861 + views: {
  862 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/form.html'}
  863 + },
  864 + resolve: {
  865 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  866 + return $ocLazyLoad.load({
  867 + name: 'scheduleRuleManage_form_module',
  868 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  869 + files: [
  870 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  871 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  872 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  873 + ]
  874 + });
  875 + }]
  876 + }
  877 + })
  878 + .state("scheduleRuleManage_edit", { // 修改排班规则form
  879 + url: '/scheduleRuleManage_edit/:id',
  880 + views: {
  881 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/edit.html'}
  882 + },
  883 + resolve: {
  884 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  885 + return $ocLazyLoad.load({
  886 + name: 'scheduleRuleManage_edit_module',
  887 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  888 + files: [
  889 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  890 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  891 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  892 + ]
  893 + });
  894 + }]
  895 + }
  896 + })
  897 + .state("scheduleRuleManage_detail", { // 详细信息
  898 + url: '/scheduleRuleManage_detail/:id',
  899 + views: {
  900 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/detail.html'}
  901 + },
  902 + resolve: {
  903 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  904 + return $ocLazyLoad.load({
  905 + name: 'scheduleRuleManage_detail_module',
  906 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  907 + files: [
  908 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  909 + ]
  910 + });
  911 + }]
  912 + }
  913 + })
  914 + }
  915 +]);
  916 +// ui route 配置
1046 917
1047 - resolve: {  
1048 - deps: ['$ocLazyLoad', function($ocLazyLoad) {  
1049 - return $ocLazyLoad.load({  
1050 - name: 'busLineInfoStat_module',  
1051 - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置  
1052 - files: [  
1053 - "pages/scheduleApp/module/core/busLineInfoStat/busLineInfoStat.js"  
1054 - ]  
1055 - });  
1056 - }]  
1057 - }  
1058 - }) 918 +/** 时刻表管理配置route */
  919 +ScheduleApp.config([
  920 + '$stateProvider',
  921 + '$urlRouterProvider',
  922 + function($stateProvider, $urlRouterProvider) {
  923 + // 默认路由
  924 + //$urlRouterProvider.otherwise('/busConfig.html');
1059 925
  926 + $stateProvider
  927 + .state("ttInfoManage", { // index页面
  928 + url: '/ttInfoManage',
  929 + views: {
  930 + "": {
  931 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/index.html'
  932 + },
  933 + "ttInfoManage_list@ttInfoManage": {
  934 + templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/list.html'
  935 + }
  936 + },
1060 937
  938 + resolve: {
  939 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  940 + return $ocLazyLoad.load({
  941 + name: 'ttInfoManage_module',
  942 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  943 + files: [
  944 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  945 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  946 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  947 + ]
  948 + });
  949 + }]
  950 + }
  951 + })
  952 + .state("ttInfoManage_form", { // 添加时刻表信息form
  953 + url: '/ttInfoManage_form',
  954 + views: {
  955 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/form.html'}
  956 + },
  957 + resolve: {
  958 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  959 + return $ocLazyLoad.load({
  960 + name: 'ttInfoManage_form_module',
  961 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  962 + files: [
  963 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  964 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  965 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  966 + ]
  967 + });
  968 + }]
  969 + }
  970 + })
  971 + .state("ttInfoManage_edit", { // 修改时刻表信息form
  972 + url: '/ttInfoManage_edit/:id',
  973 + views: {
  974 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/edit.html'}
  975 + },
  976 + resolve: {
  977 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  978 + return $ocLazyLoad.load({
  979 + name: 'ttInfoManage_edit_module',
  980 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  981 + files: [
  982 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  983 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  984 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  985 + ]
  986 + });
  987 + }]
  988 + }
  989 + })
  990 + .state("ttInfoManage_detail", { // 时刻表详细信息
  991 + url: '/ttInfoManage_detail/:id',
  992 + views: {
  993 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detail.html'}
  994 + },
  995 + resolve: {
  996 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  997 + return $ocLazyLoad.load({
  998 + name: 'ttInfoManage_detail_module',
  999 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1000 + files: [
  1001 + "pages/scheduleApp/module/core/ttInfoManage/module.js"
  1002 + ]
  1003 + });
  1004 + }]
  1005 + }
  1006 + });
1061 1007
1062 1008
  1009 + }
  1010 +]);
  1011 +// ui route 配置
  1012 +
  1013 +/** 时刻表编辑管理配置route */
  1014 +ScheduleApp.config([
  1015 + '$stateProvider',
  1016 + '$urlRouterProvider',
  1017 + function($stateProvider, $urlRouterProvider) {
  1018 + // 默认路由
  1019 + //$urlRouterProvider.otherwise('/busConfig.html');
1063 1020
1064 - // TODO: 1021 + $stateProvider
  1022 + .state("ttInfoDetailManage_form", { // 时刻表明细导入
  1023 + url: '/ttInfoDetailManage_form/:xlid/:ttid/:xlname/:ttname',
  1024 + views: {
  1025 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/form.html'}
  1026 + },
  1027 + resolve: {
  1028 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1029 + return $ocLazyLoad.load({
  1030 + name: 'ttInfoDetailManage_form_module',
  1031 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1032 + files: [
  1033 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1034 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1035 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  1036 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js"
  1037 + ]
  1038 + });
  1039 + }]
  1040 + }
  1041 + })
  1042 + .state("ttInfoDetailManage_edit", { // 时刻表详细信息编辑
  1043 + url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname',
  1044 + views: {
  1045 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit.html'}
  1046 + },
  1047 + resolve: {
  1048 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1049 + return $ocLazyLoad.load({
  1050 + name: 'ttInfoDetailManage_edit_module',
  1051 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1052 + files: [
  1053 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
  1054 + ]
  1055 + });
  1056 + }]
  1057 + }
  1058 + })
  1059 + .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
  1060 + url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',
  1061 + views: {
  1062 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
  1063 + },
  1064 + resolve: {
  1065 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1066 + return $ocLazyLoad.load({
  1067 + name: 'ttInfoDetailManage_detail_edit_module',
  1068 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1069 + files: [
  1070 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1071 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1072 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
  1073 + ]
  1074 + });
  1075 + }]
  1076 + }
  1077 + });
1065 1078
1066 - ;  
1067 -}]);  
1068 \ No newline at end of file 1079 \ No newline at end of file
  1080 + }
  1081 +]);
1069 \ No newline at end of file 1082 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/busConfig.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>车辆配置</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">运营计划管理</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">车俩配置</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="busConfig" ng-app="busConfigApp">  
22 - <div class="col-md-12" ng-controller="busConfigCtrl as bcc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">配置表</span>  
28 - </div>  
29 - <div class="actions">  
30 - <a href="javascirpt:" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 添加配置  
33 - </a>  
34 - <div class="btn-group">  
35 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
36 - <i class="fa fa-share"></i>  
37 - <span>系统工具</span>  
38 - <i class="fa fa-angle-down"></i>  
39 - </a>  
40 - <ul class="dropdown-menu pull-right">  
41 - <li>  
42 - <a href="javascript:" class="tool-action">  
43 - <i class="fa fa-file-excel-o"></i>  
44 - 导出excel  
45 - </a>  
46 - </li>  
47 - <li class="divider"></li>  
48 - <li>  
49 - <a href="javascript:" class="tool-action">  
50 - <i class="fa fa-refresh"></i>  
51 - 刷行数据  
52 - </a>  
53 - </li>  
54 - </ul>  
55 - </div>  
56 - </div>  
57 - </div>  
58 -  
59 - <div class="portlet-body">  
60 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
61 - <thead>  
62 - <tr>  
63 - <th>  
64 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
65 - </th>  
66 - <th>线路名称</th>  
67 - <th>自编号</th>  
68 - <th>设备编号</th>  
69 - <th>启用日期</th>  
70 - <th>终止日期</th>  
71 - <th>停车点</th>  
72 - <th>操作</th>  
73 - </tr>  
74 - </thead>  
75 - <tbody>  
76 - <tr ng-repeat="info in bcc.infos" class="odd gradeX">  
77 - <td>  
78 - <input type="checkbox" class="checkboxes"/>  
79 - </td>  
80 - <td>  
81 - <span ng-bind="info.xl"></span>  
82 - </td>  
83 - <td>  
84 - <span ng-bind="info.clZbh"></span>  
85 - </td>  
86 - <td>  
87 - <span ng-bind="info.sbbh"></span>  
88 - </td>  
89 - <td>  
90 - <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
91 - </td>  
92 - <td>  
93 - <span ng-bind="info.zzrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
94 - </td>  
95 - <td>  
96 - <span ng-bind="info.tcd"></span>  
97 - </td>  
98 - </tr>  
99 - </tbody>  
100 - </table>  
101 -  
102 - <div style="text-align: right;">  
103 - <uib-pagination total-items="bcc.totalItems"  
104 - ng-model="bcc.currentPage"  
105 - ng-change="bcc.pageChanged()"  
106 - previous-text="上一页"  
107 - next-text="下一页">  
108 - </uib-pagination>  
109 - </div>  
110 -  
111 - </div>  
112 - </div>  
113 - </div>  
114 -</div>  
115 -  
116 -<script>angular.module("busConfigApp",["ngResource","ui.bootstrap"]).factory("BusConfigInfo",["$resource",function(a){return a("/cci",{},{list:{method:"GET"}})}]);</script>  
117 -<script>angular.module("busConfigApp").controller("busConfigCtrl",["BusConfigInfo",function(a){var b=this;b.totalItems=64,b.currentPage=4,b.infos=[],b.pageChanged=function(){console.log("页面调转到："+b.currentPage)},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.infos=a.content})}]);</script>  
118 -  
119 -<script type="text/javascript">  
120 - angular.bootstrap(document.getElementById("busConfig"), ["busConfigApp"]);  
121 -</script>  
122 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/controller.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("busConfigApp").controller("busConfigCtrl",["BusConfigInfo",function(a){var b=this;b.totalItems=64,b.currentPage=4,b.infos=[],b.pageChanged=function(){console.log("页面调转到："+b.currentPage)},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.infos=a.content})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dist/service.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("busConfigApp",["ngResource","ui.bootstrap"]).factory("BusConfigInfo",["$resource",function(a){return a("/cci",{},{list:{method:"GET"}})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
  View file @966e73f
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 <th style="width: 150px;">启用日期</th> 10 <th style="width: 150px;">启用日期</th>
11 <th style="width: 150px;">终止日期</th> 11 <th style="width: 150px;">终止日期</th>
12 <th >停车点</th> 12 <th >停车点</th>
  13 + <th style="width: 80px;" >状态</th>
13 <th style="width: 21%">操作</th> 14 <th style="width: 21%">操作</th>
14 </tr> 15 </tr>
15 <tr role="row" class="filter"> 16 <tr role="row" class="filter">
@@ -34,6 +35,11 @@ @@ -34,6 +35,11 @@
34 <td></td> 35 <td></td>
35 <td></td> 36 <td></td>
36 <td> 37 <td>
  38 + <label class="checkbox-inline input">
  39 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />作废
  40 + </label>
  41 + </td>
  42 + <td>
37 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" 43 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
38 ng-click="ctrl.pageChanaged()"> 44 ng-click="ctrl.pageChanaged()">
39 <i class="fa fa-search"></i> 搜索</button> 45 <i class="fa fa-search"></i> 搜索</button>
@@ -67,6 +73,10 @@ @@ -67,6 +73,10 @@
67 <span ng-bind="info.tcd"></span> 73 <span ng-bind="info.tcd"></span>
68 </td> 74 </td>
69 <td> 75 <td>
  76 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  77 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  78 + </td>
  79 + <td>
70 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 80 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
71 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 81 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
72 <a ui-sref="busConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a> 82 <a ui-sref="busConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js renamed to src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @966e73f
1 // 车辆配置管理 service controller 等写在一起 1 // 车辆配置管理 service controller 等写在一起
2 angular.module('ScheduleApp').factory('BusConfigService', ['BusConfigService_g', function(service) { 2 angular.module('ScheduleApp').factory('BusConfigService', ['BusConfigService_g', function(service) {
3 /** 当前的查询条件信息 */ 3 /** 当前的查询条件信息 */
4 - var currentSearchCondition = {}; 4 + var currentSearchCondition = {'isCancel_eq': false};
5 5
6 /** 当前第几页 */ 6 /** 当前第几页 */
7 var currentPageNo = 1; 7 var currentPageNo = 1;
@@ -22,6 +22,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;, @@ -22,6 +22,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService&#39;, [&#39;BusConfigService_g&#39;,
22 for (key in currentSearchCondition) { 22 for (key in currentSearchCondition) {
23 currentSearchCondition[key] = undefined; 23 currentSearchCondition[key] = undefined;
24 } 24 }
  25 + currentSearchCondition['isCancel_eq'] = false;
25 }, 26 },
26 /** 27 /**
27 * 设置当前页码。 28 * 设置当前页码。
src/main/resources/static/pages/scheduleApp/module/core/busConfig/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 车辆配置模块页面route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("busConfig", { // index主页面
  13 + url: '/busConfig',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/core/busConfig/index.html'
  17 + },
  18 + "busConfig_list@busConfig": {
  19 + templateUrl: 'pages/scheduleApp/module/core/busConfig/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'busConfig_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  32 + "pages/scheduleApp/module/core/busConfig/module.js"
  33 + ]
  34 + });
  35 + }]
  36 + }
  37 + })
  38 + .state("busConfig_form", { // 添加页面
  39 + url: '/busConfig_form',
  40 + views: {
  41 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/form.html'}
  42 + },
  43 + resolve: {
  44 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  45 + return $ocLazyLoad.load({
  46 + name: 'busConfig_form_module',
  47 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  48 + files: [
  49 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  50 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  51 + "pages/scheduleApp/module/core/busConfig/module.js"
  52 + ]
  53 + });
  54 + }]
  55 + }
  56 + })
  57 + .state("busConfig_edit", { // 修改页面
  58 + url: '/busConfig_edit/:id',
  59 + views: {
  60 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/edit.html'}
  61 + },
  62 + resolve: {
  63 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  64 + return $ocLazyLoad.load({
  65 + name: 'busConfig_edit_module',
  66 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  67 + files: [
  68 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  69 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  70 + "pages/scheduleApp/module/core/busConfig/module.js"
  71 + ]
  72 + });
  73 + }]
  74 + }
  75 + })
  76 + .state("busConfig_detail", { // 详细信息页面
  77 + url: '/busConfig_detail/:id',
  78 + views: {
  79 + "": {templateUrl: 'pages/scheduleApp/module/core/busConfig/detail.html'}
  80 + },
  81 + resolve: {
  82 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  83 + return $ocLazyLoad.load({
  84 + name: 'busConfig_detail_module',
  85 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  86 + files: [
  87 + "pages/scheduleApp/module/core/busConfig/module.js"
  88 + ]
  89 + });
  90 + }]
  91 + }
  92 + });
  93 + }
  94 +]);
  95 +
  96 +
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/busLineInfoOverview.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>线路运营概览</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">线路运营概览</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">路牌管理</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="busLineInfoOverview" ng-app="busLineInfoOverviewApp">  
22 - <div class="col-md-12" ng-controller="busLineInfoOverviewCtrl as gmc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">概览</span>  
28 - </div>  
29 - <div class="actions">  
30 - <div class="btn-group">  
31 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
32 - <i class="fa fa-share"></i>  
33 - <span>系统工具</span>  
34 - <i class="fa fa-angle-down"></i>  
35 - </a>  
36 - <ul class="dropdown-menu pull-right">  
37 - <li>  
38 - <a href="javascript:" class="tool-action">  
39 - <i class="fa fa-file-excel-o"></i>  
40 - 导出excel  
41 - </a>  
42 - </li>  
43 - <li class="divider"></li>  
44 - <li>  
45 - <a href="javascript:" class="tool-action">  
46 - <i class="fa fa-refresh"></i>  
47 - 刷行数据  
48 - </a>  
49 - </li>  
50 - </ul>  
51 - </div>  
52 - </div>  
53 - </div>  
54 -  
55 - <div class="portlet-body">  
56 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
57 - <thead>  
58 - <tr>  
59 - <th>  
60 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
61 - </th>  
62 - <th>线路名称</th>  
63 - <th>线路编号</th>  
64 - <th>公司</th>  
65 - <th>分公司</th>  
66 -  
67 - <th>配车数</th>  
68 - <th>人员数</th>  
69 - <th>路牌数</th>  
70 - <th>套跑数</th>  
71 - <th>时刻表数</th>  
72 - <th>排班规则数</th>  
73 - <th>排班计划数</th>  
74 - </tr>  
75 - </thead>  
76 - <tbody>  
77 - <tr ng-repeat="info in gmc.infos" class="odd gradeX">  
78 - <td>  
79 - <input type="checkbox" class="checkboxes"/>  
80 - </td>  
81 - <td>  
82 - <span ng-bind="info.xlName"></span>  
83 - </td>  
84 - <td>  
85 - <span ng-bind="info.xlBm"></span>  
86 - </td>  
87 - <td>  
88 - <span ng-bind="info.gsName"></span>  
89 - </td>  
90 - <td>  
91 - <span ng-bind="info.fgsName"></span>  
92 - </td>  
93 -  
94 - <td>  
95 - <span ng-bind="info.pcCount"></span>  
96 - </td>  
97 - <td>  
98 - <span ng-bind="info.ryCount"></span>  
99 - </td>  
100 - <td>  
101 - <span ng-bind="info.lpCount"></span>  
102 - </td>  
103 - <td>  
104 - <span ng-bind="info.tpCount"></span>  
105 - </td>  
106 - <td>  
107 - <span ng-bind="info.ttCount"></span>  
108 - </td>  
109 - <td>  
110 - <span ng-bind="info.srCount"></span>  
111 - </td>  
112 - <td>  
113 - <span ng-bind="info.spCount"></span>  
114 - </td>  
115 - </tr>  
116 - </tbody>  
117 - </table>  
118 -  
119 - <div style="text-align: right;">  
120 - <uib-pagination total-items="gmc.totalItems"  
121 - ng-model="gmc.currentPage"  
122 - ng-change="gmc.pageChanged()"  
123 - previous-text="上一页"  
124 - next-text="下一页">  
125 - </uib-pagination>  
126 - </div>  
127 -  
128 - </div>  
129 - </div>  
130 - </div>  
131 -</div>  
132 -  
133 -<script>angular.module("busLineInfoOverviewApp",["ngResource","ui.bootstrap"]).factory("BusinessInfo",["$resource",function(a){return a("/bic",{order:"id",direction:"ASC"},{list:{method:"GET",params:{page:0}}})}]);</script>  
134 -<script>angular.module("busLineInfoOverviewApp").controller("busLineInfoOverviewCtrl",["BusinessInfo",function(a){var b=this;b.totalItems=0,b.currentPage=1,b.infos=[],b.pageChanged=function(){console.log("页面跳转到："+b.currentPage),a.list({page:b.currentPage-1},function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})}]);</script>  
135 -  
136 -<script type="text/javascript">  
137 - angular.bootstrap(document.getElementById("busLineInfoOverview"), ["busLineInfoOverviewApp"]);  
138 -</script>  
139 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/controller.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("busLineInfoOverviewApp").controller("busLineInfoOverviewCtrl",["BusinessInfo",function(a){var b=this;b.totalItems=0,b.currentPage=1,b.infos=[],b.pageChanged=function(){console.log("页面跳转到："+b.currentPage),a.list({page:b.currentPage-1},function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/service.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("busLineInfoOverviewApp",["ngResource","ui.bootstrap"]).factory("BusinessInfo",["$resource",function(a){return a("/bic",{order:"id",direction:"ASC"},{list:{method:"GET",params:{page:0}}})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/module.js 0 → 100644
  View file @966e73f
  1 +// 车辆配置管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('BusLineInfoStatService', ['BusLineInfoStatService_g', function(service) {
  3 + /** 当前的查询条件信息 */
  4 + var currentSearchCondition = {};
  5 +
  6 + /** 当前第几页 */
  7 + var currentPageNo = 1;
  8 +
  9 + return {
  10 + /**
  11 + * 获取查询条件信息，
  12 + * 用于给controller用来和页面数据绑定。
  13 + */
  14 + getSearchCondition: function() {
  15 + return currentSearchCondition;
  16 + },
  17 + /**
  18 + * 重置查询条件信息。
  19 + */
  20 + resetSearchCondition: function() {
  21 + var key;
  22 + for (key in currentSearchCondition) {
  23 + currentSearchCondition[key] = "";
  24 + }
  25 + },
  26 + /**
  27 + * 设置当前页码。
  28 + * @param cpn 从1开始，后台是从0开始的
  29 + */
  30 + setCurrentPageNo: function(cpn) {
  31 + currentPageNo = cpn;
  32 + },
  33 + /**
  34 + * 组装查询参数，返回一个promise查询结果。
  35 + * @param params 查询参数
  36 + * @return 返回一个 promise
  37 + */
  38 + getPage: function() {
  39 + var params = currentSearchCondition; // 查询条件
  40 + params.page = currentPageNo - 1; // 服务端页码从0开始
  41 + return service.list(params).$promise;
  42 + },
  43 + /**
  44 + * 获取明细信息。
  45 + * @param id 车辆id
  46 + * @return 返回一个 promise
  47 + */
  48 + getDetail: function(id) {
  49 + var params = {id: id};
  50 + return service.get(params).$promise;
  51 + },
  52 + /**
  53 + * 保存信息。
  54 + * @param obj 车辆详细信息
  55 + * @return 返回一个 promise
  56 + */
  57 + saveDetail: function(obj) {
  58 + return service.save(obj).$promise;
  59 + }
  60 + };
  61 +
  62 +}]);
  63 +
  64 +angular.module('ScheduleApp').controller('BusLineInfoStatCtrl', ['BusLineInfoStatService', '$state', function(busLineInfoStatService, $state) {
  65 + var self = this;
  66 +
  67 + // 切换到form状态
  68 + self.goForm = function() {
  69 + alert("切换");
  70 + }
  71 +}]);
  72 +
  73 +angular.module('ScheduleApp').controller('BusLineInfoStatListCtrl', ['BusLineInfoStatService', function(busLineInfoStatService) {
  74 + var self = this;
  75 + self.pageInfo = {
  76 + totalItems : 0,
  77 + currentPage : 1,
  78 + infos: []
  79 + };
  80 +
  81 + // 初始创建的时候，获取一次列表数据
  82 + busLineInfoStatService.getPage().then(
  83 + function(result) {
  84 + self.pageInfo.totalItems = result.totalElements;
  85 + self.pageInfo.currentPage = result.number + 1;
  86 + self.pageInfo.infos = result.content;
  87 + busLineInfoStatService.setCurrentPageNo(result.number + 1);
  88 + },
  89 + function(result) {
  90 + alert("出错啦！");
  91 + }
  92 + );
  93 +
  94 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  95 + // alert("dfdfdf");
  96 + //});
  97 +
  98 + // 翻页的时候调用
  99 + self.pageChanaged = function() {
  100 + busLineInfoStatService.setCurrentPageNo(self.pageInfo.currentPage);
  101 + busLineInfoStatService.getPage().then(
  102 + function(result) {
  103 + self.pageInfo.totalItems = result.totalElements;
  104 + self.pageInfo.currentPage = result.number + 1;
  105 + self.pageInfo.infos = result.content;
  106 + busLineInfoStatService.setCurrentPageNo(result.number + 1);
  107 + },
  108 + function(result) {
  109 + alert("出错啦！");
  110 + }
  111 + );
  112 + };
  113 + // 获取查询条件数据
  114 + self.searchCondition = function() {
  115 + return busLineInfoStatService.getSearchCondition();
  116 + };
  117 + // 重置查询条件
  118 + self.resetSearchCondition = function() {
  119 + return busLineInfoStatService.resetSearchCondition();
  120 + };
  121 +
  122 +}]);
  123 +
  124 +angular.module('ScheduleApp').controller('BusLineInfoStatFormCtrl', ['BusLineInfoStatService', '$stateParams', '$state', function(busLineInfoStatService, $stateParams, $state) {
  125 + // TODO：
  126 +}]);
  127 +
  128 +angular.module('ScheduleApp').controller('BusLineInfoStatDetailCtrl', ['BusLineInfoStatService', '$stateParams', function(busLineInfoStatService, $stateParams) {
  129 + // TODO：
  130 +}]);
  131 +
  132 +
  133 +
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 线路运营概览配置route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("busLineInfoStat", { // index页面
  13 + url: '/busLineInfoStat',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/index.html'
  17 + },
  18 + "busLineInfoStat_list@busLineInfoStat": {
  19 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'busLineInfoStat_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "pages/scheduleApp/module/core/busLineInfoStat/module.js"
  30 + ]
  31 + });
  32 + }]
  33 + }
  34 + });
  35 +
  36 + }
  37 +]);
0 \ No newline at end of file 38 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/dispatchManage/dispatchManage.html deleted 100644 → 0
  View file @0aec0bd
1 -调派管理-TODO  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/dispatchManage/dist/dispatchManage.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -调派管理-TODO  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/dist/controller.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("employeeConfigApp").controller("employeeConfigCtrl",["EmployeeConfigInfo",function(a){var b=this;b.totalItems=64,b.currentPage=4,b.infos=[],b.pageChanged=function(){console.log("页面跳转到："+b.currentPage)},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.infos=a.content})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/dist/employeeConfig.dist.html deleted 100644 → 0
  View file @0aec0bd
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>人员配置</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">运营计划管理</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">人员配置</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="employeeConfig" ng-app="employeeConfigApp">  
22 - <div class="col-md-12" ng-controller="employeeConfigCtrl as ecc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">配置表</span>  
28 - </div>  
29 - <div class="actions">  
30 - <a href="javascirpt:" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 添加配置  
33 - </a>  
34 - <div class="btn-group">  
35 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
36 - <i class="fa fa-share"></i>  
37 - <span>系统工具</span>  
38 - <i class="fa fa-angle-down"></i>  
39 - </a>  
40 - <ul class="dropdown-menu pull-right">  
41 - <li>  
42 - <a href="javascript:" class="tool-action">  
43 - <i class="fa fa-file-excel-o"></i>  
44 - 导出excel  
45 - </a>  
46 - </li>  
47 - <li class="divider"></li>  
48 - <li>  
49 - <a href="javascript:" class="tool-action">  
50 - <i class="fa fa-refresh"></i>  
51 - 刷行数据  
52 - </a>  
53 - </li>  
54 - </ul>  
55 - </div>  
56 - </div>  
57 - </div>  
58 -  
59 - <div class="portlet-body">  
60 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
61 - <thead>  
62 - <tr>  
63 - <th>  
64 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
65 - </th>  
66 - <th>线路名称</th>  
67 - <th>搭班编码</th>  
68 - <th>驾驶员工号</th>  
69 - <th>驾驶员</th>  
70 - <th>售票员工号</th>  
71 - <th>售票员</th>  
72 - <th>车辆内部编码</th>  
73 - <th>操作</th>  
74 - </tr>  
75 - </thead>  
76 - <tbody>  
77 - <tr ng-repeat="info in ecc.infos" class="odd gradeX">  
78 - <td>  
79 - <input type="checkbox" class="checkboxes"/>  
80 - </td>  
81 - <td>  
82 - <span ng-bind="info.xl"></span>  
83 - </td>  
84 - <td>  
85 - <span ng-bind="info.dbbm"></span>  
86 - </td>  
87 - <td>  
88 - <span ng-bind="info.jsygh"></span>  
89 - </td>  
90 - <td>  
91 - <span ng-bind="info.jsy"></span>  
92 - </td>  
93 - <td>  
94 - <span ng-bind="info.spygh"></span>  
95 - </td>  
96 - <td>  
97 - <span ng-bind="info.spy"></span>  
98 - </td>  
99 - <td>  
100 - <span ng-bind="info.clZbh"></span>  
101 - </td>  
102 - </tr>  
103 - </tbody>  
104 - </table>  
105 -  
106 - <div style="text-align: right;">  
107 - <uib-pagination total-items="ecc.totalItems"  
108 - ng-model="ecc.currentPage"  
109 - ng-change="ecc.pageChanged()"  
110 - previous-text="上一页"  
111 - next-text="下一页">  
112 - </uib-pagination>  
113 - </div>  
114 -  
115 - </div>  
116 - </div>  
117 - </div>  
118 -</div>  
119 -  
120 -<script>angular.module("employeeConfigApp",["ngResource","ui.bootstrap"]).factory("EmployeeConfigInfo",["$resource",function(a){return a("/eci",{},{list:{method:"GET"}})}]);</script>  
121 -<script>angular.module("employeeConfigApp").controller("employeeConfigCtrl",["EmployeeConfigInfo",function(a){var b=this;b.totalItems=64,b.currentPage=4,b.infos=[],b.pageChanged=function(){console.log("页面跳转到："+b.currentPage)},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.infos=a.content})}]);</script>  
122 -  
123 -<script type="text/javascript">  
124 - angular.bootstrap(document.getElementById("employeeConfig"), ["employeeConfigApp"]);  
125 -</script>  
126 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/dist/service.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("employeeConfigApp",["ngResource","ui.bootstrap"]).factory("EmployeeConfigInfo",["$resource",function(a){return a("/eci",{},{list:{method:"GET"}})}]);  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
  View file @966e73f
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 <th style="width: 15%;">驾驶员</th> 11 <th style="width: 15%;">驾驶员</th>
12 <th >售票员工号</th> 12 <th >售票员工号</th>
13 <th >售票员</th> 13 <th >售票员</th>
  14 + <th style="width: 80px;">状态</th>
14 <th style="width: 21%">操作</th> 15 <th style="width: 21%">操作</th>
15 </tr> 16 </tr>
16 <tr role="row" class="filter"> 17 <tr role="row" class="filter">
@@ -44,6 +45,11 @@ @@ -44,6 +45,11 @@
44 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="输入姓名..."/> 45 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['spy.personnelName_like']" placeholder="输入姓名..."/>
45 </td> 46 </td>
46 <td> 47 <td>
  48 + <label class="checkbox-inline">
  49 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>作废
  50 + </label>
  51 + </td>
  52 + <td>
47 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" 53 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
48 ng-click="ctrl.pageChanaged()"> 54 ng-click="ctrl.pageChanaged()">
49 <i class="fa fa-search"></i> 搜索</button> 55 <i class="fa fa-search"></i> 搜索</button>
@@ -80,6 +86,10 @@ @@ -80,6 +86,10 @@
80 <span ng-bind="info.spy.personnelName"></span> 86 <span ng-bind="info.spy.personnelName"></span>
81 </td> 87 </td>
82 <td> 88 <td>
  89 + <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
  90 + <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
  91 + </td>
  92 + <td>
83 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 93 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
84 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 94 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
85 <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a> 95 <a ui-sref="employeeConfig_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js renamed to src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
  View file @966e73f
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 angular.module('ScheduleApp').factory('EmployeeConfigService', ['EmployeeConfigService_g', function(service) { 3 angular.module('ScheduleApp').factory('EmployeeConfigService', ['EmployeeConfigService_g', function(service) {
4 /** 当前的查询条件信息 */ 4 /** 当前的查询条件信息 */
5 - var currentSearchCondition = {}; 5 + var currentSearchCondition = {'isCancel_eq': false};
6 6
7 /** 当前第几页 */ 7 /** 当前第几页 */
8 var currentPageNo = 1; 8 var currentPageNo = 1;
@@ -23,6 +23,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS @@ -23,6 +23,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService&#39;, [&#39;EmployeeConfigS
23 for (key in currentSearchCondition) { 23 for (key in currentSearchCondition) {
24 currentSearchCondition[key] = undefined; 24 currentSearchCondition[key] = undefined;
25 } 25 }
  26 + currentSearchCondition['isCancel_eq'] = false;
26 }, 27 },
27 /** 28 /**
28 * 设置当前页码。 29 * 设置当前页码。
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/route.js 0 → 100644
  View file @966e73f
  1 +// ui route 配置
  2 +
  3 +/** 人员配置模块页面route */
  4 +ScheduleApp.config([
  5 + '$stateProvider',
  6 + '$urlRouterProvider',
  7 + function($stateProvider, $urlRouterProvider) {
  8 + // 默认路由
  9 + //$urlRouterProvider.otherwise('/busConfig.html');
  10 +
  11 + $stateProvider
  12 + .state("employeeConfig", { // index页面
  13 + url: '/employeeConfig',
  14 + views: {
  15 + "": {
  16 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/index.html'
  17 + },
  18 + "employeeConfig_list@employeeConfig": {
  19 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/list.html'
  20 + }
  21 + },
  22 +
  23 + resolve: {
  24 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  25 + return $ocLazyLoad.load({
  26 + name: 'employeeConfig_module',
  27 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  28 + files: [
  29 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  30 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  31 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  32 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  33 + ]
  34 + });
  35 + }]
  36 + }
  37 + })
  38 + .state("employeeConfig_form", { // 添加人员配置form
  39 + url: '/employeeConfig_form',
  40 + views: {
  41 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/form.html'}
  42 + },
  43 + resolve: {
  44 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  45 + return $ocLazyLoad.load({
  46 + name: 'employeeConfig_form_module',
  47 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  48 + files: [
  49 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  50 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  51 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  52 + ]
  53 + });
  54 + }]
  55 + }
  56 + })
  57 + .state("employeeConfig_edit", { // 修改人员配置form
  58 + url: '/employeeConfig_edit/:id',
  59 + views: {
  60 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/edit.html'}
  61 + },
  62 + resolve: {
  63 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  64 + return $ocLazyLoad.load({
  65 + name: 'employeeConfig_edit_module',
  66 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  67 + files: [
  68 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  69 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  70 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  71 + ]
  72 + });
  73 + }]
  74 + }
  75 + })
  76 + .state("employeeConfig_detail", { // 详细信息页面
  77 + url: '/employeeConfig_detail/:id',
  78 + views: {
  79 + "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/detail.html'}
  80 + },
  81 + resolve: {
  82 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  83 + return $ocLazyLoad.load({
  84 + name: 'employeeConfig_detail_module',
  85 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  86 + files: [
  87 + "pages/scheduleApp/module/core/employeeConfig/module.js"
  88 + ]
  89 + });
  90 + }]
  91 + }
  92 + })
  93 +
  94 + }
  95 +]);
0 \ No newline at end of file 96 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/dist/controller.min.js deleted 100644 → 0
  View file @0aec0bd
1 -angular.module("guideboardManageApp").controller("guideboardManageCtrl",["GuideboardInfo",function(a){var b=this;b.totalItems=0,b.currentPage=1,b.infos=[],b.pageChanged=function(){console.log("页面跳转到："+b.currentPage),a.list({page:b.currentPage-1},function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})},a.list(function(a){console.log("后台返回记录数："+a.content.length),b.totalItems=a.totalElements,b.currentPage=a.number+1,b.infos=a.content})}]);  
2 \ No newline at end of file 0 \ No newline at end of file