潘钊 / bsth_control · Commits

Commit cb50fbfd59835789a6f81db52742dc46ecefe82a

Authored by 徐烜
1 parent aab36a0f
build: skipped

PSM-26

Inline Side-by-side
Showing 14 changed files with 1640 additions and 1271 deletions
src/main/java/com/bsth/controller/schedule/basicinfo/CarsController.java 0 → 100644
  View file @cb50fbf
  1 +package com.bsth.controller.schedule.basicinfo;
  2 +
  3 +import com.bsth.common.ResponseCode;
  4 +import com.bsth.controller.schedule.BController;
  5 +import com.bsth.entity.Cars;
  6 +import com.bsth.service.schedule.CarsService;
  7 +import com.bsth.service.schedule.ScheduleException;
  8 +import org.springframework.beans.factory.annotation.Autowired;
  9 +import org.springframework.web.bind.annotation.RequestMapping;
  10 +import org.springframework.web.bind.annotation.RequestMethod;
  11 +import org.springframework.web.bind.annotation.RequestParam;
  12 +import org.springframework.web.bind.annotation.RestController;
  13 +
  14 +import java.util.HashMap;
  15 +import java.util.Map;
  16 +
  17 +/**
  18 + * 车辆基础信息controller
  19 + */
  20 +@RestController(value = "carsController_sc")
  21 +@RequestMapping("cars_sc")
  22 +public class CarsController extends BController<Cars, Integer> {
  23 + @Autowired
  24 + private CarsService carsService;
  25 +
  26 + @RequestMapping(value = "/validate_zbh", method = RequestMethod.GET)
  27 + public Map<String, Object> validate_zbh(@RequestParam Map<String, Object> param) {
  28 + Map<String, Object> rtn = new HashMap<>();
  29 + try {
  30 + // 自编号验证
  31 + Cars cars = new Cars(
  32 + param.get("id_eq"),
  33 + param.get("insideCode_eq"),
  34 + null,
  35 + null,
  36 + null);
  37 + carsService.validate_nbbh(cars);
  38 + rtn.put("status", ResponseCode.SUCCESS);
  39 + } catch (ScheduleException exp) {
  40 + rtn.put("status", ResponseCode.ERROR);
  41 + rtn.put("msg", exp.getMessage());
  42 + }
  43 + return rtn;
  44 + }
  45 +
  46 + @RequestMapping(value = "/validate_clbh", method = RequestMethod.GET)
  47 + public Map<String, Object> validate_clbh(@RequestParam Map<String, Object> param) {
  48 + Map<String, Object> rtn = new HashMap<>();
  49 + try {
  50 + // 车辆编号验证
  51 + Cars cars = new Cars(
  52 + param.get("id_eq"),
  53 + null,
  54 + param.get("carCode_eq"),
  55 + null,
  56 + null);
  57 + carsService.validate_clbh(cars);
  58 + rtn.put("status", ResponseCode.SUCCESS);
  59 + } catch (ScheduleException exp) {
  60 + rtn.put("status", ResponseCode.ERROR);
  61 + rtn.put("msg", exp.getMessage());
  62 + }
  63 + return rtn;
  64 + }
  65 +
  66 + @RequestMapping(value = "/validate_cph", method = RequestMethod.GET)
  67 + public Map<String, Object> validate_cph(@RequestParam Map<String, Object> param) {
  68 + Map<String, Object> rtn = new HashMap<>();
  69 + try {
  70 + // 车牌号验证
  71 + Cars cars = new Cars(
  72 + param.get("id_eq"),
  73 + null,
  74 + null,
  75 + param.get("carPlate_eq"),
  76 + null);
  77 + carsService.validate_cph(cars);
  78 + rtn.put("status", ResponseCode.SUCCESS);
  79 + } catch (ScheduleException exp) {
  80 + rtn.put("status", ResponseCode.ERROR);
  81 + rtn.put("msg", exp.getMessage());
  82 + }
  83 + return rtn;
  84 + }
  85 +
  86 + @RequestMapping(value = "/validate_sbbh", method = RequestMethod.GET)
  87 + public Map<String, Object> validate_sbbh(@RequestParam Map<String, Object> param) {
  88 + Map<String, Object> rtn = new HashMap<>();
  89 + try {
  90 + // 设备编号验证
  91 + Cars cars = new Cars(
  92 + param.get("id_eq"),
  93 + null,
  94 + null,
  95 + null,
  96 + param.get("equipmentCode_eq")
  97 + );
  98 + carsService.validate_sbbh(cars);
  99 + rtn.put("status", ResponseCode.SUCCESS);
  100 + } catch (ScheduleException exp) {
  101 + rtn.put("status", ResponseCode.ERROR);
  102 + rtn.put("msg", exp.getMessage());
  103 + }
  104 + return rtn;
  105 + }
  106 +}
... ...
src/main/java/com/bsth/controller/schedule/GuideboardInfoController.java renamed to src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
  View file @cb50fbf
1   -package com.bsth.controller.schedule;
  1 +package com.bsth.controller.schedule.core;
2 2  
3 3 import com.bsth.common.ResponseCode;
  4 +import com.bsth.controller.schedule.BController;
4 5 import com.bsth.entity.schedule.GuideboardInfo;
  6 +import com.bsth.repository.schedule.GuideboardInfoRepository;
5 7 import com.bsth.service.schedule.GuideboardInfoService;
6 8 import com.bsth.service.schedule.ScheduleException;
7 9 import com.bsth.service.schedule.utils.DataToolsProperties;
8 10 import org.springframework.beans.factory.annotation.Autowired;
9 11 import org.springframework.boot.context.properties.EnableConfigurationProperties;
10   -import org.springframework.web.bind.annotation.*;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RequestMethod;
  14 +import org.springframework.web.bind.annotation.RequestParam;
  15 +import org.springframework.web.bind.annotation.RestController;
11 16  
12 17 import java.util.HashMap;
  18 +import java.util.List;
13 19 import java.util.Map;
14 20  
15 21 /**
... ... @@ -23,8 +29,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt;
23 29 private GuideboardInfoService guideboardInfoService;
24 30 // @Autowired
25 31 // private DataToolsProperties dataToolsProperties;
26   -// @Autowired
27   -// private GuideboardInfoRepository guideboardInfoRepository;
  32 + @Autowired
  33 + private GuideboardInfoRepository guideboardInfoRepository;
28 34 //
29 35 // @Override
30 36 // protected String getDataImportKtrClasspath() {
... ... @@ -37,10 +43,10 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt;
37 43 // }
38 44 //
39 45 //
40   -// @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
41   -// public List<Map<String, Object>> findLpName(Long ttid) {
42   -// return guideboardInfoRepository.findLpName(ttid);
43   -// }
  46 + @RequestMapping(value = "/ttlpnames", method = RequestMethod.GET)
  47 + public List<Map<String, Object>> findLpName(Long ttid) {
  48 + return guideboardInfoRepository.findLpName(ttid);
  49 + }
44 50  
45 51 @RequestMapping(value = "/validate1", method = RequestMethod.GET)
46 52 public Map<String, Object> validate1(@RequestParam Map<String, Object> param) {
... ...
src/main/java/com/bsth/entity/Cars.java
  View file @cb50fbf
1 1 package com.bsth.entity;
2 2  
3 3 import com.bsth.entity.sys.SysUser;
  4 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4 5  
5 6 import javax.persistence.*;
6 7 import java.io.Serializable;
... ... @@ -22,6 +23,7 @@ import java.util.Date;
22 23  
23 24 @Entity
24 25 @Table(name = "bsth_c_cars")
  26 +@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
25 27 public class Cars implements Serializable {
26 28  
27 29 /** 主键Id */
... ... @@ -30,7 +32,7 @@ public class Cars implements Serializable {
30 32 private Integer id;
31 33  
32 34 /** 自编号/内部编号 */
33   - @Column(nullable = false, length = 8, unique = true)
  35 + @Column(nullable = false, length = 20, unique = true)
34 36 private String insideCode;
35 37  
36 38 // 公司、分公司暂时不用关联实体
... ... @@ -150,6 +152,26 @@ public class Cars implements Serializable {
150 152 /** 修改日期 */
151 153 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
152 154 private Date updateDate;
  155 +
  156 + public Cars() {}
  157 +
  158 + public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
  159 + if (id != null) {
  160 + this.id = Integer.valueOf(id.toString());
  161 + }
  162 + if (nbbh != null) {
  163 + this.insideCode = nbbh.toString();
  164 + }
  165 + if (clbh != null) {
  166 + this.carCode = clbh.toString();
  167 + }
  168 + if (cph != null) {
  169 + this.carPlate = cph.toString();
  170 + }
  171 + if (sbbh != null) {
  172 + this.equipmentCode = sbbh.toString();
  173 + }
  174 + }
153 175  
154 176 public String getServiceNo() {
155 177 return serviceNo;
... ...
src/main/java/com/bsth/service/schedule/CarsService.java 0 → 100644
  View file @cb50fbf
  1 +package com.bsth.service.schedule;
  2 +
  3 +import com.bsth.entity.Cars;
  4 +
  5 +/**
  6 + * Created by xu on 16/12/8.
  7 + */
  8 +public interface CarsService extends BService<Cars, Integer> {
  9 + public void validate_nbbh(Cars cars) throws ScheduleException;
  10 + public void validate_clbh(Cars cars) throws ScheduleException;
  11 + public void validate_cph(Cars cars) throws ScheduleException;
  12 + public void validate_sbbh(Cars cars) throws ScheduleException;
  13 +}
... ...
src/main/java/com/bsth/service/schedule/impl/CarsServiceImpl.java 0 → 100644
  View file @cb50fbf
  1 +package com.bsth.service.schedule.impl;
  2 +
  3 +import com.bsth.entity.Cars;
  4 +import com.bsth.service.schedule.CarsService;
  5 +import com.bsth.service.schedule.ScheduleException;
  6 +import org.springframework.stereotype.Service;
  7 +import org.springframework.transaction.annotation.Transactional;
  8 +import org.springframework.util.CollectionUtils;
  9 +
  10 +import java.util.HashMap;
  11 +import java.util.Map;
  12 +
  13 +/**
  14 + * Created by xu on 16/12/8.
  15 + */
  16 +@Service(value = "carsServiceImpl_sc")
  17 +public class CarsServiceImpl extends BServiceImpl<Cars, Integer> implements CarsService {
  18 +
  19 + @Override
  20 + @Transactional
  21 + public void validate_nbbh(Cars cars) throws ScheduleException {
  22 + // 查询条件
  23 + Map<String, Object> param = new HashMap<>();
  24 + if (cars.getId() != null) {
  25 + param.put("id_ne", cars.getId());
  26 + }
  27 + param.put("insideCode_eq", cars.getInsideCode());
  28 + if (!CollectionUtils.isEmpty(list(param))) {
  29 + throw new ScheduleException("车辆内部编号/自编号重复");
  30 + }
  31 + }
  32 +
  33 + @Override
  34 + @Transactional
  35 + public void validate_clbh(Cars cars) throws ScheduleException {
  36 + // 查询条件
  37 + Map<String, Object> param = new HashMap<>();
  38 + if (cars.getId() != null) {
  39 + param.put("id_ne", cars.getId());
  40 + }
  41 + param.put("carCode_eq", cars.getCarCode());
  42 + if (!CollectionUtils.isEmpty(list(param))) {
  43 + throw new ScheduleException("车辆编号重复");
  44 + }
  45 + }
  46 +
  47 + @Override
  48 + @Transactional
  49 + public void validate_cph(Cars cars) throws ScheduleException {
  50 + // 查询条件
  51 + Map<String, Object> param = new HashMap<>();
  52 + if (cars.getId() != null) {
  53 + param.put("id_ne", cars.getId());
  54 + }
  55 + param.put("carPlate_eq", cars.getCarPlate());
  56 + if (!CollectionUtils.isEmpty(list(param))) {
  57 + throw new ScheduleException("车牌号重复");
  58 + }
  59 + }
  60 +
  61 + @Override
  62 + @Transactional
  63 + public void validate_sbbh(Cars cars) throws ScheduleException {
  64 + // 查询条件
  65 + Map<String, Object> param = new HashMap<>();
  66 + if (cars.getId() != null) {
  67 + param.put("id_ne", cars.getId());
  68 + }
  69 + param.put("equipmentCode_eq", cars.getEquipmentCode());
  70 + if (!CollectionUtils.isEmpty(list(param))) {
  71 + throw new ScheduleException("设备编号重复");
  72 + }
  73 + }
  74 +}
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
  View file @cb50fbf
... ... @@ -33,8 +33,8 @@
33 33 <div class="portlet-body form">
34 34 <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
35 35 <!--<div class="alert alert-danger display-hide">-->
36   - <!--<button class="close" data-close="alert"></button>-->
37   - <!--您的输入有误，请检查下面的输入项-->
  36 + <!--<button class="close" data-close="alert"></button>-->
  37 + <!--您的输入有误，请检查下面的输入项-->
38 38 <!--</div>-->
39 39  
40 40  
... ... @@ -45,9 +45,9 @@
45 45 <div class="col-md-3">
46 46 <input type="text" class="form-control"
47 47 name="insideCode" ng-model="ctrl.busInfoForSave.insideCode"
48   - required ng-maxlength="8"
  48 + required ng-maxlength="20"
49 49 remote-Validation
50   - remotevtype="cl1"
  50 + remotevtype="cars_zbh"
51 51 remotevparam="{{ {'insideCode_eq': ctrl.busInfoForSave.insideCode} | json}}"
52 52 placeholder="请输入车辆内部编码"/>
53 53 </div>
... ... @@ -56,10 +56,10 @@
56 56 内部编号必须填写
57 57 </div>
58 58 <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.maxlength">
59   - 内部编号长度不能超过8位
  59 + 内部编号长度不能超过20位
60 60 </div>
61 61 <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.remote">
62   - 内部编号不能重复
  62 + {{$remote_msg}}
63 63 </div>
64 64 </div>
65 65  
... ... @@ -78,6 +78,7 @@
78 78 datatype="gsType"
79 79 required >
80 80 </sa-Select3>
  81 +
81 82 </div>
82 83 <!-- 隐藏块，显示验证信息 -->
83 84 <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
... ... @@ -103,26 +104,40 @@
103 104 <label class="col-md-2 control-label">车辆编码*：</label>
104 105 <div class="col-md-3">
105 106 <input type="text" class="form-control"
106   - name="carCode" ng-model="ctrl.busInfoForSave.carCode"
107   - required placeholder="请输入车辆编码"/>
  107 + name="carCode" ng-model="ctrl.busInfoForSave.carCode"
  108 + required placeholder="请输入车辆编码"
  109 + remote-Validation
  110 + remotevtype="cars_clbh"
  111 + remotevparam="{{ {'carCode_eq': ctrl.busInfoForSave.carCode} | json}}"
  112 + />
108 113 </div>
109 114 <!-- 隐藏块，显示验证信息 -->
110 115 <div class="alert alert-danger well-sm" ng-show="myForm.carCode.$error.required">
111 116 车辆编码必须填写
112 117 </div>
  118 + <div class="alert alert-danger well-sm" ng-show="myForm.carCode.$error.remote">
  119 + {{$remote_msg}}
  120 + </div>
113 121 </div>
114 122  
115 123 <div class="form-group has-success has-feedback">
116 124 <label class="col-md-2 control-label">车牌号*：</label>
117 125 <div class="col-md-3">
118 126 <input type="text" class="form-control"
119   - name="carPlate" ng-model="ctrl.busInfoForSave.carPlate"
120   - required placeholder="请输入车牌号"/>
  127 + name="carPlate" ng-model="ctrl.busInfoForSave.carPlate"
  128 + required placeholder="请输入车牌号"
  129 + remote-Validation
  130 + remotevtype="cars_cph"
  131 + remotevparam="{{ {'carPlate_eq': ctrl.busInfoForSave.carPlate} | json}}"
  132 + />
121 133 </div>
122 134 <!-- 隐藏快，显示验证信息 -->
123 135 <div class="alert alert-danger well-sm" ng-show="myForm.carPlate.$error.required">
124 136 车牌号必须填写
125 137 </div>
  138 + <div class="alert alert-danger well-sm" ng-show="myForm.carPlate.$error.remote">
  139 + {{$remote_msg}}
  140 + </div>
126 141 </div>
127 142  
128 143 <div class="form-group has-success has-feedback">
... ... @@ -149,62 +164,69 @@
149 164 <label class="col-md-2 control-label">终端号*：</label>
150 165 <div class="col-md-3">
151 166 <input type="text" class="form-control"
152   - name="equipmentCode" ng-model="ctrl.busInfoForSave.equipmentCode"
153   - required placeholder="请输入设备终端号"/>
  167 + name="equipmentCode" ng-model="ctrl.busInfoForSave.equipmentCode"
  168 + required placeholder="请输入设备终端号"
  169 + remote-Validation
  170 + remotevtype="cars_sbbh"
  171 + remotevparam="{{ {'equipmentCode_eq': ctrl.busInfoForSave.equipmentCode} | json}}"
  172 + />
154 173 </div>
155 174 <!-- 隐藏块，显示验证信息 -->
156 175 <div class="alert alert-danger well-sm" ng-show="myForm.equipmentCode.$error.required">
157 176 设备终端号必须填写
158 177 </div>
  178 + <div class="alert alert-danger well-sm" ng-show="myForm.equipmentCode.$error.remote">
  179 + {{$remote_msg}}
  180 + </div>
159 181 </div>
160 182  
161 183 <div class="form-group">
162 184 <label class="col-md-2 control-label">车型类别：</label>
163 185 <div class="col-md-4">
164 186 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carClass"
165   - placeholder="请输入车型类别"/>
  187 + placeholder="请输入车型类别"/>
166 188 </div>
167 189 </div>
168 190 <div class="form-group">
169 191 <label class="col-md-2 control-label">技术速度：</label>
170 192 <div class="col-md-4">
171 193 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.speed"
172   - placeholder="请输入技术速度"/>
  194 + placeholder="请输入技术速度"/>
173 195 </div>
174 196 </div>
175 197 <div class="form-group">
176 198 <label class="col-md-2 control-label">座位数：</label>
177 199 <div class="col-md-4">
178 200 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carSeatnNumber"
179   - placeholder="请输入座位数"/>
  201 + placeholder="请输入座位数"/>
180 202 </div>
181 203 </div>
182 204 <div class="form-group">
183 205 <label class="col-md-2 control-label">载客标准：</label>
184 206 <div class="col-md-4">
185 207 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carStandard"
186   - placeholder="请输入载客标准"/>
  208 + placeholder="请输入载客标准"/>
187 209 </div>
188 210 </div>
189 211 <div class="form-group">
190 212 <label class="col-md-2 control-label">标准油耗/开空调：</label>
191 213 <div class="col-md-4">
192 214 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.kburnStandard"
193   - placeholder="请输入标准油耗/开空调"/>
  215 + placeholder="请输入标准油耗/开空调"/>
194 216 </div>
195 217 </div>
196 218 <div class="form-group">
197 219 <label class="col-md-2 control-label">标准油耗/关空调：</label>
198 220 <div class="col-md-4">
199 221 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.gburnStandard"
200   - placeholder="请输入标准油耗/关空调"/>
  222 + placeholder="请输入标准油耗/关空调"/>
201 223 </div>
202 224 </div>
203 225 <div class="form-group">
204 226 <label class="col-md-2 control-label">报废号：</label>
205 227 <div class="col-md-4">
206 228 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.scrapCode"
207   - placeholder="请输入报废号"/>
  229 + placeholder="请输入报废号"/>
208 230 </div>
209 231 </div>
210 232  
... ... @@ -229,56 +251,56 @@
229 251 <label class="col-md-2 control-label">厂牌型号1：</label>
230 252 <div class="col-md-4">
231 253 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.makeCodeOne"
232   - placeholder="请输入厂牌型号1"/>
  254 + placeholder="请输入厂牌型号1"/>
233 255 </div>
234 256 </div>
235 257 <div class="form-group">
236 258 <label class="col-md-2 control-label">厂牌型号2：</label>
237 259 <div class="col-md-4">
238 260 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.makeCodeTwo"
239   - placeholder="请输入厂牌型号2"/>
  261 + placeholder="请输入厂牌型号2"/>
240 262 </div>
241 263 </div>
242 264 <div class="form-group">
243 265 <label class="col-md-2 control-label">车辆等级标准：</label>
244 266 <div class="col-md-4">
245 267 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carGride"
246   - placeholder="请输入车辆等级标准"/>
  268 + placeholder="请输入车辆等级标准"/>
247 269 </div>
248 270 </div>
249 271 <div class="form-group">
250 272 <label class="col-md-2 control-label">出厂排放标准：</label>
251 273 <div class="col-md-4">
252 274 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.emissionsStandard"
253   - placeholder="请输入出场排放标准"/>
  275 + placeholder="请输入出场排放标准"/>
254 276 </div>
255 277 </div>
256 278 <div class="form-group">
257 279 <label class="col-md-2 control-label">发动机号码1：</label>
258 280 <div class="col-md-4">
259 281 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.engineCodeOne"
260   - placeholder="请输入发动机号码1"/>
  282 + placeholder="请输入发动机号码1"/>
261 283 </div>
262 284 </div>
263 285 <div class="form-group">
264 286 <label class="col-md-2 control-label">发动机号码2：</label>
265 287 <div class="col-md-4">
266 288 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.engineCodeTwo"
267   - placeholder="请输入发动机号码2"/>
  289 + placeholder="请输入发动机号码2"/>
268 290 </div>
269 291 </div>
270 292 <div class="form-group">
271 293 <label class="col-md-2 control-label">车架号码1：</label>
272 294 <div class="col-md-4">
273 295 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carNumberOne"
274   - placeholder="请输入车架号码1"/>
  296 + placeholder="请输入车架号码1"/>
275 297 </div>
276 298 </div>
277 299 <div class="form-group">
278 300 <label class="col-md-2 control-label">车架号码2：</label>
279 301 <div class="col-md-4">
280 302 <input type="text" class="form-control" ng-model="ctrl.busInfoForSave.carNumberTwo"
281   - placeholder="请输入车架号码2"/>
  303 + placeholder="请输入车架号码2"/>
282 304 </div>
283 305 </div>
284 306 <div class="form-group">
... ... @@ -422,5 +444,4 @@
422 444  
423 445 </div>
424 446  
425   -
426 447 </div>
427 448 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @cb50fbf
... ... @@ -45,9 +45,9 @@
45 45 <div class="col-md-3">
46 46 <input type="text" class="form-control"
47 47 name="insideCode" ng-model="ctrl.busInfoForSave.insideCode"
48   - required ng-maxlength="8"
  48 + required ng-maxlength="20"
49 49 remote-Validation
50   - remotevtype="cl1"
  50 + remotevtype="cars_zbh"
51 51 remotevparam="{{ {'insideCode_eq': ctrl.busInfoForSave.insideCode} | json}}"
52 52 placeholder="请输入车辆内部编码"/>
53 53 </div>
... ... @@ -56,10 +56,10 @@
56 56 内部编号必须填写
57 57 </div>
58 58 <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.maxlength">
59   - 内部编号长度不能超过8位
  59 + 内部编号长度不能超过20位
60 60 </div>
61 61 <div class="alert alert-danger well-sm" ng-show="myForm.insideCode.$error.remote">
62   - 内部编号不能重复
  62 + {{$remote_msg}}
63 63 </div>
64 64 </div>
65 65  
... ... @@ -105,12 +105,19 @@
105 105 <div class="col-md-3">
106 106 <input type="text" class="form-control"
107 107 name="carCode" ng-model="ctrl.busInfoForSave.carCode"
108   - required placeholder="请输入车辆编码"/>
  108 + required placeholder="请输入车辆编码"
  109 + remote-Validation
  110 + remotevtype="cars_clbh"
  111 + remotevparam="{{ {'carCode_eq': ctrl.busInfoForSave.carCode} | json}}"
  112 + />
109 113 </div>
110 114 <!-- 隐藏块，显示验证信息 -->
111 115 <div class="alert alert-danger well-sm" ng-show="myForm.carCode.$error.required">
112 116 车辆编码必须填写
113 117 </div>
  118 + <div class="alert alert-danger well-sm" ng-show="myForm.carCode.$error.remote">
  119 + {{$remote_msg}}
  120 + </div>
114 121 </div>
115 122  
116 123 <div class="form-group has-success has-feedback">
... ... @@ -118,12 +125,19 @@
118 125 <div class="col-md-3">
119 126 <input type="text" class="form-control"
120 127 name="carPlate" ng-model="ctrl.busInfoForSave.carPlate"
121   - required placeholder="请输入车牌号"/>
  128 + required placeholder="请输入车牌号"
  129 + remote-Validation
  130 + remotevtype="cars_cph"
  131 + remotevparam="{{ {'carPlate_eq': ctrl.busInfoForSave.carPlate} | json}}"
  132 + />
122 133 </div>
123 134 <!-- 隐藏快，显示验证信息 -->
124 135 <div class="alert alert-danger well-sm" ng-show="myForm.carPlate.$error.required">
125 136 车牌号必须填写
126 137 </div>
  138 + <div class="alert alert-danger well-sm" ng-show="myForm.carPlate.$error.remote">
  139 + {{$remote_msg}}
  140 + </div>
127 141 </div>
128 142  
129 143 <div class="form-group has-success has-feedback">
... ... @@ -151,12 +165,19 @@
151 165 <div class="col-md-3">
152 166 <input type="text" class="form-control"
153 167 name="equipmentCode" ng-model="ctrl.busInfoForSave.equipmentCode"
154   - required placeholder="请输入设备终端号"/>
  168 + required placeholder="请输入设备终端号"
  169 + remote-Validation
  170 + remotevtype="cars_sbbh"
  171 + remotevparam="{{ {'equipmentCode_eq': ctrl.busInfoForSave.equipmentCode} | json}}"
  172 + />
155 173 </div>
156 174 <!-- 隐藏块，显示验证信息 -->
157 175 <div class="alert alert-danger well-sm" ng-show="myForm.equipmentCode.$error.required">
158 176 设备终端号必须填写
159 177 </div>
  178 + <div class="alert alert-danger well-sm" ng-show="myForm.equipmentCode.$error.remote">
  179 + {{$remote_msg}}
  180 + </div>
160 181 </div>
161 182  
162 183 <div class="form-group">
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @cb50fbf
... ... @@ -7,12 +7,12 @@
7 7 <th style="width: 50px;">序号</th>
8 8 <th style="width: 130px;">车辆编号</th>
9 9 <th style="width: 130px;">内部编号</th>
10   - <th >设备编号</th>
11   - <th >车牌号</th>
12   - <th style="width: 15%;">所在公司</th>
13   - <th >所在分公司</th>
14   - <th style="width: 10%">是否电车</th>
15   - <th style="width: 21%">操作</th>
  10 + <th style="width: 130px;">设备编号</th>
  11 + <th style="width: 130px;">车牌号</th>
  12 + <th style="width: 150px;">所在公司</th>
  13 + <th style="width: 100px;">所在分公司</th>
  14 + <th style="width: 80px">是否电车</th>
  15 + <th style="width: 100%">操作</th>
16 16 </tr>
17 17 <tr role="row" class="filter">
18 18 <td></td>
... ... @@ -23,8 +23,10 @@
23 23 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().insideCode_like" placeholder="输入内部编号..."/>
24 24 </td>
25 25 <td>
  26 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().equipmentCode_like" placeholder="输入设备编号..."/>
26 27 </td>
27 28 <td>
  29 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like" placeholder="输入车牌号..."/>
28 30 </td>
29 31 <td>
30 32 <div>
... ... @@ -47,18 +49,18 @@
47 49 </td>
48 50 <td>
49 51 <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
50   - ng-click="ctrl.pageChanaged()">
  52 + ng-click="ctrl.doPage()">
51 53 <i class="fa fa-search"></i> 搜索</button>
52 54  
53 55 <button class="btn btn-sm red btn-outline filter-cancel"
54   - ng-click="ctrl.resetSearchCondition()">
  56 + ng-click="ctrl.reset()">
55 57 <i class="fa fa-times"></i> 重置</button>
56 58 </td>
57 59  
58 60 </tr>
59 61 </thead>
60 62 <tbody>
61   - <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  63 + <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
62 64 <td>
63 65 <span ng-bind="$index + 1"></span>
64 66 </td>
... ... @@ -96,9 +98,9 @@
96 98 </div>
97 99  
98 100 <div style="text-align: right;">
99   - <uib-pagination total-items="ctrl.pageInfo.totalItems"
100   - ng-model="ctrl.pageInfo.currentPage"
101   - ng-change="ctrl.pageChanaged()"
  101 + <uib-pagination total-items="ctrl.page()['totalElements']"
  102 + ng-model="ctrl.page()['uiNumber']"
  103 + ng-change="ctrl.doPage()"
102 104 rotate="false"
103 105 max-size="10"
104 106 boundary-links="true"
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
  View file @cb50fbf
1 1 // 车辆基础信息维护 service controller等写在一起
2 2  
3   -angular.module('ScheduleApp').factory('BusInfoManageService', ['BusInfoManageService_g', function(service) {
  3 +angular.module('ScheduleApp').factory(
  4 + 'BusInfoManageService',
  5 + [
  6 + 'BusInfoManageService_g',
  7 + function(service) {
4 8  
5   - /** 当前的查询条件信息 */
6   - var currentSearchCondition = {
7   - "carCode_like" : "",
8   - "insideCode_like" : "",
9   - "equipmentCode_like" : "",
10   - "carPlate_like" : ""
11   - };
12   -
13   - /** 当前第几页 */
14   - var currentPageNo = 1;
15   - return {
16   - /**
17   - * 获取查询条件信息，
18   - * 用于给controller用来和页面数据绑定。
19   - */
20   - getSearchCondition: function() {
21   - return currentSearchCondition;
22   - },
23   - /**
24   - * 重置查询条件信息。
25   - */
26   - resetSearchCondition: function() {
27   - var key;
28   - for (key in currentSearchCondition) {
29   - currentSearchCondition[key] = undefined;
30   - }
31   - currentPageNo = 1;
32   - },
33   - /**
34   - * 设置当前页码。
35   - * @param cpn 从1开始，后台是从0开始的
36   - */
37   - setCurrentPageNo: function(cpn) {
38   - currentPageNo = cpn;
39   - },
40   - /**
41   - * 组装查询参数，返回一个promise查询结果。
42   - * @param params 查询参数
43   - * @return 返回一个 promise
44   - */
45   - getPage: function() {
46   - var params = currentSearchCondition; // 查询条件
47   - params.page = currentPageNo - 1; // 服务端页码从0开始
48   - return service.rest.list(params).$promise;
49   - },
50   - /**
51   - * 获取明细信息。
52   - * @param id 车辆id
53   - * @return 返回一个 promise
54   - */
55   - getDetail: function(id) {
56   - var params = {id: id};
57   - return service.rest.get(params).$promise;
58   - },
59   - /**
60   - * 保存信息。
61   - * @param obj 车辆详细信息
62   - * @return 返回一个 promise
63   - */
64   - saveDetail: function(obj) {
65   - return service.rest.save(obj).$promise;
66   - },
67   - /**
68   - * 数据导出。
69   - * @returns {*|Function|promise|n}
70   - */
71   - dataExport: function() {
72   - return service.dataTools.dataExport().$promise;
73   - }
74   - };
75   -}]);
  9 + /** 当前的查询条件信息 */
  10 + var currentSearchCondition = {
  11 + page: 0,
  12 + "carCode_like" : "",
  13 + "insideCode_like" : "",
  14 + "equipmentCode_like" : "",
  15 + "carPlate_like" : ""
  16 + };
  17 + // 当前查询返回的信息
  18 + var currentPage = { // 后台spring data返回的格式
  19 + totalElements: 0,
  20 + number: 0, // 后台返回的页码，spring返回从0开始
  21 + content: [],
76 22  
77   -angular.module('ScheduleApp').controller('BusInfoManageCtrl', [
78   - 'BusInfoManageService','$state', '$uibModal', 'FileDownload_g',
79   - function(busInfoManageService, $state, $uibModal, fileDownload) {
80   - var self = this;
  23 + uiNumber: 1 // 页面绑定的页码
  24 + };
81 25  
82   - // 切换到form状态
83   - self.goForm = function() {
84   - //alert("切换");
85   - $state.go("busInfoManage_form");
86   - };
  26 + // 查询对象
  27 + var queryClass = service.rest;
87 28  
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
  29 + return {
  30 + getQueryClass: function() {
  31 + return queryClass;
98 32 },
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打开");
  33 + /**
  34 + * 获取查询条件信息，
  35 + * 用于给controller用来和页面数据绑定。
  36 + */
  37 + getSearchCondition: function() {
  38 + currentSearchCondition.page = currentPage.uiNumber - 1;
  39 + return currentSearchCondition;
107 40 },
108   - function() {
109   - console.log("dataImport.html消失");
110   - }
111   - );
112   - };
113   -
114   - // 导出excel
115   - self.exportData = function() {
116   - busInfoManageService.dataExport().then(
117   - function(result) {
118   - fileDownload.downloadFile(result.data, "application/octet-stream", "车辆基础信息.xls");
  41 + /**
  42 + * 组装查询参数，返回一个promise查询结果。
  43 + * @param params 查询参数
  44 + * @return 返回一个 promise
  45 + */
  46 + getPage: function(page) {
  47 + if (page) {
  48 + currentPage.totalElements = page.totalElements;
  49 + currentPage.number = page.number;
  50 + currentPage.content = page.content;
  51 + }
  52 + return currentPage;
119 53 },
120   - function(result) {
121   - console.log("exportData failed：" + result);
  54 + resetStatus: function() {
  55 + currentSearchCondition = {page: 0};
  56 + currentPage = {
  57 + totalElements: 0,
  58 + number: 0,
  59 + content: [],
  60 + uiNumber: 1
  61 + };
  62 + },
  63 +
  64 + /**
  65 + * 数据导出。
  66 + * @returns {*|Function|promise|n}
  67 + */
  68 + dataExport: function() {
  69 + return service.dataTools.dataExport().$promise;
122 70 }
123   - );
124   - };
125   - }]);
  71 + };
  72 +
  73 + }
  74 + ]
  75 +);
  76 +
  77 +// index.html控制器
  78 +angular.module('ScheduleApp').controller(
  79 + 'BusInfoManageCtrl',
  80 + [
  81 + 'BusInfoManageService',
  82 + '$state',
  83 + '$uibModal',
  84 + 'FileDownload_g',
  85 + function(busInfoManageService, $state, $uibModal, fileDownload) {
  86 + var self = this;
  87 +
  88 + // 切换到form状态
  89 + self.goForm = function() {
  90 + //alert("切换");
  91 + $state.go("busInfoManage_form");
  92 + };
  93 +
  94 + // 导入excel
  95 + self.importData = function() {
  96 + // large方式弹出模态对话框
  97 + var modalInstance = $uibModal.open({
  98 + templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/dataImport.html',
  99 + size: "lg",
  100 + animation: true,
  101 + backdrop: 'static',
  102 + resolve: {
  103 + // 可以传值给controller
  104 + },
  105 + windowClass: 'center-modal',
  106 + controller: "BusInfoManageToolsCtrl",
  107 + controllerAs: "ctrl",
  108 + bindToController: true
  109 + });
  110 + modalInstance.result.then(
  111 + function() {
  112 + console.log("dataImport.html打开");
  113 + },
  114 + function() {
  115 + console.log("dataImport.html消失");
  116 + }
  117 + );
  118 + };
  119 +
  120 + // 导出excel
  121 + self.exportData = function() {
  122 + busInfoManageService.dataExport().then(
  123 + function(result) {
  124 + fileDownload.downloadFile(result.data, "application/octet-stream", "车辆基础信息.xls");
  125 + },
  126 + function(result) {
  127 + console.log("exportData failed：" + result);
  128 + }
  129 + );
  130 + };
  131 + }
  132 + ]
  133 +);
126 134  
127 135 angular.module('ScheduleApp').controller('BusInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
128 136 var self = this;
... ... @@ -160,143 +168,114 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;BusInfoManageToolsCtrl&#39;, [&#39;$modalInsta
160 168  
161 169 }]);
162 170  
  171 +// list.html控制器
  172 +angular.module('ScheduleApp').controller(
  173 + 'BusInfoManageListCtrl',
  174 + [
  175 + 'BusInfoManageService',
  176 + '$scope',
  177 + function(service, $scope) {
  178 + var self = this;
  179 + var Cars = service.getQueryClass();
163 180  
164   -angular.module('ScheduleApp').controller('BusInfoManageListCtrl', ['BusInfoManageService','$scope', function(busInfoManageService, $scope) {
165   - var self = this;
166   - self.pageInfo = {
167   - totalItems : 0,
168   - currentPage : 1,
169   - infos: []
170   - };
  181 + self.page = function() {
  182 + return service.getPage();
  183 + };
171 184  
172   - // 初始创建的时候，获取一次列表数据
173   - busInfoManageService.getPage().then(
174   - function(result) {
175   - self.pageInfo.totalItems = result.totalElements;
176   - self.pageInfo.currentPage = result.number + 1;
177   - self.pageInfo.infos = result.content;
178   - busInfoManageService.setCurrentPageNo(result.number + 1);
179   - },
180   - function(result) {
181   - alert("出错啦！");
182   - }
183   - );
  185 + self.searchCondition = function() {
  186 + return service.getSearchCondition();
  187 + };
184 188  
185   - //$scope.$watch("ctrl.pageInfo.currentPage", function() {
186   - // alert("dfdfdf");
187   - //});
  189 + self.doPage = function() {
  190 + var result = Cars.list(self.searchCondition(), function() {
  191 + if (!result.status) {
  192 + service.getPage(result);
  193 + }
  194 + });
  195 + };
  196 + self.reset = function() {
  197 + service.resetStatus();
  198 + var result = Cars.list(self.searchCondition(), function() {
  199 + if (!result.status) {
  200 + service.getPage(result);
  201 + }
  202 + });
  203 + };
188 204  
189   - // 翻页的时候调用
190   - self.pageChanaged = function() {
191   - busInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
192   - busInfoManageService.getPage().then(
193   - function(result) {
194   - self.pageInfo.totalItems = result.totalElements;
195   - self.pageInfo.currentPage = result.number + 1;
196   - self.pageInfo.infos = result.content;
197   - busInfoManageService.setCurrentPageNo(result.number + 1);
198   - },
199   - function(result) {
200   - alert("出错啦！");
201   - }
202   - );
203   - };
204   - // 获取查询条件数据
205   - self.searchCondition = function() {
206   - return busInfoManageService.getSearchCondition();
207   - };
208   - // 重置查询条件
209   - self.resetSearchCondition = function() {
210   - busInfoManageService.resetSearchCondition();
211   - self.pageInfo.currentPage = 1;
212   - self.pageChanaged();
213   - };
214   -}]);
  205 + self.doPage();
  206 + }
  207 + ]
  208 +);
215 209  
216   -angular.module('ScheduleApp').controller('BusInfoManageFormCtrl', ['BusInfoManageService', '$stateParams', '$state', function(busInfoManageService, $stateParams, $state) {
217   - var self = this;
  210 +// form.html控制器
  211 +angular.module('ScheduleApp').controller(
  212 + 'BusInfoManageFormCtrl',
  213 + [
  214 + 'BusInfoManageService',
  215 + '$stateParams',
  216 + '$state',
  217 + function(service, $stateParams, $state) {
  218 + var self = this;
  219 + var Cars = service.getQueryClass();
218 220  
219   - // 报废日期 日期控件开关
220   - self.scrapDateOpen = false;
221   - self.scrapDate_open = function() {
222   - self.scrapDateOpen = true;
223   - };
  221 + // 报废日期 日期控件开关
  222 + self.scrapDateOpen = false;
  223 + self.scrapDate_open = function() {
  224 + self.scrapDateOpen = true;
  225 + };
224 226  
225   - // 启用日期 日期控件开关
226   - self.openDateOpen = false;
227   - self.openDate_open = function() {
228   - self.openDateOpen = true;
229   - };
230   - // 取消日期 日期控件开关
231   - self.closeDateOpen = false;
232   - self.closeDate_open = function() {
233   - self.closeDateOpen = true;
234   - };
  227 + // 启用日期 日期控件开关
  228 + self.openDateOpen = false;
  229 + self.openDate_open = function() {
  230 + self.openDateOpen = true;
  231 + };
  232 + // 取消日期 日期控件开关
  233 + self.closeDateOpen = false;
  234 + self.closeDate_open = function() {
  235 + self.closeDateOpen = true;
  236 + };
235 237  
236   - // 欲保存的busInfo信息，绑定
237   - self.busInfoForSave = {};
  238 + // 欲保存的busInfo信息，绑定
  239 + self.busInfoForSave = new Cars;
238 240  
239   - // 获取传过来的id，有的话就是修改，获取一遍数据
240   - var id = $stateParams.id;
241   - if (id) {
242   - self.busInfoForSave.id = id;
243   - busInfoManageService.getDetail(id).then(
244   - function(result) {
245   - var key;
246   - for (key in result) {
247   - self.busInfoForSave[key] = result[key];
248   - }
249   - },
250   - function(result) {
251   - alert("出错啦！");
  241 + // 获取传过来的id，有的话就是修改，获取一遍数据
  242 + var id = $stateParams.id;
  243 + if (id) {
  244 + self.busInfoForSave = Cars.get({id: id}, function() {});
252 245 }
253   - );
254   - }
255 246  
256   - // 提交方法
257   - self.submit = function() {
258   - console.log(self.busInfoForSave);
259   - //if (self.busInfoForSave) {
260   - // delete $stateParams.id;
261   - //}
262   - busInfoManageService.saveDetail(self.busInfoForSave).then(
263   - function(result) {
264   - // TODO：弹出框方式以后改
265   - if (result.status == 'SUCCESS') {
266   - alert("保存成功！");
  247 + // 提交方法
  248 + self.submit = function() {
  249 + console.log(self.busInfoForSave);
  250 + //if (self.busInfoForSave) {
  251 + // delete $stateParams.id;
  252 + //}
  253 + self.busInfoForSave.$save(function() {
267 254 $state.go("busInfoManage");
268   - } else {
269   - alert("保存异常！");
270   - }
271   - },
272   - function(result) {
273   - // TODO：弹出框方式以后改
274   - alert("出错啦！");
275   - }
276   - );
277   - };
278   -
279   -}]);
  255 + });
  256 + };
  257 + }
  258 + ]
  259 +);
280 260  
281   -angular.module('ScheduleApp').controller('BusInfoManageDetailCtrl', ['BusInfoManageService', '$stateParams', function(busInfoManageService, $stateParams) {
282   - var self = this;
283   - self.title = "";
284   - self.busInfoForDetail = {};
285   - self.busInfoForDetail.id = $stateParams.id;
  261 +// detail.html控制器
  262 +angular.module('ScheduleApp').controller(
  263 + 'BusInfoManageDetailCtrl',
  264 + [
  265 + 'BusInfoManageService',
  266 + '$stateParams',
  267 + function(service, $stateParams) {
  268 + var self = this;
  269 + var Cars = service.getQueryClass();
  270 + var id = $stateParams.id;
286 271  
287   - // 当转向到此页面时，就获取明细信息并绑定
288   - busInfoManageService.getDetail($stateParams.id).then(
289   - function(result) {
290   - var key;
291   - for (key in result) {
292   - self.busInfoForDetail[key] = result[key];
293   - }
  272 + self.title = "";
  273 + self.busInfoForDetail = {};
294 274  
295   - self.title = "车辆 " + self.busInfoForDetail.insideCode + " 详细信息";
296   - },
297   - function(result) {
298   - // TODO：弹出框方式以后改
299   - alert("出错啦！");
  275 + // 当转向到此页面时，就获取明细信息并绑定
  276 + self.busInfoForDetail = Cars.get({id: id}, function() {
  277 + self.title = "车辆 " + self.busInfoForDetail.insideCode + " 详细信息";
  278 + });
300 279 }
301   - );
302   -}]);
303 280 \ No newline at end of file
  281 + ]
  282 +);
304 283 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/service.js
  View file @cb50fbf
... ... @@ -2,17 +2,33 @@
2 2 angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {
3 3 return {
4 4 rest: $resource(
5   - '/cars/:id',
  5 + '/cars_sc/:id',
6 6 {order: 'carCode', direction: 'ASC', id: '@id_route'},
7 7 {
8 8 list: {
9 9 method: 'GET',
10 10 params: {
11 11 page: 0
  12 + },
  13 + transformResponse: function(rs) {
  14 + var dst = angular.fromJson(rs);
  15 + if (dst.status == 'SUCCESS') {
  16 + return dst.data;
  17 + } else {
  18 + return dst; // 业务错误留给控制器处理
  19 + }
12 20 }
13 21 },
14 22 get: {
15   - method: 'GET'
  23 + method: 'GET',
  24 + transformResponse: function(rs) {
  25 + var dst = angular.fromJson(rs);
  26 + if (dst.status == 'SUCCESS') {
  27 + return dst.data;
  28 + } else {
  29 + return dst;
  30 + }
  31 + }
16 32 },
17 33 save: {
18 34 method: 'POST'
... ...
src/main/resources/static/pages/scheduleApp/module/common/main.js
  View file @cb50fbf
... ... @@ -76,13 +76,26 @@ ScheduleApp.factory(
76 76 },
77 77 requestError: function(rejection) {
78 78 requestNotificationChannel.requestEnded();
79   - alert("服务端无响应");
80 79 return rejection;
81 80 },
82 81 response: function(response) {
83 82 requestNotificationChannel.requestEnded();
84 83  
85   - return response;
  84 + var data = response.data;
  85 + var output = [];
  86 + if (data.status == '407') {
  87 + alert("请重新登录！");
  88 + return $q.reject(response);
  89 + } else if (data.status == '500') {
  90 + output.push("状态编码：" + data.status);
  91 + output.push("访问路径：" + data.path);
  92 + output.push("错误消息：" + data.message);
  93 + alert("服务端错误：" + "\n" + output.join("\n"));
  94 + return $q.reject(response);
  95 + } else {
  96 + return response;
  97 + }
  98 +
86 99 },
87 100 responseError: function(rejection) {
88 101 requestNotificationChannel.requestEnded();
... ... @@ -90,25 +103,23 @@ ScheduleApp.factory(
90 103 // 处理错误，springboot会包装返回的错误数据
91 104 // 如：{"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
92 105  
93   - var status = rejection.status;
94   - var path = rejection.data.path;
95   - var message = rejection.data.message;
96 106 var output = [];
97   - output.push("状态编码：" + status);
98   - output.push("访问路径：" + path);
99   - output.push("错误消息：" + message);
100   - if (status) {
  107 + if (!status) {
  108 + alert("我擦，后台返回连个状态码都没返回，见鬼了，服务器可能重启了");
  109 + } else if (status == -1) {
  110 + // 服务器断开了
  111 + alert("貌似服务端连接不上");
  112 + } else {
  113 + output.push("状态编码：" + status);
  114 + output.push("访问路径：" + rejection.path);
  115 + output.push("错误消息：" + rejection.message);
101 116 if (status == 500) {
102 117 alert("服务端错误：" + "\n" + output.join("\n"));
103 118 } else if (status == 407) {
104 119 alert("请重新登录：" + "\n" + output.join("\n"));
105   - } else if (status == -1) {
106   - alert("貌似服务端连接不上");
107 120 } else {
108 121 alert("其他错误：" + "\n" + output.join("\n"));
109 122 }
110   - } else {
111   - alert("我擦，后台返回连个状态码都没返回，见鬼了！");
112 123 }
113 124  
114 125 return $q.reject(rejection);
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
  View file @cb50fbf
... ... @@ -277,10 +277,10 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
277 277 )
278 278 },
279 279  
280   - cl1: { // 车辆自编号不能重复验证
  280 + cars_zbh: { // 自编号验证
281 281 template: {'insideCode_eq': '-1'}, // 查询参数模版
282 282 remote: $resource( // $resource封装对象
283   - '/cars/validate/equale',
  283 + '/cars_sc/validate_zbh',
284 284 {},
285 285 {
286 286 do: {
... ... @@ -289,6 +289,47 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
289 289 }
290 290 )
291 291 },
  292 +
  293 + cars_sbbh: { // 验证设备编号
  294 + template: {'equipmentCode_eq': '-1'}, // 查询参数模版
  295 + remote: $resource( // $resource封装对象
  296 + '/cars_sc/validate_sbbh',
  297 + {},
  298 + {
  299 + do: {
  300 + method: 'GET'
  301 + }
  302 + }
  303 + )
  304 + },
  305 +
  306 + cars_clbh: { // 车辆编号验证
  307 + template: {'carCode_eq': '-1'}, // 查询参数模版
  308 + remote: $resource( // $resource封装对象
  309 + '/cars_sc/validate_clbh',
  310 + {},
  311 + {
  312 + do: {
  313 + method: 'GET'
  314 + }
  315 + }
  316 + )
  317 + },
  318 +
  319 + cars_cph: { // 车牌号验证
  320 + template: {'carPlate_eq': '-1'}, // 查询参数模版
  321 + remote: $resource( // $resource封装对象
  322 + '/cars_sc/validate_cph',
  323 + {},
  324 + {
  325 + do: {
  326 + method: 'GET'
  327 + }
  328 + }
  329 + )
  330 + },
  331 +
  332 +
292 333 cde1: { // 车辆设备启用日期验证
293 334 template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
294 335 remote: $resource( // $resource封装对象
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @cb50fbf
... ... @@ -3,17 +3,33 @@
3 3 angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {
4 4 return {
5 5 rest: $resource(
6   - '/cars/:id',
  6 + '/cars_sc/:id',
7 7 {order: 'carCode', direction: 'ASC', id: '@id_route'},
8 8 {
9 9 list: {
10 10 method: 'GET',
11 11 params: {
12 12 page: 0
  13 + },
  14 + transformResponse: function(rs) {
  15 + var dst = angular.fromJson(rs);
  16 + if (dst.status == 'SUCCESS') {
  17 + return dst.data;
  18 + } else {
  19 + return dst; // 业务错误留给控制器处理
  20 + }
13 21 }
14 22 },
15 23 get: {
16   - method: 'GET'
  24 + method: 'GET',
  25 + transformResponse: function(rs) {
  26 + var dst = angular.fromJson(rs);
  27 + if (dst.status == 'SUCCESS') {
  28 + return dst.data;
  29 + } else {
  30 + return dst;
  31 + }
  32 + }
17 33 },
18 34 save: {
19 35 method: 'POST'
... ... @@ -746,10 +762,10 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
746 762 )
747 763 },
748 764  
749   - cl1: { // 车辆自编号不能重复验证
  765 + cars_zbh: { // 自编号验证
750 766 template: {'insideCode_eq': '-1'}, // 查询参数模版
751 767 remote: $resource( // $resource封装对象
752   - '/cars/validate/equale',
  768 + '/cars_sc/validate_zbh',
753 769 {},
754 770 {
755 771 do: {
... ... @@ -758,6 +774,47 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
758 774 }
759 775 )
760 776 },
  777 +
  778 + cars_sbbh: { // 验证设备编号
  779 + template: {'equipmentCode_eq': '-1'}, // 查询参数模版
  780 + remote: $resource( // $resource封装对象
  781 + '/cars_sc/validate_sbbh',
  782 + {},
  783 + {
  784 + do: {
  785 + method: 'GET'
  786 + }
  787 + }
  788 + )
  789 + },
  790 +
  791 + cars_clbh: { // 车辆编号验证
  792 + template: {'carCode_eq': '-1'}, // 查询参数模版
  793 + remote: $resource( // $resource封装对象
  794 + '/cars_sc/validate_clbh',
  795 + {},
  796 + {
  797 + do: {
  798 + method: 'GET'
  799 + }
  800 + }
  801 + )
  802 + },
  803 +
  804 + cars_cph: { // 车牌号验证
  805 + template: {'carPlate_eq': '-1'}, // 查询参数模版
  806 + remote: $resource( // $resource封装对象
  807 + '/cars_sc/validate_cph',
  808 + {},
  809 + {
  810 + do: {
  811 + method: 'GET'
  812 + }
  813 + }
  814 + )
  815 + },
  816 +
  817 +
761 818 cde1: { // 车辆设备启用日期验证
762 819 template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
763 820 remote: $resource( // $resource封装对象
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
  View file @cb50fbf
1   -//所有模块ui route 配置// 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   -]);
95   -// ui route 配置
96   -
97   -/** 车辆设备信息模块配置route */
98   -ScheduleApp.config([
99   - '$stateProvider',
100   - '$urlRouterProvider',
101   - function($stateProvider, $urlRouterProvider) {
102   - // 默认路由
103   - //$urlRouterProvider.otherwise('/busConfig.html');
104   -
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   - }
115   - },
116   -
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'}
135   - },
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   - }]
148   - }
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   - })
186   -
187   - }
188   -]);
189   -// ui route 配置
190   -
191   -/** 人员基础信息模块配置route */
192   -ScheduleApp.config([
193   - '$stateProvider',
194   - '$urlRouterProvider',
195   - function($stateProvider, $urlRouterProvider) {
196   - // 默认路由
197   - //$urlRouterProvider.otherwise('/busConfig.html');
198   -
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   - }
209   - },
210   -
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'}
268   - },
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   - }]
279   - }
280   - })
281   -
282   -}]);
283   -// ui route 配置
284   -
285   -/** 车辆配置模块页面route */
286   -ScheduleApp.config([
287   - '$stateProvider',
288   - '$urlRouterProvider',
289   - function($stateProvider, $urlRouterProvider) {
290   - // 默认路由
291   - //$urlRouterProvider.otherwise('/busConfig.html');
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   - },
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   -]);
377   -
378   -
379   -
380   -// ui route 配置
381   -
382   -/** 线路运营概览配置route */
383   -ScheduleApp.config([
384   - '$stateProvider',
385   - '$urlRouterProvider',
386   - function($stateProvider, $urlRouterProvider) {
387   - // 默认路由
388   - //$urlRouterProvider.otherwise('/busConfig.html');
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   - },
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   - });
414   -
415   - }
416   -]);
417   -// ui route 配置
418   -
419   -/** 人员配置模块页面route */
420   -ScheduleApp.config([
421   - '$stateProvider',
422   - '$urlRouterProvider',
423   - function($stateProvider, $urlRouterProvider) {
424   - // 默认路由
425   - //$urlRouterProvider.otherwise('/busConfig.html');
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   - },
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   - })
509   -
510   - }
511   -]);
512   -// ui route 配置
513   -
514   -/** 路牌管理配置所有模块页面route */
515   -ScheduleApp.config([
516   - '$stateProvider',
517   - '$urlRouterProvider',
518   - function($stateProvider, $urlRouterProvider) {
519   - // 默认路由
520   - //$urlRouterProvider.otherwise('/busConfig.html');
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   - },
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_form', { // 添加路牌form
550   - url: '/guideboardManage_form',
551   - views: {
552   - '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/form.html'}
553   - },
554   - resolve: {
555   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
556   - return $ocLazyLoad.load({
557   - name: 'guideboardManage_form_module',
558   - insertBefore: '#ng_load_plugins_before',
559   - files: [
560   - 'assets/bower_components/angular-ui-select/dist/select.min.css',
561   - 'assets/bower_components/angular-ui-select/dist/select.min.js',
562   - 'pages/scheduleApp/module/core/guideboardManage/module.js'
563   - ]
564   - });
565   - }]
566   - }
567   - })
568   - .state('guideboardManage_edit', { // 修改路牌form
569   - url: '/guideboardManage_edit/:id',
570   - views: {
571   - '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/edit.html'}
572   - },
573   - resolve: {
574   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
575   - return $ocLazyLoad.load({
576   - name: 'guideboardManage_edit_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/guideboardManage/module.js'
582   - ]
583   - });
584   - }]
585   - }
586   - })
587   - .state("guideboardManage_detail", { // 详细信息页面
588   - url: '/guideboardManage_detail/:id',
589   - views: {
590   - "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}
591   - },
592   - resolve: {
593   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
594   - return $ocLazyLoad.load({
595   - name: 'guideboardManage_detail_module',
596   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
597   - files: [
598   - "pages/scheduleApp/module/core/guideboardManage/module.js"
599   - ]
600   - });
601   - }]
602   - }
603   - })
604   -
605   -
606   -}]);
607   -// ui route 配置
608   -
609   -/** 套跑管理模块配置页面route */
610   -ScheduleApp.config([
611   - '$stateProvider',
612   - '$urlRouterProvider',
613   - function($stateProvider, $urlRouterProvider) {
614   - // 默认路由
615   - //$urlRouterProvider.otherwise('/busConfig.html');
616   -
617   - $stateProvider
618   - .state("rerunManage", { // index页面
619   - url: '/rerunManage',
620   - views: {
621   - "": {
622   - templateUrl: 'pages/scheduleApp/module/core/rerunManage/index.html'
623   - },
624   - "rerunManage_list@rerunManage": {
625   - templateUrl: 'pages/scheduleApp/module/core/rerunManage/list.html'
626   - }
627   - },
628   -
629   - resolve: {
630   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
631   - return $ocLazyLoad.load({
632   - name: 'rerunManage_module',
633   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
634   - files: [
635   - "assets/bower_components/angular-ui-select/dist/select.min.css",
636   - "assets/bower_components/angular-ui-select/dist/select.min.js",
637   - "pages/scheduleApp/module/core/rerunManage/module.js"
638   - ]
639   - });
640   - }]
641   - }
642   - })
643   - .state("rerunManage_form", { // 添加套跑form
644   - url: '/rerunManage_form',
645   - views: {
646   - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/form.html'}
647   - },
648   - resolve: {
649   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
650   - return $ocLazyLoad.load({
651   - name: 'rerunManage_form_module',
652   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
653   - files: [
654   - "assets/bower_components/angular-ui-select/dist/select.min.css",
655   - "assets/bower_components/angular-ui-select/dist/select.min.js",
656   - "pages/scheduleApp/module/core/rerunManage/module.js"
657   - ]
658   - });
659   - }]
660   - }
661   - })
662   - .state("rerunManage_edit", { // 修改套跑form
663   - url: '/rerunManage_edit/:id',
664   - views: {
665   - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/edit.html'}
666   - },
667   - resolve: {
668   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
669   - return $ocLazyLoad.load({
670   - name: 'rerunManage_edit_module',
671   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
672   - files: [
673   - "assets/bower_components/angular-ui-select/dist/select.min.css",
674   - "assets/bower_components/angular-ui-select/dist/select.min.js",
675   - "pages/scheduleApp/module/core/rerunManage/module.js"
676   - ]
677   - });
678   - }]
679   - }
680   - })
681   - .state("rerunManage_detail", { // 详细信息页面
682   - url: '/rerunManage_detail/:id',
683   - views: {
684   - "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/detail.html'}
685   - },
686   - resolve: {
687   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
688   - return $ocLazyLoad.load({
689   - name: 'rerunManage_detail_module',
690   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
691   - files: [
692   - "pages/scheduleApp/module/core/rerunManage/module.js"
693   - ]
694   - });
695   - }]
696   - }
697   - })
698   - }
  1 +//所有模块ui route 配置// 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 + }
699 94 ]);
700   -// ui route 配置
701   -
702   -/** 排班计划管理配置route */
703   -ScheduleApp.config([
704   - '$stateProvider',
705   - '$urlRouterProvider',
706   - function($stateProvider, $urlRouterProvider) {
707   - // 默认路由
708   - //$urlRouterProvider.otherwise('/busConfig.html');
709   -
710   - $stateProvider
711   - .state("schedulePlanManage", { // index页面
712   - url: '/schedulePlanManage',
713   - views: {
714   - "": {
715   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index.html'
716   - },
717   - "schedulePlanManage_list@schedulePlanManage": {
718   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list.html'
719   - }
720   - },
721   -
722   - resolve: {
723   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
724   - return $ocLazyLoad.load({
725   - name: 'schedulePlanManage_module',
726   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
727   - files: [
728   - "assets/bower_components/angular-ui-select/dist/select.min.css",
729   - "assets/bower_components/angular-ui-select/dist/select.min.js",
730   - "pages/scheduleApp/module/core/schedulePlanManage/module.js"
731   - ]
732   - });
733   - }]
734   - }
735   - })
736   - .state("schedulePlanManage_form", { // 添加排班计划form
737   - url: '/schedulePlanManage_form',
738   - views: {
739   - "": {
740   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/form.html'
741   - }
742   - },
743   -
744   - resolve: {
745   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
746   - return $ocLazyLoad.load({
747   - name: 'schedulePlanManage_form_module',
748   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
749   - files: [
750   - "assets/bower_components/angular-ui-select/dist/select.min.css",
751   - "assets/bower_components/angular-ui-select/dist/select.min.js",
752   - "pages/scheduleApp/module/core/schedulePlanManage/module.js"
753   - ]
754   - });
755   - }]
756   - }
757   - })
758   -
759   -
760   - }
  95 +// ui route 配置
  96 +
  97 +/** 车辆设备信息模块配置route */
  98 +ScheduleApp.config([
  99 + '$stateProvider',
  100 + '$urlRouterProvider',
  101 + function($stateProvider, $urlRouterProvider) {
  102 + // 默认路由
  103 + //$urlRouterProvider.otherwise('/busConfig.html');
  104 +
  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 + }
  115 + },
  116 +
  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'}
  135 + },
  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 + }]
  148 + }
  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 + })
  186 +
  187 + }
761 188 ]);
762   -// ui route 配置
763   -
764   -/** 排班计划明细配置route */
765   -ScheduleApp.config([
766   - '$stateProvider',
767   - '$urlRouterProvider',
768   - function($stateProvider, $urlRouterProvider) {
769   - // 默认路由
770   - //$urlRouterProvider.otherwise('/busConfig.html');
771   -
772   - $stateProvider
773   - // 排班计划明细管理模块
774   - .state("schedulePlanInfoManage", {
775   - url: '/schedulePlanInfoManage/:spid/:xlname/:ttname/:stime/:etime',
776   - views: {
777   - "": {
778   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/index_info.html'
779   - },
780   - "schedulePlanInfoManage_list@schedulePlanInfoManage": {
781   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html'
782   - }
783   - },
784   -
785   - resolve: {
786   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
787   - return $ocLazyLoad.load({
788   - name: 'schedulePlanInfoManage_module',
789   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
790   - files: [
791   - "pages/scheduleApp/module/core/schedulePlanManage/info/module.js"
792   - ]
793   - });
794   - }]
795   - }
796   - });
  189 +// ui route 配置
  190 +
  191 +/** 人员基础信息模块配置route */
  192 +ScheduleApp.config([
  193 + '$stateProvider',
  194 + '$urlRouterProvider',
  195 + function($stateProvider, $urlRouterProvider) {
  196 + // 默认路由
  197 + //$urlRouterProvider.otherwise('/busConfig.html');
  198 +
  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 + }
  209 + },
  210 +
  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'}
  268 + },
  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 + }]
  279 + }
  280 + })
  281 +
  282 +}]);
  283 +// ui route 配置
  284 +
  285 +/** 车辆配置模块页面route */
  286 +ScheduleApp.config([
  287 + '$stateProvider',
  288 + '$urlRouterProvider',
  289 + function($stateProvider, $urlRouterProvider) {
  290 + // 默认路由
  291 + //$urlRouterProvider.otherwise('/busConfig.html');
  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 + },
  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 +]);
  377 +
  378 +
797 379  
798   - }
  380 +// ui route 配置
  381 +
  382 +/** 线路运营概览配置route */
  383 +ScheduleApp.config([
  384 + '$stateProvider',
  385 + '$urlRouterProvider',
  386 + function($stateProvider, $urlRouterProvider) {
  387 + // 默认路由
  388 + //$urlRouterProvider.otherwise('/busConfig.html');
  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 + },
  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 + });
  414 +
  415 + }
799 416 ]);
800   -// ui route 配置
801   -
802   -/** 排班调度值勤日报配置route */
803   -ScheduleApp.config([
804   - '$stateProvider',
805   - '$urlRouterProvider',
806   - function($stateProvider, $urlRouterProvider) {
807   - // 默认路由
808   - //$urlRouterProvider.otherwise('/busConfig.html');
809   -
810   - $stateProvider
811   - .state("schedulePlanReportManage", {
812   - url: '/schedulePlanReportManage',
813   - views: {
814   - "": {
815   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/index_report.html'
816   - },
817   - "schedulePlanReportManage_list@schedulePlanReportManage": {
818   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/list_report.html'
819   - }
820   - },
821   -
822   - resolve: {
823   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
824   - return $ocLazyLoad.load({
825   - name: 'schedulePlanManage_module',
826   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
827   - files: [
828   - "assets/bower_components/angular-ui-select/dist/select.min.css",
829   - "assets/bower_components/angular-ui-select/dist/select.min.js",
830   - "pages/scheduleApp/module/core/schedulePlanManage/report/module.js"
831   - ]
832   - });
833   - }]
834   - }
835   - })
836   - .state("schedulePlanReportManage_edit", {
837   - url: '/schedulePlanReportManage_edit',
838   - params: {type: 0, groupInfo: null},
839   - views: {
840   - "": {
841   - templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/edit_report.html'
842   - }
843   - },
844   -
845   - resolve: {
846   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
847   - return $ocLazyLoad.load({
848   - name: 'schedulePlanReportManage_edit_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/schedulePlanManage/report/module.js"
854   - ]
855   - });
856   - }]
857   - }
858   - });
859   -
860   - }
  417 +// ui route 配置
  418 +
  419 +/** 人员配置模块页面route */
  420 +ScheduleApp.config([
  421 + '$stateProvider',
  422 + '$urlRouterProvider',
  423 + function($stateProvider, $urlRouterProvider) {
  424 + // 默认路由
  425 + //$urlRouterProvider.otherwise('/busConfig.html');
  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 + },
  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 + })
  509 +
  510 + }
861 511 ]);
862 512 // ui route 配置
863 513  
864   -/** 排班规则模块配置route */
  514 +/** 路牌管理配置所有模块页面route */
865 515 ScheduleApp.config([
866 516 '$stateProvider',
867 517 '$urlRouterProvider',
... ... @@ -870,87 +520,437 @@ ScheduleApp.config([
870 520 //$urlRouterProvider.otherwise('/busConfig.html');
871 521  
872 522 $stateProvider
873   - .state("scheduleRuleManage", { // index页面
874   - url: '/scheduleRuleManage',
  523 + .state("guideboardManage", { // index页面
  524 + url: '/guideboardManage',
875 525 views: {
876 526 "": {
877   - templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/index.html'
  527 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
878 528 },
879   - "scheduleRuleManage_list@scheduleRuleManage": {
880   - templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/list.html'
  529 + "guideboardManage_list@guideboardManage": {
  530 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
881 531 }
882 532 },
883 533  
884 534 resolve: {
885 535 deps: ['$ocLazyLoad', function($ocLazyLoad) {
886 536 return $ocLazyLoad.load({
887   - name: 'scheduleRuleManage_module',
  537 + name: 'guideboardManage_module',
888 538 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
889 539 files: [
890 540 "assets/bower_components/angular-ui-select/dist/select.min.css",
891 541 "assets/bower_components/angular-ui-select/dist/select.min.js",
892   - "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  542 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  543 + "pages/scheduleApp/module/core/guideboardManage/module.js"
893 544 ]
894 545 });
895 546 }]
896 547 }
897 548 })
898   - .state("scheduleRuleManage_form", { // 添加排班规则form
899   - url: '/scheduleRuleManage_form',
  549 + .state('guideboardManage_form', { // 添加路牌form
  550 + url: '/guideboardManage_form',
900 551 views: {
901   - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/form.html'}
  552 + '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/form.html'}
902 553 },
903 554 resolve: {
904 555 deps: ['$ocLazyLoad', function($ocLazyLoad) {
905 556 return $ocLazyLoad.load({
906   - name: 'scheduleRuleManage_form_module',
907   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  557 + name: 'guideboardManage_form_module',
  558 + insertBefore: '#ng_load_plugins_before',
908 559 files: [
909   - "assets/bower_components/angular-ui-select/dist/select.min.css",
910   - "assets/bower_components/angular-ui-select/dist/select.min.js",
911   - "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  560 + 'assets/bower_components/angular-ui-select/dist/select.min.css',
  561 + 'assets/bower_components/angular-ui-select/dist/select.min.js',
  562 + 'pages/scheduleApp/module/core/guideboardManage/module.js'
912 563 ]
913 564 });
914 565 }]
915 566 }
916 567 })
917   - .state("scheduleRuleManage_edit", { // 修改排班规则form
918   - url: '/scheduleRuleManage_edit/:id',
  568 + .state('guideboardManage_edit', { // 修改路牌form
  569 + url: '/guideboardManage_edit/:id',
919 570 views: {
920   - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/edit.html'}
  571 + '': {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/edit.html'}
921 572 },
922 573 resolve: {
923 574 deps: ['$ocLazyLoad', function($ocLazyLoad) {
924 575 return $ocLazyLoad.load({
925   - name: 'scheduleRuleManage_edit_module',
926   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  576 + name: 'guideboardManage_edit_module',
  577 + insertBefore: '#ng_load_plugins_before',
927 578 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/scheduleRuleManage/module.js"
  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/guideboardManage/module.js'
931 582 ]
932 583 });
933 584 }]
934 585 }
935 586 })
936   - .state("scheduleRuleManage_detail", { // 详细信息
937   - url: '/scheduleRuleManage_detail/:id',
  587 + .state("guideboardManage_detail", { // 详细信息页面
  588 + url: '/guideboardManage_detail/:id',
938 589 views: {
939   - "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/detail.html'}
  590 + "": {templateUrl: 'pages/scheduleApp/module/core/guideboardManage/detail.html'}
940 591 },
941 592 resolve: {
942 593 deps: ['$ocLazyLoad', function($ocLazyLoad) {
943 594 return $ocLazyLoad.load({
944   - name: 'scheduleRuleManage_detail_module',
  595 + name: 'guideboardManage_detail_module',
945 596 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
946 597 files: [
947   - "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  598 + "pages/scheduleApp/module/core/guideboardManage/module.js"
948 599 ]
949 600 });
950 601 }]
951 602 }
952 603 })
953   - }
  604 +
  605 +
  606 +}]);
  607 +// ui route 配置
  608 +
  609 +/** 套跑管理模块配置页面route */
  610 +ScheduleApp.config([
  611 + '$stateProvider',
  612 + '$urlRouterProvider',
  613 + function($stateProvider, $urlRouterProvider) {
  614 + // 默认路由
  615 + //$urlRouterProvider.otherwise('/busConfig.html');
  616 +
  617 + $stateProvider
  618 + .state("rerunManage", { // index页面
  619 + url: '/rerunManage',
  620 + views: {
  621 + "": {
  622 + templateUrl: 'pages/scheduleApp/module/core/rerunManage/index.html'
  623 + },
  624 + "rerunManage_list@rerunManage": {
  625 + templateUrl: 'pages/scheduleApp/module/core/rerunManage/list.html'
  626 + }
  627 + },
  628 +
  629 + resolve: {
  630 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  631 + return $ocLazyLoad.load({
  632 + name: 'rerunManage_module',
  633 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  634 + files: [
  635 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  636 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  637 + "pages/scheduleApp/module/core/rerunManage/module.js"
  638 + ]
  639 + });
  640 + }]
  641 + }
  642 + })
  643 + .state("rerunManage_form", { // 添加套跑form
  644 + url: '/rerunManage_form',
  645 + views: {
  646 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/form.html'}
  647 + },
  648 + resolve: {
  649 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  650 + return $ocLazyLoad.load({
  651 + name: 'rerunManage_form_module',
  652 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  653 + files: [
  654 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  655 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  656 + "pages/scheduleApp/module/core/rerunManage/module.js"
  657 + ]
  658 + });
  659 + }]
  660 + }
  661 + })
  662 + .state("rerunManage_edit", { // 修改套跑form
  663 + url: '/rerunManage_edit/:id',
  664 + views: {
  665 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/edit.html'}
  666 + },
  667 + resolve: {
  668 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  669 + return $ocLazyLoad.load({
  670 + name: 'rerunManage_edit_module',
  671 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  672 + files: [
  673 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  674 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  675 + "pages/scheduleApp/module/core/rerunManage/module.js"
  676 + ]
  677 + });
  678 + }]
  679 + }
  680 + })
  681 + .state("rerunManage_detail", { // 详细信息页面
  682 + url: '/rerunManage_detail/:id',
  683 + views: {
  684 + "": {templateUrl: 'pages/scheduleApp/module/core/rerunManage/detail.html'}
  685 + },
  686 + resolve: {
  687 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  688 + return $ocLazyLoad.load({
  689 + name: 'rerunManage_detail_module',
  690 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  691 + files: [
  692 + "pages/scheduleApp/module/core/rerunManage/module.js"
  693 + ]
  694 + });
  695 + }]
  696 + }
  697 + })
  698 + }
  699 +]);
  700 +// ui route 配置
  701 +
  702 +/** 排班计划管理配置route */
  703 +ScheduleApp.config([
  704 + '$stateProvider',
  705 + '$urlRouterProvider',
  706 + function($stateProvider, $urlRouterProvider) {
  707 + // 默认路由
  708 + //$urlRouterProvider.otherwise('/busConfig.html');
  709 +
  710 + $stateProvider
  711 + .state("schedulePlanManage", { // index页面
  712 + url: '/schedulePlanManage',
  713 + views: {
  714 + "": {
  715 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index.html'
  716 + },
  717 + "schedulePlanManage_list@schedulePlanManage": {
  718 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list.html'
  719 + }
  720 + },
  721 +
  722 + resolve: {
  723 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  724 + return $ocLazyLoad.load({
  725 + name: 'schedulePlanManage_module',
  726 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  727 + files: [
  728 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  729 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  730 + "pages/scheduleApp/module/core/schedulePlanManage/module.js"
  731 + ]
  732 + });
  733 + }]
  734 + }
  735 + })
  736 + .state("schedulePlanManage_form", { // 添加排班计划form
  737 + url: '/schedulePlanManage_form',
  738 + views: {
  739 + "": {
  740 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/form.html'
  741 + }
  742 + },
  743 +
  744 + resolve: {
  745 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  746 + return $ocLazyLoad.load({
  747 + name: 'schedulePlanManage_form_module',
  748 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  749 + files: [
  750 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  751 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  752 + "pages/scheduleApp/module/core/schedulePlanManage/module.js"
  753 + ]
  754 + });
  755 + }]
  756 + }
  757 + })
  758 +
  759 +
  760 + }
  761 +]);
  762 +// ui route 配置
  763 +
  764 +/** 排班计划明细配置route */
  765 +ScheduleApp.config([
  766 + '$stateProvider',
  767 + '$urlRouterProvider',
  768 + function($stateProvider, $urlRouterProvider) {
  769 + // 默认路由
  770 + //$urlRouterProvider.otherwise('/busConfig.html');
  771 +
  772 + $stateProvider
  773 + // 排班计划明细管理模块
  774 + .state("schedulePlanInfoManage", {
  775 + url: '/schedulePlanInfoManage/:spid/:xlname/:ttname/:stime/:etime',
  776 + views: {
  777 + "": {
  778 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/index_info.html'
  779 + },
  780 + "schedulePlanInfoManage_list@schedulePlanInfoManage": {
  781 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html'
  782 + }
  783 + },
  784 +
  785 + resolve: {
  786 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  787 + return $ocLazyLoad.load({
  788 + name: 'schedulePlanInfoManage_module',
  789 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  790 + files: [
  791 + "pages/scheduleApp/module/core/schedulePlanManage/info/module.js"
  792 + ]
  793 + });
  794 + }]
  795 + }
  796 + });
  797 +
  798 + }
  799 +]);
  800 +// ui route 配置
  801 +
  802 +/** 排班调度值勤日报配置route */
  803 +ScheduleApp.config([
  804 + '$stateProvider',
  805 + '$urlRouterProvider',
  806 + function($stateProvider, $urlRouterProvider) {
  807 + // 默认路由
  808 + //$urlRouterProvider.otherwise('/busConfig.html');
  809 +
  810 + $stateProvider
  811 + .state("schedulePlanReportManage", {
  812 + url: '/schedulePlanReportManage',
  813 + views: {
  814 + "": {
  815 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/index_report.html'
  816 + },
  817 + "schedulePlanReportManage_list@schedulePlanReportManage": {
  818 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/list_report.html'
  819 + }
  820 + },
  821 +
  822 + resolve: {
  823 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  824 + return $ocLazyLoad.load({
  825 + name: 'schedulePlanManage_module',
  826 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  827 + files: [
  828 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  829 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  830 + "pages/scheduleApp/module/core/schedulePlanManage/report/module.js"
  831 + ]
  832 + });
  833 + }]
  834 + }
  835 + })
  836 + .state("schedulePlanReportManage_edit", {
  837 + url: '/schedulePlanReportManage_edit',
  838 + params: {type: 0, groupInfo: null},
  839 + views: {
  840 + "": {
  841 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/edit_report.html'
  842 + }
  843 + },
  844 +
  845 + resolve: {
  846 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  847 + return $ocLazyLoad.load({
  848 + name: 'schedulePlanReportManage_edit_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/schedulePlanManage/report/module.js"
  854 + ]
  855 + });
  856 + }]
  857 + }
  858 + });
  859 +
  860 + }
  861 +]);
  862 +// ui route 配置
  863 +
  864 +/** 排班规则模块配置route */
  865 +ScheduleApp.config([
  866 + '$stateProvider',
  867 + '$urlRouterProvider',
  868 + function($stateProvider, $urlRouterProvider) {
  869 + // 默认路由
  870 + //$urlRouterProvider.otherwise('/busConfig.html');
  871 +
  872 + $stateProvider
  873 + .state("scheduleRuleManage", { // index页面
  874 + url: '/scheduleRuleManage',
  875 + views: {
  876 + "": {
  877 + templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/index.html'
  878 + },
  879 + "scheduleRuleManage_list@scheduleRuleManage": {
  880 + templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/list.html'
  881 + }
  882 + },
  883 +
  884 + resolve: {
  885 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  886 + return $ocLazyLoad.load({
  887 + name: 'scheduleRuleManage_module',
  888 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  889 + files: [
  890 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  891 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  892 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  893 + ]
  894 + });
  895 + }]
  896 + }
  897 + })
  898 + .state("scheduleRuleManage_form", { // 添加排班规则form
  899 + url: '/scheduleRuleManage_form',
  900 + views: {
  901 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/form.html'}
  902 + },
  903 + resolve: {
  904 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  905 + return $ocLazyLoad.load({
  906 + name: 'scheduleRuleManage_form_module',
  907 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  908 + files: [
  909 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  910 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  911 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  912 + ]
  913 + });
  914 + }]
  915 + }
  916 + })
  917 + .state("scheduleRuleManage_edit", { // 修改排班规则form
  918 + url: '/scheduleRuleManage_edit/:id',
  919 + views: {
  920 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/edit.html'}
  921 + },
  922 + resolve: {
  923 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  924 + return $ocLazyLoad.load({
  925 + name: 'scheduleRuleManage_edit_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/scheduleRuleManage/module.js"
  931 + ]
  932 + });
  933 + }]
  934 + }
  935 + })
  936 + .state("scheduleRuleManage_detail", { // 详细信息
  937 + url: '/scheduleRuleManage_detail/:id',
  938 + views: {
  939 + "": {templateUrl: 'pages/scheduleApp/module/core/scheduleRuleManage/detail.html'}
  940 + },
  941 + resolve: {
  942 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  943 + return $ocLazyLoad.load({
  944 + name: 'scheduleRuleManage_detail_module',
  945 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  946 + files: [
  947 + "pages/scheduleApp/module/core/scheduleRuleManage/module.js"
  948 + ]
  949 + });
  950 + }]
  951 + }
  952 + })
  953 + }
954 954 ]);
955 955 // ui route 配置
956 956  
... ... @@ -1064,73 +1064,73 @@ ScheduleApp.config([
1064 1064  
1065 1065 }
1066 1066 ]);
1067   -// ui route 配置
1068   -
1069   -/** 时刻表编辑管理配置route */
1070   -ScheduleApp.config([
1071   - '$stateProvider',
1072   - '$urlRouterProvider',
1073   - function($stateProvider, $urlRouterProvider) {
1074   - // 默认路由
1075   - //$urlRouterProvider.otherwise('/busConfig.html');
1076   -
1077   - $stateProvider
1078   - .state("ttInfoDetailManage_form", { // 时刻表明细导入
1079   - url: '/ttInfoDetailManage_form/:xlid/:ttid/:xlname/:ttname',
1080   - views: {
1081   - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/form.html'}
1082   - },
1083   - resolve: {
1084   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
1085   - return $ocLazyLoad.load({
1086   - name: 'ttInfoDetailManage_form_module',
1087   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
1088   - files: [
1089   - "assets/bower_components/angular-ui-select/dist/select.min.css",
1090   - "assets/bower_components/angular-ui-select/dist/select.min.js",
1091   - "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
1092   - "pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js"
1093   - ]
1094   - });
1095   - }]
1096   - }
1097   - })
1098   - .state("ttInfoDetailManage_edit", { // 时刻表详细信息编辑
1099   - url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname',
1100   - views: {
1101   - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit.html'}
1102   - },
1103   - resolve: {
1104   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
1105   - return $ocLazyLoad.load({
1106   - name: 'ttInfoDetailManage_edit_module',
1107   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
1108   - files: [
1109   - "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
1110   - ]
1111   - });
1112   - }]
1113   - }
1114   - })
1115   - .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
1116   - url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',
1117   - views: {
1118   - "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
1119   - },
1120   - resolve: {
1121   - deps: ['$ocLazyLoad', function($ocLazyLoad) {
1122   - return $ocLazyLoad.load({
1123   - name: 'ttInfoDetailManage_detail_edit_module',
1124   - insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
1125   - files: [
1126   - "assets/bower_components/angular-ui-select/dist/select.min.css",
1127   - "assets/bower_components/angular-ui-select/dist/select.min.js",
1128   - "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
1129   - ]
1130   - });
1131   - }]
1132   - }
1133   - });
1134   -
1135   - }
  1067 +// ui route 配置
  1068 +
  1069 +/** 时刻表编辑管理配置route */
  1070 +ScheduleApp.config([
  1071 + '$stateProvider',
  1072 + '$urlRouterProvider',
  1073 + function($stateProvider, $urlRouterProvider) {
  1074 + // 默认路由
  1075 + //$urlRouterProvider.otherwise('/busConfig.html');
  1076 +
  1077 + $stateProvider
  1078 + .state("ttInfoDetailManage_form", { // 时刻表明细导入
  1079 + url: '/ttInfoDetailManage_form/:xlid/:ttid/:xlname/:ttname',
  1080 + views: {
  1081 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/form.html'}
  1082 + },
  1083 + resolve: {
  1084 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1085 + return $ocLazyLoad.load({
  1086 + name: 'ttInfoDetailManage_form_module',
  1087 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1088 + files: [
  1089 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1090 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1091 + "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
  1092 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/module.js"
  1093 + ]
  1094 + });
  1095 + }]
  1096 + }
  1097 + })
  1098 + .state("ttInfoDetailManage_edit", { // 时刻表详细信息编辑
  1099 + url: '/ttInfoDetailManage_edit/:xlid/:ttid/:xlname/:ttname',
  1100 + views: {
  1101 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit.html'}
  1102 + },
  1103 + resolve: {
  1104 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1105 + return $ocLazyLoad.load({
  1106 + name: 'ttInfoDetailManage_edit_module',
  1107 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1108 + files: [
  1109 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
  1110 + ]
  1111 + });
  1112 + }]
  1113 + }
  1114 + })
  1115 + .state("ttInfoDetailManage_detail_edit", { // 时刻表详细信息单元格编辑
  1116 + url: '/ttInfoDetailManage_detail_edit/:id/:xlid/:ttid/:xlname/:ttname',
  1117 + views: {
  1118 + "": {templateUrl: 'pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html'}
  1119 + },
  1120 + resolve: {
  1121 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  1122 + return $ocLazyLoad.load({
  1123 + name: 'ttInfoDetailManage_detail_edit_module',
  1124 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  1125 + files: [
  1126 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  1127 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  1128 + "pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js"
  1129 + ]
  1130 + });
  1131 + }]
  1132 + }
  1133 + });
  1134 +
  1135 + }
1136 1136 ]);
1137 1137 \ No newline at end of file
... ...