潘钊 / bsth_control · Commits

Commit aceb99b284f2688070f510f643e8c28184b8e7a7

Authored by 徐烜
1 parent 74427bb0
build: skipped

update

Inline Side-by-side
Showing 15 changed files with 479 additions and 124 deletions
src/main/java/com/bsth/entity/Cars.java
  View file @aceb99b
1 package com.bsth.entity; 1 package com.bsth.entity;
2 2
  3 +import javax.persistence.*;
3 import java.util.Date; 4 import java.util.Date;
4 5
5 -import javax.persistence.Column;  
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.GenerationType;  
9 -import javax.persistence.Id;  
10 -import javax.persistence.OneToOne;  
11 -import javax.persistence.Table;  
12 -  
13 /** 6 /**
14 * 7 *
15 * @ClassName : Cars(车实体类) 8 * @ClassName : Cars(车实体类)
@@ -28,121 +21,110 @@ import javax.persistence.Table; @@ -28,121 +21,110 @@ import javax.persistence.Table;
28 @Table(name = "bsth_c_cars") 21 @Table(name = "bsth_c_cars")
29 public class Cars { 22 public class Cars {
30 23
31 - // ID 24 + /** 主键Id */
32 @Id 25 @Id
33 - @GeneratedValue(strategy = GenerationType.IDENTITY) 26 + @GeneratedValue
34 private Integer id; 27 private Integer id;
35 -  
36 - // 车辆编码 28 +
  29 + /** 自编号/内部编号 */
  30 + @Column(nullable = false, length = 8)
  31 + private String insideCode;
  32 +
  33 + // 公司、分公司暂时不用关联实体
  34 + /** 公司代码 */
  35 + @Column(nullable = false)
  36 + private String businessCode;
  37 + /** 公司名称 */
  38 + @Column(nullable = false)
  39 + private String company;
  40 + /** 分公司编码 */
  41 + private String brancheCompanyCode;
  42 + /** 分公司 */
  43 + private String brancheCompany;
  44 +
  45 + /** 车辆编码 */
  46 + @Column(nullable = false)
37 private String carCode; 47 private String carCode;
38 -  
39 - // 车牌号 48 + /** 车牌号 */
  49 + @Column(nullable = false)
40 private String carPlate; 50 private String carPlate;
41 -  
42 - // 内部编码  
43 - private String insideCode;  
44 -  
45 - // 车型类别 51 + /** 供应商名称 */
  52 + @Column(nullable = false)
  53 + private String supplierName;
  54 + /** 设备终端号 */
  55 + @Column(nullable = false)
  56 + private String equipmentCode;
  57 +
  58 + // 以下信息来自总公司的业务系统，可能需要调用相关接口
  59 + /** 车型类别 */
46 private String carClass ; 60 private String carClass ;
47 -  
48 - // 座位数 61 + /** 技术速度 */
  62 + private Double speed;
  63 + /** 座位数 */
49 private Integer carSeatnNumber; 64 private Integer carSeatnNumber;
50 -  
51 - // 载客标准 65 + /** 载客标准 */
52 private String carStandard; 66 private String carStandard;
53 -  
54 - // 技术速度  
55 - private Double speed;  
56 -  
57 - // 是否空调车 67 + /** 标准油耗(开空调) */
  68 + private Double kburnStandard;
  69 + /** 标准油耗(关空调) */
  70 + private Double gburnStandard;
  71 + /** 报废号 */
  72 + private String scrapCode;
  73 + /** 报废日期 */
  74 + private Date scrapDate;
  75 + /** 厂牌型号1 */
  76 + private String makeCodeOne;
  77 + /** 厂牌型号2 */
  78 + private String makeCodeTwo;
  79 + /** 车辆等级标准 */
  80 + private String carGride;
  81 + /** 出厂排放标准 */
  82 + private String emissionsStandard;
  83 + /** 发动机号码1 */
  84 + private String engineCodeOne;
  85 + /** 发动机号码2 */
  86 + private String engineCodeTwo;
  87 + /** 车架号码1 */
  88 + private String carNumberOne;
  89 + /** 车架号码2 */
  90 + private String carNumberTwo;
  91 + /** 启用日期（2008-10-10）*/
  92 + private Date openDate;
  93 + /** 取消日期 */
  94 + private Date closeDate;
  95 +
  96 + /** 是否空调车 */
58 private boolean hvacCar; 97 private boolean hvacCar;
59 -  
60 - // 标准油耗(开空调)  
61 - private Double kburnStandard;  
62 -  
63 - // 标准油耗(关空调)  
64 - private Double gburnStandard;  
65 -  
66 - // 有无人售票 98 + /** 有无人售票 */
67 private boolean ticketType; 99 private boolean ticketType;
68 -  
69 - // 是否有TV视频 100 + /** 是否有LED服务屏 */
  101 + private boolean ledScreen;
  102 + /** 是否有TV视频 */
70 private boolean tvVideoType; 103 private boolean tvVideoType;
71 -  
72 - // 是否有LED服务屏  
73 - private boolean ledScreen;  
74 -  
75 - // 设备编号  
76 - private String equipmentCode;  
77 -  
78 - // 厂牌型号1  
79 - private String makeCodeOne;  
80 -  
81 - // 厂牌型号2  
82 - private String makeCodeTwo;  
83 -  
84 - // 车辆等级标准  
85 - private String carGride;  
86 -  
87 - // 出厂排放标准  
88 - private String emissionsStandard;  
89 -  
90 - // 发动机号码1  
91 - private String engineCodeOne;  
92 -  
93 - // 发动机号码2  
94 - private String engineCodeTwo;  
95 -  
96 - // 车架号码1  
97 - private String carNumberOne;  
98 -  
99 - // 车架号码2  
100 - private String carNumberTwo;  
101 -  
102 - // 车辆类型 104 +
  105 + /** 车辆类型 */
103 private String carType; 106 private String carType;
104 -  
105 - // 企业代码  
106 - private String businessCode;  
107 -  
108 - // 所属公司  
109 - private String company; 107 + /** 是否机动车（机动车类型选择）*/
  108 + private String VehicleStats;
  109 + /** 营运状态 */
  110 + private Integer operatorsState;
  111 + /** 是否电车 */
  112 + private boolean sfdc;
  113 + /** 备注/描述 */
  114 + private String descriptions;
  115 +
110 116
111 - // 分公司  
112 - private String brancheCompany;  
113 117
114 // 车辆序号 118 // 车辆序号
115 private String carOrdinal; 119 private String carOrdinal;
116 -  
117 - // 是否机动车  
118 - private String VehicleStats;  
119 -  
120 // 视频编号 120 // 视频编号
121 private String videoCode; 121 private String videoCode;
122 -  
123 - // 营运状态  
124 - private Integer operatorsState;  
125 -  
126 - // 启用日期（2008-10-10）  
127 - private Date openDate;  
128 -  
129 - // 取消日期  
130 - private Date closeDate;  
131 -  
132 // 是否报废 122 // 是否报废
133 private boolean scrapState; 123 private boolean scrapState;
134 -  
135 - // 报废号  
136 - private String scrapCode;  
137 -  
138 - // 报废日期  
139 - private Date scrapDate;  
140 -  
141 // 是否切换 124 // 是否切换
142 private Integer isSwitch; 125 private Integer isSwitch;
143 126
144 - // 描述  
145 - private String descriptions; 127 +
146 128
147 // 创建人 129 // 创建人
148 private Integer createBy; 130 private Integer createBy;
@@ -505,4 +487,28 @@ public class Cars { @@ -505,4 +487,28 @@ public class Cars {
505 public void setLineid(Line lineid) { 487 public void setLineid(Line lineid) {
506 this.lineid = lineid; 488 this.lineid = lineid;
507 } 489 }
  490 +
  491 + public String getBrancheCompanyCode() {
  492 + return brancheCompanyCode;
  493 + }
  494 +
  495 + public void setBrancheCompanyCode(String brancheCompanyCode) {
  496 + this.brancheCompanyCode = brancheCompanyCode;
  497 + }
  498 +
  499 + public String getSupplierName() {
  500 + return supplierName;
  501 + }
  502 +
  503 + public void setSupplierName(String supplierName) {
  504 + this.supplierName = supplierName;
  505 + }
  506 +
  507 + public boolean isSfdc() {
  508 + return sfdc;
  509 + }
  510 +
  511 + public void setSfdc(boolean sfdc) {
  512 + this.sfdc = sfdc;
  513 + }
508 } 514 }
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
  View file @aceb99b
1 package com.bsth.entity.schedule; 1 package com.bsth.entity.schedule;
2 2
3 -import com.bsth.entity.Cars; 3 +import com.bsth.entity.Bus;
4 import com.bsth.entity.Line; 4 import com.bsth.entity.Line;
5 5
6 import javax.persistence.*; 6 import javax.persistence.*;
@@ -25,7 +25,7 @@ public class CarConfigInfo { @@ -25,7 +25,7 @@ public class CarConfigInfo {
25 private Line xl; 25 private Line xl;
26 /** 车辆关联 */ 26 /** 车辆关联 */
27 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY) 27 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
28 - private Cars cl; 28 + private Bus cl;
29 29
30 30
31 /** 早班时间（格式：HH:mm） */ 31 /** 早班时间（格式：HH:mm） */
@@ -67,11 +67,11 @@ public class CarConfigInfo { @@ -67,11 +67,11 @@ public class CarConfigInfo {
67 this.xl = xl; 67 this.xl = xl;
68 } 68 }
69 69
70 - public Cars getCl() { 70 + public Bus getCl() {
71 return cl; 71 return cl;
72 } 72 }
73 73
74 - public void setCl(Cars cl) { 74 + public void setCl(Bus cl) {
75 this.cl = cl; 75 this.cl = cl;
76 } 76 }
77 77
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
  View file @aceb99b
1 package com.bsth.entity.schedule; 1 package com.bsth.entity.schedule;
2 2
3 -import com.bsth.entity.Cars; 3 +import com.bsth.entity.Bus;
4 import com.bsth.entity.Line; 4 import com.bsth.entity.Line;
5 import com.bsth.entity.Personnel; 5 import com.bsth.entity.Personnel;
6 6
@@ -24,7 +24,7 @@ public class EmployeeConfigInfo { @@ -24,7 +24,7 @@ public class EmployeeConfigInfo {
24 private Line xl; 24 private Line xl;
25 /** 车辆关联 */ 25 /** 车辆关联 */
26 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY) 26 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
27 - private Cars cl; 27 + private Bus cl;
28 /** 人员关联（驾驶员） */ 28 /** 人员关联（驾驶员） */
29 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY) 29 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
30 private Personnel jsy; 30 private Personnel jsy;
@@ -58,11 +58,11 @@ public class EmployeeConfigInfo { @@ -58,11 +58,11 @@ public class EmployeeConfigInfo {
58 this.xl = xl; 58 this.xl = xl;
59 } 59 }
60 60
61 - public Cars getCl() { 61 + public Bus getCl() {
62 return cl; 62 return cl;
63 } 63 }
64 64
65 - public void setCl(Cars cl) { 65 + public void setCl(Bus cl) {
66 this.cl = cl; 66 this.cl = cl;
67 } 67 }
68 68
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1.java
  View file @aceb99b
1 package com.bsth.entity.schedule.rule; 1 package com.bsth.entity.schedule.rule;
2 2
3 -import com.bsth.entity.Cars; 3 +import com.bsth.entity.Bus;
4 import com.bsth.entity.Line; 4 import com.bsth.entity.Line;
5 import com.bsth.entity.Personnel; 5 import com.bsth.entity.Personnel;
6 import com.bsth.entity.schedule.GuideboardInfo; 6 import com.bsth.entity.schedule.GuideboardInfo;
@@ -30,7 +30,7 @@ public class ScheduleRule1 { @@ -30,7 +30,7 @@ public class ScheduleRule1 {
30 private Line xl; 30 private Line xl;
31 /** 关联车辆 */ 31 /** 关联车辆 */
32 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY) 32 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
33 - private Cars cl; 33 + private Bus cl;
34 /** 启用日期 */ 34 /** 启用日期 */
35 private Date qyrq; 35 private Date qyrq;
36 36
@@ -89,11 +89,11 @@ public class ScheduleRule1 { @@ -89,11 +89,11 @@ public class ScheduleRule1 {
89 this.xl = xl; 89 this.xl = xl;
90 } 90 }
91 91
92 - public Cars getCl() { 92 + public Bus getCl() {
93 return cl; 93 return cl;
94 } 94 }
95 95
96 - public void setCl(Cars cl) { 96 + public void setCl(Bus cl) {
97 this.cl = cl; 97 this.cl = cl;
98 } 98 }
99 99
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/detail.html 0 → 100644
  View file @aceb99b
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js 0 → 100644
  View file @aceb99b
  1 +// 人员配置管理 service controller 等写在一起
  2 +
  3 +angular.module('ScheduleApp').factory('EmployeeConfigService', ['$resource', function($resource) {
  4 + // TODO：测试
  5 + return $resource(
  6 + '/cci',
  7 + {},
  8 + {
  9 + list: {
  10 + method: 'GET'
  11 + }
  12 + }
  13 + );
  14 +}]);
  15 +
  16 +angular.module('ScheduleApp').controller('EmployeeConfigCtrl', ['EmployeeConfigService', function(employeeConfigService) {
  17 +
  18 +}]);
  19 +
  20 +angular.module('ScheduleApp').controller('EmployeeConfigListCtrl', ['EmployeeConfigService', function(employeeConfigService) {
  21 + // TODO：模拟数据
  22 + var self = this;
  23 + self.totalItems = 64;
  24 + self.currentPage = 4;
  25 + self.infos = {};
  26 + self.pageChanaged = function() {
  27 + console.log("页面跳转到：" + currentPage.currentPage);
  28 + }
  29 +}]);
  30 +
  31 +angular.module('ScheduleApp').controller('EmployeeConfigFormCtrl', ['EmployeeConfigService', function(employeeConfigService) {
  32 +
  33 +}]);
  34 +
  35 +angular.module('ScheduleApp').controller('EmployeeConfigDetailCtrl', ['EmployeeConfigService', function(employeeConfigService) {
  36 +
  37 +}]);
  38 +
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html 0 → 100644
  View file @aceb99b
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html 0 → 100644
  View file @aceb99b
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>人员配置</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">运营计划管理</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">人员配置</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="EmployeeConfigCtrl as ctrl">
  23 + <div class="portlet light bordered">
  24 + <div class="portlet-title">
  25 + <div class="caption font-dark">
  26 + <i class="fa fa-database font-dark"></i>
  27 + <span class="caption-subject bold uppercase">配置表</span>
  28 + </div>
  29 + <div class="actions">
  30 + <a href="javascirpt:" class="btn btn-circle blue">
  31 + <i class="fa fa-plus"></i>
  32 + 添加配置
  33 + </a>
  34 +
  35 + <div class="btn-group">
  36 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  37 + <i class="fa fa-share"></i>
  38 + <span>系统工具</span>
  39 + <i class="fa fa-angle-down"></i>
  40 + </a>
  41 + <ul class="dropdown-menu pull-right">
  42 + <li>
  43 + <a href="javascript:" class="tool-action">
  44 + <i class="fa fa-file-excel-o"></i>
  45 + 导出excel
  46 + </a>
  47 + </li>
  48 + <li class="divider"></li>
  49 + <li>
  50 + <a href="javascript:" class="tool-action">
  51 + <i class="fa fa-refresh"></i>
  52 + 刷行数据
  53 + </a>
  54 + </li>
  55 + </ul>
  56 + </div>
  57 + </div>
  58 + </div>
  59 +
  60 + <div class="portlet-body">
  61 + <div ui-view="list"></div>
  62 + </div>
  63 + </div>
  64 + </div>
  65 +</div>
0 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html 0 → 100644
  View file @aceb99b
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="EmployeeConfigListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr>
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th>序号</th>
  10 + <th>线路</th>
  11 + <th>搭班编码</th>
  12 + <th>驾驶员工号</th>
  13 + <th>驾驶员</th>
  14 + <th>售票员工号</th>
  15 + <th>售票员</th>
  16 + <th>车辆内部编号</th>
  17 + <th>操作</th>
  18 + </tr>
  19 + </thead>
  20 + <tbody>
  21 + <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
  22 + <td>
  23 + <input type="checkbox"/>
  24 + </td>
  25 + <td>
  26 + <span>TODO</span>
  27 + </td>
  28 + <td>
  29 + <span ng-bind="info.xl.name"></span>
  30 + </td>
  31 + <td>
  32 + <span ng-bind="info.dbbm"></span>
  33 + </td>
  34 + <td>
  35 + <span ng-bind="info.jsy.jobCode"></span>
  36 + </td>
  37 + <td>
  38 + <span ng-bind="info.jsy.personnelName"></span>
  39 + </td>
  40 + <td>
  41 + <span ng-bind="info.spy.jobCode"></span>
  42 + </td>
  43 + <td>
  44 + <span ng-bind="info.spy.personnelName"></span>
  45 + </td>
  46 + <td>
  47 + <span ng-bind="info.cl.insideCode"></span>
  48 + </td>
  49 + <td>
  50 + <span>TODO</span>
  51 + </td>
  52 + </tr>
  53 + </tbody>
  54 + </table>
  55 +
  56 + <div style="text-align: right;">
  57 + <uib-pagination total-items="ctrl.totalItems"
  58 + ng-model="ctrl.currentPage"
  59 + ng-change="ctrl.pageChanged()"
  60 + previous-text="上一页"
  61 + next-text="下一页">
  62 + </uib-pagination>
  63 + </div>
  64 +</div>
0 \ No newline at end of file 65 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/detail.html 0 → 100644
  View file @aceb99b
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/form.html 0 → 100644
  View file @aceb99b
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/guideboardManage.js 0 → 100644
  View file @aceb99b
  1 +// 路牌管理 service controller 等写在一起
  2 +
  3 +angular.module('ScheduleApp').factory('GuideboardManageService', ['$resource', function($resource) {
  4 + // TODO：测试
  5 + return $resource(
  6 + '/cci',
  7 + {},
  8 + {
  9 + list: {
  10 + method: 'GET'
  11 + }
  12 + }
  13 + );
  14 +}]);
  15 +
  16 +angular.module('ScheduleApp').controller('GuideboardManageCtrl', ['GuideboardManageService', function(guideboardManageService) {
  17 +
  18 +}]);
  19 +
  20 +angular.module('ScheduleApp').controller('GuideboardManageListCtrl', ['GuideboardManageService', function(guideboardManageService) {
  21 + // TODO：模拟数据
  22 + var self = this;
  23 + self.totalItems = 64;
  24 + self.currentPage = 4;
  25 + self.infos = {};
  26 + self.pageChanaged = function() {
  27 + console.log("页面跳转到：" + currentPage.currentPage);
  28 + }
  29 +}]);
  30 +
  31 +angular.module('ScheduleApp').controller('GuideboardManageFormCtrl', ['GuideboardManageService', function(guideboardManageService) {
  32 +
  33 +}]);
  34 +
  35 +angular.module('ScheduleApp').controller('GuideboardManageDetailCtrl', ['GuideboardManageService', function(guideboardManageService) {
  36 +
  37 +}]);
  38 +
  39 +
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html 0 → 100644
  View file @aceb99b
  1 +<div class="page-head">
  2 + <div class="page-title">
  3 + <h1>路牌管理</h1>
  4 + </div>
  5 +</div>
  6 +
  7 +<ul class="page-breadcrumb breadcrumb">
  8 + <li>
  9 + <a href="/pages/home.html" data-pjax>首页</a>
  10 + <i class="fa fa-circle"></i>
  11 + </li>
  12 + <li>
  13 + <span class="active">运营计划管理</span>
  14 + <i class="fa fa-circle"></i>
  15 + </li>
  16 + <li>
  17 + <span class="active">路牌管理</span>
  18 + </li>
  19 +</ul>
  20 +
  21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="GuideboardManageCtrl as ctrl">
  23 + <div class="portlet light bordered">
  24 + <div class="portlet-title">
  25 + <div class="caption font-dark">
  26 + <i class="fa fa-database font-dark"></i>
  27 + <span class="caption-subject bold uppercase">路牌表</span>
  28 + </div>
  29 + <div class="actions">
  30 + <a href="javascirpt:" class="btn btn-circle blue">
  31 + <i class="fa fa-plus"></i>
  32 + 添加路牌
  33 + </a>
  34 +
  35 + <div class="btn-group">
  36 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  37 + <i class="fa fa-share"></i>
  38 + <span>系统工具</span>
  39 + <i class="fa fa-angle-down"></i>
  40 + </a>
  41 + <ul class="dropdown-menu pull-right">
  42 + <li>
  43 + <a href="javascript:" class="tool-action">
  44 + <i class="fa fa-file-excel-o"></i>
  45 + 导出excel
  46 + </a>
  47 + </li>
  48 + <li class="divider"></li>
  49 + <li>
  50 + <a href="javascript:" class="tool-action">
  51 + <i class="fa fa-refresh"></i>
  52 + 刷行数据
  53 + </a>
  54 + </li>
  55 + </ul>
  56 + </div>
  57 + </div>
  58 + </div>
  59 +
  60 + <div class="portlet-body">
  61 + <div ui-view="list"></div>
  62 + </div>
  63 + </div>
  64 + </div>
  65 +</div>
0 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html 0 → 100644
  View file @aceb99b
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="GuideboardManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr>
  6 + <th>
  7 + <input type="checkbox" class="group-checkable"/>
  8 + </th>
  9 + <th>序号</th>
  10 + <th>线路</th>
  11 + <th>路牌编号</th>
  12 + <th>路牌名称</th>
  13 + <th>路牌类型</th>
  14 + </tr>
  15 + </thead>
  16 + <tbody>
  17 + <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
  18 + <td>
  19 + <input type="checkbox"/>
  20 + </td>
  21 + <td>
  22 + <span>TODO</span>
  23 + </td>
  24 + <td>
  25 + <span ng-bind="info.xl.name"></span>
  26 + </td>
  27 + <td>
  28 + <span ng-bind="info.lpNo"></span>
  29 + </td>
  30 + <td>
  31 + <span ng-bind="info.lpName"></span>
  32 + </td>
  33 + <td>
  34 + <span ng-bind="info.lpType"></span>
  35 + </td>
  36 + </tr>
  37 + </tbody>
  38 + </table>
  39 +
  40 + <div style="text-align: right;">
  41 + <uib-pagination total-items="ctrl.totalItems"
  42 + ng-model="ctrl.currentPage"
  43 + ng-change="ctrl.pageChanged()"
  44 + previous-text="上一页"
  45 + next-text="下一页">
  46 + </uib-pagination>
  47 + </div>
  48 +</div>
0 \ No newline at end of file 49 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @aceb99b
@@ -183,7 +183,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -183,7 +183,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
183 resolve: { 183 resolve: {
184 deps: ['$ocLazyLoad', function($ocLazyLoad) { 184 deps: ['$ocLazyLoad', function($ocLazyLoad) {
185 return $ocLazyLoad.load({ 185 return $ocLazyLoad.load({
186 - name: 'deviceInfoManage_module', 186 + name: 'busConfig_module',
187 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 187 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
188 files: [ 188 files: [
189 "pages/scheduleApp/module/core/busConfig/busConfig.js" 189 "pages/scheduleApp/module/core/busConfig/busConfig.js"
@@ -192,25 +192,55 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -192,25 +192,55 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
192 }] 192 }]
193 } 193 }
194 }) 194 })
195 - // 路牌管理  
196 - .state('guideboardManage', {  
197 - url: '/guideboardManage.html',  
198 - templateUrl: 'pages/scheduleApp/module/core/guideboardManage/guideboardManage2.html',  
199 - data: {},  
200 - controller: 'guideboardManageCtrl', 195 +
  196 + // 人员配置模块
  197 + .state("employeeConfig", {
  198 + url: '/employeeConfig',
  199 + views: {
  200 + "": {
  201 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/index.html'
  202 + },
  203 + "list@employeeConfig": {
  204 + templateUrl: 'pages/scheduleApp/module/core/employeeConfig/list.html'
  205 + }
  206 + },
  207 +
201 resolve: { 208 resolve: {
202 deps: ['$ocLazyLoad', function($ocLazyLoad) { 209 deps: ['$ocLazyLoad', function($ocLazyLoad) {
203 return $ocLazyLoad.load({ 210 return $ocLazyLoad.load({
204 - name: 'guideboardManage.html', 211 + name: 'employeeConfig_module',
205 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 212 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
206 files: [ 213 files: [
207 - 'pages/scheduleApp/module/core/guideboardManage/service2.js',  
208 - 'pages/scheduleApp/module/core/guideboardManage/controller2.js' 214 + "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"
209 ] 215 ]
210 }); 216 });
211 }] 217 }]
212 } 218 }
213 - }); 219 + })
  220 + // 路牌管理模块
  221 + .state("guideboardManage", {
  222 + url: '/guideboardManage',
  223 + views: {
  224 + "": {
  225 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
  226 + },
  227 + "list@guideboardManage": {
  228 + templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
  229 + }
  230 + },
  231 +
  232 + resolve: {
  233 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  234 + return $ocLazyLoad.load({
  235 + name: 'guideboardManage_module',
  236 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  237 + files: [
  238 + "pages/scheduleApp/module/core/guideboardManage/guideboardManage.js"
  239 + ]
  240 + });
  241 + }]
  242 + }
  243 + })
214 }]); 244 }]);
215 245
216 246