潘钊 / bsth_control · Commits

Commit 74427bb07ecf90ffc56404068200ee7791243f79

Authored by 徐烜
1 parent 815bc779
build: skipped

update

Inline Side-by-side
Showing 10 changed files with 322 additions and 113 deletions
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
  View file @74427bb
@@ -27,6 +27,14 @@ public class CarConfigInfo { @@ -27,6 +27,14 @@ public class CarConfigInfo {
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 Cars cl;
29 29
  30 +
  31 + /** 早班时间（格式：HH:mm） */
  32 + @Column(length = 5)
  33 + private String zbsj;
  34 + /** 末班时间（格式：HH:mm） */
  35 + @Column(length = 5)
  36 + private String mbsj;
  37 +
30 /** 启用日期 */ 38 /** 启用日期 */
31 private Date qyrq; 39 private Date qyrq;
32 /** 终止日期 */ 40 /** 终止日期 */
@@ -111,6 +119,22 @@ public class CarConfigInfo { @@ -111,6 +119,22 @@ public class CarConfigInfo {
111 return updateDate; 119 return updateDate;
112 } 120 }
113 121
  122 + public String getZbsj() {
  123 + return zbsj;
  124 + }
  125 +
  126 + public void setZbsj(String zbsj) {
  127 + this.zbsj = zbsj;
  128 + }
  129 +
  130 + public String getMbsj() {
  131 + return mbsj;
  132 + }
  133 +
  134 + public void setMbsj(String mbsj) {
  135 + this.mbsj = mbsj;
  136 + }
  137 +
114 public void setUpdateDate(Date updateDate) { 138 public void setUpdateDate(Date updateDate) {
115 this.updateDate = updateDate; 139 this.updateDate = updateDate;
116 } 140 }
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/index.html
  View file @74427bb
@@ -18,45 +18,48 @@ @@ -18,45 +18,48 @@
18 </li> 18 </li>
19 </ul> 19 </ul>
20 20
21 -<div class="col-md-12" ng-controller="BusInfoManageCtrl as ctrl">  
22 - <div class="portlet light bordered">  
23 - <div class="portlet-title">  
24 - <div class="caption font-dark">  
25 - <i class="fa fa-database font-dark"></i>  
26 - <span class="caption-subject bold uppercase">车辆信息表</span>  
27 - </div>  
28 - <div class="actions">  
29 - <a href="javascirpt:" class="btn btn-circle blue">  
30 - <i class="fa fa-plus"></i>  
31 - 添加车辆信息  
32 - </a>  
33 - <div class="btn-group">  
34 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
35 - <i class="fa fa-share"></i>  
36 - <span>系统工具</span>  
37 - <i class="fa fa-angle-down"></i> 21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="BusInfoManageCtrl 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 + 添加车辆信息
38 </a> 33 </a>
39 - <ul class="dropdown-menu pull-right">  
40 - <li>  
41 - <a href="javascript:" class="tool-action">  
42 - <i class="fa fa-file-excel-o"></i>  
43 - 导出excel  
44 - </a>  
45 - </li>  
46 - <li class="divider"></li>  
47 - <li>  
48 - <a href="javascript:" class="tool-action">  
49 - <i class="fa fa-refresh"></i>  
50 - 刷行数据  
51 - </a>  
52 - </li>  
53 - </ul> 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>
54 </div> 57 </div>
55 </div> 58 </div>
56 - </div>  
57 59
58 - <div class="portlet-body">  
59 - <div ui-view="list"></div> 60 + <div class="portlet-body">
  61 + <div ui-view="list"></div>
  62 + </div>
60 </div> 63 </div>
61 </div> 64 </div>
62 </div> 65 </div>
63 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html
  View file @74427bb
@@ -18,45 +18,48 @@ @@ -18,45 +18,48 @@
18 </li> 18 </li>
19 </ul> 19 </ul>
20 20
21 -<div class="col-md-12" ng-controller="DeviceInfoManageCtrl as ctrl">  
22 - <div class="portlet light bordered">  
23 - <div class="portlet-title">  
24 - <div class="caption font-dark">  
25 - <i class="fa fa-database font-dark"></i>  
26 - <span class="caption-subject bold uppercase">设备信息表</span>  
27 - </div>  
28 - <div class="actions">  
29 - <a href="javascirpt:" class="btn btn-circle blue">  
30 - <i class="fa fa-plus"></i>  
31 - 添加设备信息  
32 - </a>  
33 - <div class="btn-group">  
34 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
35 - <i class="fa fa-share"></i>  
36 - <span>系统工具</span>  
37 - <i class="fa fa-angle-down"></i> 21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="DeviceInfoManageCtrl 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 + 添加设备信息
38 </a> 33 </a>
39 - <ul class="dropdown-menu pull-right">  
40 - <li>  
41 - <a href="javascript:" class="tool-action">  
42 - <i class="fa fa-file-excel-o"></i>  
43 - 导出excel  
44 - </a>  
45 - </li>  
46 - <li class="divider"></li>  
47 - <li>  
48 - <a href="javascript:" class="tool-action">  
49 - <i class="fa fa-refresh"></i>  
50 - 刷行数据  
51 - </a>  
52 - </li>  
53 - </ul> 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>
54 </div> 57 </div>
55 </div> 58 </div>
56 - </div>  
57 59
58 - <div class="portlet-body">  
59 - <div ui-view="list"></div> 60 + <div class="portlet-body">
  61 + <div ui-view="list"></div>
  62 + </div>
60 </div> 63 </div>
61 </div> 64 </div>
62 </div> 65 </div>
63 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
  View file @74427bb
@@ -18,45 +18,48 @@ @@ -18,45 +18,48 @@
18 </li> 18 </li>
19 </ul> 19 </ul>
20 20
21 -<div class="col-md-12" ng-controller="EmployeeInfoManageCtrl as ctrl">  
22 - <div class="portlet light bordered">  
23 - <div class="portlet-title">  
24 - <div class="caption font-dark">  
25 - <i class="fa fa-database font-dark"></i>  
26 - <span class="caption-subject bold uppercase">人员信息表</span>  
27 - </div>  
28 - <div class="actions">  
29 - <a href="javascirpt:" class="btn btn-circle blue">  
30 - <i class="fa fa-plus"></i>  
31 - 添加人员信息  
32 - </a>  
33 - <div class="btn-group">  
34 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
35 - <i class="fa fa-share"></i>  
36 - <span>系统工具</span>  
37 - <i class="fa fa-angle-down"></i> 21 +<div class="row">
  22 + <div class="col-md-12" ng-controller="EmployeeInfoManageCtrl 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 + 添加人员信息
38 </a> 33 </a>
39 - <ul class="dropdown-menu pull-right">  
40 - <li>  
41 - <a href="javascript:" class="tool-action">  
42 - <i class="fa fa-file-excel-o"></i>  
43 - 导出excel  
44 - </a>  
45 - </li>  
46 - <li class="divider"></li>  
47 - <li>  
48 - <a href="javascript:" class="tool-action">  
49 - <i class="fa fa-refresh"></i>  
50 - 刷行数据  
51 - </a>  
52 - </li>  
53 - </ul> 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>
54 </div> 57 </div>
55 </div> 58 </div>
56 - </div>  
57 59
58 - <div class="portlet-body">  
59 - <div ui-view="list"></div> 60 + <div class="portlet-body">
  61 + <div ui-view="list"></div>
  62 + </div>
60 </div> 63 </div>
61 </div> 64 </div>
62 </div> 65 </div>
63 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.js 0 → 100644
  View file @74427bb
  1 +// 车辆配置管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('BusConfigService', ['$resource', function($resource) {
  3 + // TODO：测试
  4 + return $resource(
  5 + '/cci',
  6 + {},
  7 + {
  8 + list: {
  9 + method: 'GET'
  10 + }
  11 + }
  12 + );
  13 +}]);
  14 +
  15 +angular.module('ScheduleApp').controller('BusConfigCtrl', ['BusConfigService', function(busConfigService) {
  16 +
  17 +}]);
  18 +
  19 +angular.module('ScheduleApp').controller('BusConfigListCtrl', ['BusConfigService', function(busConfigService) {
  20 + // TODO：模拟数据
  21 + var self = this;
  22 + self.totalItems = 64;
  23 + self.currentPage = 4;
  24 + self.infos = {};
  25 + self.pageChanaged = function() {
  26 + console.log("页面跳转到：" + currentPage.currentPage);
  27 + }
  28 +}]);
  29 +
  30 +angular.module('ScheduleApp').controller('BusConfigFormCtrl', ['BusConfigService', function(busConfigService) {
  31 +
  32 +}]);
  33 +
  34 +angular.module('ScheduleApp').controller('BusConfigDetailCtrl', ['BusConfigService', function(busConfigService) {
  35 +
  36 +}]);
  37 +
  38 +
  39 +
src/main/resources/static/pages/scheduleApp/module/core/busConfig/detail.html 0 → 100644
  View file @74427bb
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html 0 → 100644
  View file @74427bb
src/main/resources/static/pages/scheduleApp/module/core/busConfig/index.html 0 → 100644
  View file @74427bb
  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="BusConfigCtrl 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/busConfig/list.html 0 → 100644
  View file @74427bb
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="BusConfigListCtrl 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.cl.carCode"></span>
  33 + </td>
  34 + <td>
  35 + <span ng-bind="info.cl.equipmentCode"></span>
  36 + </td>
  37 + <td>
  38 + <span ng-bind="info.personnelType"></span>
  39 + </td>
  40 + <td>
  41 + <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  42 + </td>
  43 + <td>
  44 + <span ng-bind="info.zzrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  45 + </td>
  46 + <td>
  47 + <span ng-bind="info.tcd"></span>
  48 + </td>
  49 + <td>
  50 + <span ng-bind="info.isSwitch"></span>
  51 + </td>
  52 + <td>
  53 + <span>TODO</span>
  54 + </td>
  55 + </tr>
  56 + </tbody>
  57 + </table>
  58 +
  59 + <div style="text-align: right;">
  60 + <uib-pagination total-items="ctrl.totalItems"
  61 + ng-model="ctrl.currentPage"
  62 + ng-change="ctrl.pageChanged()"
  63 + previous-text="上一页"
  64 + next-text="下一页">
  65 + </uib-pagination>
  66 + </div>
  67 +</div>
0 \ No newline at end of file 68 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @74427bb
@@ -169,19 +169,24 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -169,19 +169,24 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
169 }) 169 })
170 170
171 // 车辆配置模块 171 // 车辆配置模块
172 - .state('busConfig', {  
173 - url: '/abc.html',  
174 - templateUrl: 'pages/scheduleApp/module/core/busConfig/busConfig2.html',  
175 - data: {},  
176 - //controller: 'busConfigCtrl', 172 + .state("busConfig", {
  173 + url: '/busConfig',
  174 + views: {
  175 + "": {
  176 + templateUrl: 'pages/scheduleApp/module/core/busConfig/index.html'
  177 + },
  178 + "list@busConfig": {
  179 + templateUrl: 'pages/scheduleApp/module/core/busConfig/list.html'
  180 + }
  181 + },
  182 +
177 resolve: { 183 resolve: {
178 deps: ['$ocLazyLoad', function($ocLazyLoad) { 184 deps: ['$ocLazyLoad', function($ocLazyLoad) {
179 return $ocLazyLoad.load({ 185 return $ocLazyLoad.load({
180 - name: 'busConfig_module', 186 + name: 'deviceInfoManage_module',
181 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置 187 insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
182 files: [ 188 files: [
183 - 'pages/scheduleApp/module/core/busConfig/service2.js',  
184 - 'pages/scheduleApp/module/core/busConfig/controller2.js' 189 + "pages/scheduleApp/module/core/busConfig/busConfig.js"
185 ] 190 ]
186 }); 191 });
187 }] 192 }]