潘钊 / bsth_control · Commits

Commit d6e8bd5564b7e1d07b853c8977e1e07a377b54aa

Authored by 徐烜
1 parent 86e4375e
build: skipped

update

Inline Side-by-side
Showing 28 changed files with 779 additions and 898 deletions
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.controller.schedule;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.schedule.SchedulePlan;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +
  8 +/**
  9 + * Created by xu on 16/6/16.
  10 + */
  11 +@RestController
  12 +@RequestMapping("spc")
  13 +public class SchedulePlanController extends BaseController<SchedulePlan, Long> {
  14 +}
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.controller.schedule;
  2 +
  3 +import com.bsth.controller.BaseController;
  4 +import com.bsth.entity.schedule.SchedulePlanInfo;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +import org.springframework.web.bind.annotation.RestController;
  7 +
  8 +/**
  9 + * Created by xu on 16/6/16.
  10 + */
  11 +@RestController
  12 +@RequestMapping("spic")
  13 +public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
  14 +}
src/main/java/com/bsth/repository/schedule/SchedulePlanRepository.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.repository.schedule;
  2 +
  3 +import com.bsth.entity.schedule.SchedulePlan;
  4 +import com.bsth.repository.BaseRepository;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +/**
  8 + * Created by xu on 16/6/16.
  9 + */
  10 +@Repository
  11 +public interface SchedulePlanRepository extends BaseRepository<SchedulePlan, Long> {
  12 +}
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.service.schedule;
  2 +
  3 +import com.bsth.entity.schedule.SchedulePlanInfo;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +/**
  7 + * Created by xu on 16/6/16.
  8 + */
  9 +public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
  10 +}
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.service.schedule;
  2 +
  3 +import com.bsth.entity.schedule.SchedulePlanInfo;
  4 +import com.bsth.service.impl.BaseServiceImpl;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +/**
  8 + * Created by xu on 16/6/16.
  9 + */
  10 +@Service
  11 +public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
  12 +}
src/main/java/com/bsth/service/schedule/SchedulePlanService.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.service.schedule;
  2 +
  3 +import com.bsth.entity.schedule.SchedulePlan;
  4 +import com.bsth.service.BaseService;
  5 +
  6 +/**
  7 + * Created by xu on 16/6/16.
  8 + */
  9 +public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
  10 +}
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java 0 → 100644
  View file @d6e8bd5
  1 +package com.bsth.service.schedule;
  2 +
  3 +import com.bsth.entity.schedule.SchedulePlan;
  4 +import com.bsth.service.impl.BaseServiceImpl;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +/**
  8 + * Created by xu on 16/6/16.
  9 + */
  10 +@Service
  11 +public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
  12 +}
src/main/resources/static/pages/scheduleApp/module/core/busConfig/controller.js deleted 100644 → 0
  View file @86e4375
1 -// 车辆配置控制器放在这里  
2 -  
3 -angular.module('busConfigApp')  
4 - .controller('busConfigCtrl', ['BusConfigInfo', function(BusConfigInfo) {  
5 - var self = this;  
6 - self.totalItems = 64;  
7 - self.currentPage = 4;  
8 - self.infos = [];  
9 - self.pageChanged = function() {  
10 - console.log("页面调转到：" + self.currentPage);  
11 - };  
12 -  
13 - BusConfigInfo.list(function(result) {  
14 - console.log("后台返回记录数：" + result.content.length);  
15 - self.infos = result.content;  
16 - });  
17 - }]);  
18 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/controller2.js deleted 100644 → 0
  View file @86e4375
1 -// 车辆配置控制器放在这里  
2 -  
3 -angular.module('ScheduleApp')  
4 - .controller('busConfigCtrl', ['BusConfigInfo', function(BusConfigInfo) {  
5 - var self = this;  
6 - self.totalItems = 64;  
7 - self.currentPage = 4;  
8 - self.infos = [];  
9 - self.pageChanged = function() {  
10 - console.log("页面调转到：" + self.currentPage);  
11 - };  
12 -  
13 - BusConfigInfo.list(function(result) {  
14 - console.log("后台返回记录数：" + result.content.length);  
15 - self.infos = result.content;  
16 - });  
17 - }]);  
18 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/service.js deleted 100644 → 0
  View file @86e4375
1 -// 车辆配置服务放在这里  
2 -  
3 -angular.module('busConfigApp', ['ngResource', 'ui.bootstrap'])  
4 - .factory('BusConfigInfo', ['$resource', function($resource) {  
5 - return $resource(  
6 - '/cci',  
7 - {},  
8 - {  
9 - list: {  
10 - method: 'GET'  
11 - }  
12 - }  
13 - );  
14 - }]);  
15 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/service2.js deleted 100644 → 0
  View file @86e4375
1 -// 车辆配置服务放在这里  
2 -  
3 -angular.module('ScheduleApp').factory('BusConfigInfo', ['$resource', function($resource) {  
4 - return $resource(  
5 - '/cci',  
6 - {},  
7 - {  
8 - list: {  
9 - method: 'GET'  
10 - }  
11 - }  
12 - );  
13 -}]);  
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/controller.js deleted 100644 → 0
  View file @86e4375
1 -// 人员配置控制器放在这里  
2 -  
3 -angular.module('employeeConfigApp')  
4 - .controller('employeeConfigCtrl', ['EmployeeConfigInfo', function(EmployeeConfigInfo) {  
5 - var self = this;  
6 - self.totalItems = 64;  
7 - self.currentPage = 4;  
8 - self.infos = [];  
9 - self.pageChanged = function() {  
10 - console.log("页面跳转到：" + self.currentPage);  
11 - };  
12 -  
13 - EmployeeConfigInfo.list(function(result) {  
14 - console.log("后台返回记录数：" + result.content.length);  
15 - self.infos = result.content;  
16 - });  
17 - }]);  
18 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.html deleted 100644 → 0
  View file @86e4375
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>人员配置</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">运营计划管理</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">人员配置</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="employeeConfig" ng-app="employeeConfigApp">  
22 - <div class="col-md-12" ng-controller="employeeConfigCtrl as ecc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">配置表</span>  
28 - </div>  
29 - <div class="actions">  
30 - <a href="javascirpt:" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 添加配置  
33 - </a>  
34 - <div class="btn-group">  
35 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
36 - <i class="fa fa-share"></i>  
37 - <span>系统工具</span>  
38 - <i class="fa fa-angle-down"></i>  
39 - </a>  
40 - <ul class="dropdown-menu pull-right">  
41 - <li>  
42 - <a href="javascript:" class="tool-action">  
43 - <i class="fa fa-file-excel-o"></i>  
44 - 导出excel  
45 - </a>  
46 - </li>  
47 - <li class="divider"></li>  
48 - <li>  
49 - <a href="javascript:" class="tool-action">  
50 - <i class="fa fa-refresh"></i>  
51 - 刷行数据  
52 - </a>  
53 - </li>  
54 - </ul>  
55 - </div>  
56 - </div>  
57 - </div>  
58 -  
59 - <div class="portlet-body">  
60 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
61 - <thead>  
62 - <tr>  
63 - <th>  
64 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
65 - </th>  
66 - <th>线路名称</th>  
67 - <th>搭班编码</th>  
68 - <th>驾驶员工号</th>  
69 - <th>驾驶员</th>  
70 - <th>售票员工号</th>  
71 - <th>售票员</th>  
72 - <th>车辆内部编码</th>  
73 - <th>操作</th>  
74 - </tr>  
75 - </thead>  
76 - <tbody>  
77 - <tr ng-repeat="info in ecc.infos" class="odd gradeX">  
78 - <td>  
79 - <input type="checkbox" class="checkboxes"/>  
80 - </td>  
81 - <td>  
82 - <span ng-bind="info.xl"></span>  
83 - </td>  
84 - <td>  
85 - <span ng-bind="info.dbbm"></span>  
86 - </td>  
87 - <td>  
88 - <span ng-bind="info.jsygh"></span>  
89 - </td>  
90 - <td>  
91 - <span ng-bind="info.jsy"></span>  
92 - </td>  
93 - <td>  
94 - <span ng-bind="info.spygh"></span>  
95 - </td>  
96 - <td>  
97 - <span ng-bind="info.spy"></span>  
98 - </td>  
99 - <td>  
100 - <span ng-bind="info.clZbh"></span>  
101 - </td>  
102 - </tr>  
103 - </tbody>  
104 - </table>  
105 -  
106 - <div style="text-align: right;">  
107 - <uib-pagination total-items="ecc.totalItems"  
108 - ng-model="ecc.currentPage"  
109 - ng-change="ecc.pageChanged()"  
110 - previous-text="上一页"  
111 - next-text="下一页">  
112 - </uib-pagination>  
113 - </div>  
114 -  
115 - </div>  
116 - </div>  
117 - </div>  
118 -</div>  
119 -  
120 -<script src="service.js" inline="true"></script>  
121 -<script src="controller.js" inline="true"></script>  
122 -  
123 -<script type="text/javascript">  
124 - angular.bootstrap(document.getElementById("employeeConfig"), ["employeeConfigApp"]);  
125 -</script>  
126 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/service.js deleted 100644 → 0
  View file @86e4375
1 -// 人员配置服务放在这里  
2 -  
3 -angular.module('employeeConfigApp', ['ngResource', 'ui.bootstrap'])  
4 - .factory('EmployeeConfigInfo', ['$resource', function($resource) {  
5 - return $resource(  
6 - '/eci',  
7 - {},  
8 - {  
9 - list: {  
10 - method: 'GET'  
11 - }  
12 - }  
13 - );  
14 - }]);  
15 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig2.html renamed to src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/index.html
  View file @d6e8bd5
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="col-md-12" ng-controller="busConfigCtrl as bcc">  
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>  
38 - </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>  
54 - </div>  
55 - </div>  
56 - </div>  
57 -  
58 - <div class="portlet-body">  
59 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
60 - <thead>  
61 - <tr>  
62 - <th>  
63 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
64 - </th>  
65 - <th>线路名称</th>  
66 - <th>自编号</th>  
67 - <th>设备编号</th>  
68 - <th>启用日期</th>  
69 - <th>终止日期</th>  
70 - <th>停车点</th>  
71 - <th>操作</th>  
72 - </tr>  
73 - </thead>  
74 - <tbody>  
75 - <tr ng-repeat="info in bcc.infos" class="odd gradeX">  
76 - <td>  
77 - <input type="checkbox" class="checkboxes"/>  
78 - </td>  
79 - <td>  
80 - <span ng-bind="info.xl"></span>  
81 - </td>  
82 - <td>  
83 - <span ng-bind="info.clZbh"></span>  
84 - </td>  
85 - <td>  
86 - <span ng-bind="info.sbbh"></span>  
87 - </td>  
88 - <td>  
89 - <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
90 - </td>  
91 - <td>  
92 - <span ng-bind="info.zzrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
93 - </td>  
94 - <td>  
95 - <span ng-bind="info.tcd"></span>  
96 - </td>  
97 - </tr>  
98 - </tbody>  
99 - </table>  
100 -  
101 - <div style="text-align: right;">  
102 - <uib-pagination total-items="bcc.totalItems"  
103 - ng-model="bcc.currentPage"  
104 - ng-change="bcc.pageChanged()"  
105 - previous-text="上一页"  
106 - next-text="下一页">  
107 - </uib-pagination>  
108 - </div>  
109 -  
110 - </div>  
111 - </div> 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="SchedulePlanManageCtrl 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" ng-click="ctrl.goForm()">
  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="schedulePlanManage_list"></div>
  62 + </div>
  63 + </div>
  64 + </div>
112 </div> 65 </div>
113 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html 0 → 100644
  View file @d6e8bd5
  1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="SchedulePlanManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr role="row" class="heading">
  6 + <th>序号</th>
  7 + <th>线路</th>
  8 + <th>时刻表</th>
  9 + <th>排班开始时间</th>
  10 + <th>排班结束时间</th>
  11 + <th>修改人</th>
  12 + <th>修改时间</th>
  13 + <th width="14%">操作</th>
  14 + </tr>
  15 + <tr role="row" class="filter">
  16 + <td></td>
  17 + <td></td>
  18 + <td></td>
  19 + <td></td>
  20 + <td></td>
  21 + <td></td>
  22 + <td></td>
  23 + <td>
  24 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  25 + ng-click="ctrl.pageChanaged()">
  26 + <i class="fa fa-search"></i> 搜索</button>
  27 +
  28 + <button class="btn btn-sm red btn-outline filter-cancel"
  29 + ng-click="ctrl.resetSearchCondition()">
  30 + <i class="fa fa-times"></i> 重置</button>
  31 + </td>
  32 +
  33 + </tr>
  34 + </thead>
  35 + <tbody>
  36 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  37 + <td>
  38 + <span ng-bind="$index + 1"></span>
  39 + </td>
  40 + <td>
  41 + <span ng-bind="info.xl.name"></span>
  42 + </td>
  43 + <td>
  44 + <span ng-bind="info.ttInfo.name"></span>
  45 + </td>
  46 + <td>
  47 + <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>
  48 + </td>
  49 + <td>
  50 + <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
  51 + </td>
  52 + <td>
  53 + <span ng-bind=""></span>
  54 + </td>
  55 + <td>
  56 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  57 + </td>
  58 + <td>
  59 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  60 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  61 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 排班明细 </a>
  62 + </td>
  63 + </tr>
  64 + </tbody>
  65 + </table>
  66 +
  67 + <div style="text-align: right;">
  68 + <uib-pagination total-items="ctrl.pageInfo.totalItems"
  69 + ng-model="ctrl.pageInfo.currentPage"
  70 + ng-change="ctrl.pageChanaged()"
  71 + rotate="false"
  72 + max-size="10"
  73 + boundary-links="true"
  74 + first-text="首页"
  75 + previous-text="上一页"
  76 + next-text="下一页"
  77 + last-text="尾页">
  78 + </uib-pagination>
  79 + </div>
  80 +</div>
0 \ No newline at end of file 81 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.html deleted 100644 → 0
  View file @86e4375
1 -排班计划管理  
2 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js 0 → 100644
  View file @d6e8bd5
  1 +// 车辆配置管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('SchedulePlanManageService', ['SchedulePlanManageService_g', function(service) {
  3 + /** 当前的查询条件信息 */
  4 + var currentSearchCondition = {};
  5 +
  6 + /** 当前第几页 */
  7 + var currentPageNo = 1;
  8 +
  9 + return {
  10 + /**
  11 + * 获取查询条件信息，
  12 + * 用于给controller用来和页面数据绑定。
  13 + */
  14 + getSearchCondition: function() {
  15 + return currentSearchCondition;
  16 + },
  17 + /**
  18 + * 重置查询条件信息。
  19 + */
  20 + resetSearchCondition: function() {
  21 + var key;
  22 + for (key in currentSearchCondition) {
  23 + currentSearchCondition[key] = "";
  24 + }
  25 + },
  26 + /**
  27 + * 设置当前页码。
  28 + * @param cpn 从1开始，后台是从0开始的
  29 + */
  30 + setCurrentPageNo: function(cpn) {
  31 + currentPageNo = cpn;
  32 + },
  33 + /**
  34 + * 组装查询参数，返回一个promise查询结果。
  35 + * @param params 查询参数
  36 + * @return 返回一个 promise
  37 + */
  38 + getPage: function() {
  39 + var params = currentSearchCondition; // 查询条件
  40 + params.page = currentPageNo - 1; // 服务端页码从0开始
  41 + return service.info.list(params).$promise;
  42 + }
  43 +
  44 + };
  45 +
  46 +}]);
  47 +
  48 +angular.module('ScheduleApp').controller('SchedulePlanManageCtrl', ['SchedulePlanManageService', '$state', function(schedulePlanManageService, $state) {
  49 + var self = this;
  50 +
  51 + // 切换到form状态
  52 + self.goForm = function() {
  53 + alert("等待生成");
  54 +
  55 + }
  56 +}]);
  57 +
  58 +angular.module('ScheduleApp').controller('SchedulePlanManageListCtrl', ['SchedulePlanManageService', function(schedulePlanManageService) {
  59 + var self = this;
  60 + self.pageInfo = {
  61 + totalItems : 0,
  62 + currentPage : 1,
  63 + infos: []
  64 + };
  65 +
  66 + // 初始创建的时候，获取一次列表数据
  67 + schedulePlanManageService.getPage().then(
  68 + function(result) {
  69 + self.pageInfo.totalItems = result.totalElements;
  70 + self.pageInfo.currentPage = result.number + 1;
  71 + self.pageInfo.infos = result.content;
  72 + schedulePlanManageService.setCurrentPageNo(result.number + 1);
  73 + },
  74 + function(result) {
  75 + alert("出错啦！");
  76 + }
  77 + );
  78 +
  79 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  80 + // alert("dfdfdf");
  81 + //});
  82 +
  83 + // 翻页的时候调用
  84 + self.pageChanaged = function() {
  85 + schedulePlanManageService.setCurrentPageNo(self.pageInfo.currentPage);
  86 + schedulePlanManageService.getPage().then(
  87 + function(result) {
  88 + self.pageInfo.totalItems = result.totalElements;
  89 + self.pageInfo.currentPage = result.number + 1;
  90 + self.pageInfo.infos = result.content;
  91 + schedulePlanManageService.setCurrentPageNo(result.number + 1);
  92 + },
  93 + function(result) {
  94 + alert("出错啦！");
  95 + }
  96 + );
  97 + };
  98 + // 获取查询条件数据
  99 + self.searchCondition = function() {
  100 + return schedulePlanManageService.getSearchCondition();
  101 + };
  102 + // 重置查询条件
  103 + self.resetSearchCondition = function() {
  104 + return schedulePlanManageService.resetSearchCondition();
  105 + };
  106 +
  107 +}]);
  108 +
  109 +
  110 +
  111 +
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/controller.js deleted 100644 → 0
  View file @86e4375
1 -// 时刻表管理 controller  
2 -  
3 -angular.module('timeTableManageApp')  
4 - .controller('timeTableManageCtrl', ['TTInfo', function(TTInfo) {  
5 - var self = this;  
6 - self.totalItems = 0;  
7 - self.currentPage = 1;  
8 - self.infos = [];  
9 - self.pageChanged = function() {  
10 - console.log("页面跳转到：" + self.currentPage);  
11 -  
12 - TTInfo.list({page: self.currentPage - 1}, function(result) {  
13 - console.log("后台返回记录数：" + result.content.length);  
14 - self.totalItems = result.totalElements;  
15 - self.currentPage = result.number + 1;  
16 - self.infos = result.content;  
17 - });  
18 - };  
19 -  
20 - TTInfo.list(function(result) {  
21 - console.log("后台返回记录数：" + result.content.length);  
22 - self.totalItems = result.totalElements;  
23 - self.currentPage = result.number + 1;  
24 - self.infos = result.content;  
25 - });  
26 -  
27 - self.showDetail = function() {  
28 - alert("时刻信息详细");  
29 - };  
30 -  
31 - // 模拟799路的时刻信息  
32 - self.detailHeads = [  
33 - '路牌', '出场',  
34 - '华高新村1', '陆家嘴地铁站1', '华高新村2', '陆家嘴地铁站2',  
35 - '华高新村3', '陆家嘴地铁站3', '华高新村4', '陆家嘴地铁站4',  
36 - '华高新村5', '陆家嘴地铁站5', '华高新村6', '陆家嘴地铁站6',  
37 - '华高新村7', '陆家嘴地铁站7', '华高新村8', '陆家嘴地铁站8',  
38 - '进场', '空驶班次数/里程', '运营班次数/里程'  
39 - ];  
40 -  
41 - self.detailInfos = [  
42 - ['1', '07:01', '', '', '07:11', '08:01', '09:22', '10:12', '11:34', '12:24', '13:34', '14:24', '15:42', '16:32', '18:00', '18:50', '', '', '19:46', '2/1.6', '12/198'],  
43 - ['2', '06:51', '07:01', '07:51', '09:12', '10:02', '11:22', '12:12', '13:22', '14:12', '15:36', '16:26', '17:55', '18:45', '20:05', '20:55', '', '', '21:51', '2/1.6', '14/231'],  
44 - ['3', '05:56', '06:06', '06:56', '08:05', '08:55', '10:34', '11:24', '12:20', '', '', '17:01', '17:11', '18:01', '19:10', '19:58', '21:16', '22:08', '23:04', '4/3.2', '12/198'],  
45 - ['4', '06:20', '06:30', '07:20', '08:20', '09:10', '11:02', '08:38', '12:46', '13:36', '12:57', '15:44', '17:20', '18:10', '19:24', '20:14', '', '', '21:10', '2/1.6', '14/231'],  
46 - ['5', '07:21', '', '', '07:31', '08:21', '09:46', '10:36', '11:58', '12:48', '13:36', '14:46', '16:06', '16:56', '18:18', '19:08', '', '', '20:04', '2/1.6', '12/198'],  
47 - ['6', '06:36', '06:46', '07:36', '08:40', '09:30', '10:58', '11:48', '12:58', '13:48', '15:18', '16:08', '17:40', '18:30', '19:48', '20:38', '21:50', '22:49', '23:45', '2/1.6', '16/264'],  
48 - ['7', '07:30', '', '', '07:40', '08:31', '09:58', '10:48', '12:10', '13:00', '13:56', '16:20', '16:30', '17:20', '18:30', '19:20', '20:41', '21:31', '22:27', '4/3.2', '12/198'],  
49 - ['8', '07:46', '', '', '07:56', '08:46', '10:22', '11:12', '12:34', '13:24', '14:20', '16:38', '16:48', '17:38', '18:49', '19:38', '21:00', '21:50', '22:46', '4/3.2', '12/198'],  
50 - ['9', '07:38', '', '', '07:48', '08:38', '10:10', '10:00', '12:22', '13:12', '14:30', '15:20', '16:44', '17:34', '18:42', '19:32', '', '', '20:28', '2/1.6', '12/198'],  
51 - ['10', '06:46', '06:56', '07:46', '09:00', '09:50', '11:10', '12:00', '13:10', '14:00', '15:24', '16:14', '17:45', '18:35', '19:56', '20:46', '22:00', '23:00', '23:56', '2/1.6', '16/264'],  
52 - ['+1', '05:10', '05:20', '06:10', '07:21', '08:11', '09:07', '', '', '', '', '15:44', '15:54', '16:44', '18:12', '19:02', '20:23', '21:13', '22:09', '4/3.2', '10/165'],  
53 - ['+2', '05:30', '05:40', '06:30', '07:44', '08:34', '09:30', '', '', '', '', '16:29', '16:39', '17:29', '18:36', '19:26', '20:50', '21:40', '22:36', '4/3.2', '10/165'],  
54 - ['+3', '05:30', '', '06:00', '07:16', '08:06', '09:02', '', '', '', '', '15:38', '15:48', '16:38', '18:06', '18:56', '20:14', '21:04', '22:00', '4/14.95', '9/149'],  
55 - ['+4', '05:48', '05:58', '06:48', '08:00', '08:50', '09:46', '', '', '', '', '16:52', '17:02', '17:52', '19:03', '19:50', '21:08', '21:59', '22:54', '4/3.2', '10/165'],  
56 - ['+5', '05:40', '05:50', '06:40', '07:52', '08:42', '09:38', '', '', '14:26', '14:36', '15:26', '16:53', '17:43', '18:56', '19:44', '', '', '20:40', '4/3.2', '10/165'],  
57 - ['+6', '06:31', '06:41', '07:31', '08:31', '09:21', '10:17', '', '', '14:56', '15:06', '15:56', '17:30', '18:20', '19:32', '20:22', '21:32', '22:27', '23:23', '4/3.2', '12/198'],  
58 - ['+7', '05:20', '05:30', '06:20', '07:36', '08:26', '09:22', '', '', '', '', '16:08', '16:18', '17:08', '18:24', '19:14', '20:32', '21:22', '22:18', '4/3.2', '10/165'],  
59 - ['+8', '06:04', '06:14', '07:04', '08:10', '09:00', '09:56', '', '', '', '', '17:05', '17:15', '18:05', '19:17', '20:06', '21:24', '22:17', '23:13', '4/3.2', '10/165'],  
60 - ['+9', '06:41', '06:51', '07:41', '08:50', '09:40', '10:36', '', '', '15:02', '15:12', '16:02', '17:35', '18:25', '19:40', '20:30', '21:40', '22:38', '23:34', '4/3.2', '12/198'],  
61 - ['+10', '07:16', '', '', '07:26', '08:16', '09:34', '10:24', '11:46', '12:36', '13:46', '14:36', '16:00', '16:50', '', '', '', '', '17:46', '2/1.6', '10/165'],  
62 - ['+20', '06:12', '06:22', '07:12', '08:15', '09:05', '10:01', '', '', '14:50', '15:00', '15:50', '17:25', '18:15', '', '', '', '', '19:11', '4/3.2', '8/132'],  
63 - ['+21', '06:26', '06:36', '07:26', '08:25', '09:15', '10:11', '', '', '15:20', '15:30', '16:20', '17:50', '18:40', '', '', '', '', '19:36', '4/3.2', '8/132'],  
64 - ['+22', '06:56', '07:06', '07:56', '08:52', '', '', '', '', '14:38', '14:48', '15:38', '17:06', '17:56', '', '', '', '', '18:52', '4/3.2', '6/99'],  
65 - ['机1', '13:56', '', '', '', '', '', '', '', '', '14:06', '14:56', '16:12', '17:02', '', '', '', '', '17:58', '2/1.6', '4/66'],  
66 - ['机2', '14:04', '', '', '', '', '', '', '', '', '14:14', '15:04', '16:24', '17:14', '', '', '', '', '18:10', '2/1.6', '4/66'],  
67 - ['机3', '14:12', '', '', '', '', '', '', '', '', '14:22', '15:12', '16:35', '17:25', '', '', '', '', '18:21', '2/1.6', '4/66'],  
68 - ['机4', '14:32', '', '', '', '', '', '', '', '', '14:42', '15:32', '16:57', '17:47', '', '', '', '', '18:43', '2/1.6', '4/66']  
69 -  
70 - ]  
71 -  
72 -  
73 -  
74 -  
75 -  
76 -  
77 -  
78 -  
79 -  
80 -  
81 -  
82 -  
83 -  
84 -  
85 -  
86 -  
87 -  
88 -  
89 -  
90 -  
91 -  
92 -  
93 -  
94 -  
95 -  
96 -  
97 -  
98 -  
99 -  
100 -  
101 -  
102 - }]);  
103 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/edit.html 0 → 100644
  View file @d6e8bd5
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/form.html 0 → 100644
  View file @d6e8bd5
src/main/resources/static/pages/scheduleApp/module/core/busConfig/busConfig.html renamed to src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/index.html
  View file @d6e8bd5
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>车辆配置</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">运营计划管理</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">车俩配置</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="busConfig" ng-app="busConfigApp">  
22 - <div class="col-md-12" ng-controller="busConfigCtrl as bcc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">配置表</span>  
28 - </div>  
29 - <div class="actions">  
30 - <a href="javascirpt:" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 添加配置  
33 - </a>  
34 - <div class="btn-group">  
35 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
36 - <i class="fa fa-share"></i>  
37 - <span>系统工具</span>  
38 - <i class="fa fa-angle-down"></i>  
39 - </a>  
40 - <ul class="dropdown-menu pull-right">  
41 - <li>  
42 - <a href="javascript:" class="tool-action">  
43 - <i class="fa fa-file-excel-o"></i>  
44 - 导出excel  
45 - </a>  
46 - </li>  
47 - <li class="divider"></li>  
48 - <li>  
49 - <a href="javascript:" class="tool-action">  
50 - <i class="fa fa-refresh"></i>  
51 - 刷行数据  
52 - </a>  
53 - </li>  
54 - </ul>  
55 - </div>  
56 - </div>  
57 - </div>  
58 -  
59 - <div class="portlet-body">  
60 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
61 - <thead>  
62 - <tr>  
63 - <th>  
64 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
65 - </th>  
66 - <th>线路名称</th>  
67 - <th>自编号</th>  
68 - <th>设备编号</th>  
69 - <th>启用日期</th>  
70 - <th>终止日期</th>  
71 - <th>停车点</th>  
72 - <th>操作</th>  
73 - </tr>  
74 - </thead>  
75 - <tbody>  
76 - <tr ng-repeat="info in bcc.infos" class="odd gradeX">  
77 - <td>  
78 - <input type="checkbox" class="checkboxes"/>  
79 - </td>  
80 - <td>  
81 - <span ng-bind="info.xl"></span>  
82 - </td>  
83 - <td>  
84 - <span ng-bind="info.clZbh"></span>  
85 - </td>  
86 - <td>  
87 - <span ng-bind="info.sbbh"></span>  
88 - </td>  
89 - <td>  
90 - <span ng-bind="info.qyrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
91 - </td>  
92 - <td>  
93 - <span ng-bind="info.zzrq | date:'yyyy-MM-dd HH:mm:ss'"></span>  
94 - </td>  
95 - <td>  
96 - <span ng-bind="info.tcd"></span>  
97 - </td>  
98 - </tr>  
99 - </tbody>  
100 - </table>  
101 -  
102 - <div style="text-align: right;">  
103 - <uib-pagination total-items="bcc.totalItems"  
104 - ng-model="bcc.currentPage"  
105 - ng-change="bcc.pageChanged()"  
106 - previous-text="上一页"  
107 - next-text="下一页">  
108 - </uib-pagination>  
109 - </div>  
110 -  
111 - </div>  
112 - </div>  
113 - </div>  
114 -</div>  
115 -  
116 -<script src="service.js" inline="true"></script>  
117 -<script src="controller.js" inline="true"></script>  
118 -  
119 -<script type="text/javascript">  
120 - angular.bootstrap(document.getElementById("busConfig"), ["busConfigApp"]);  
121 -</script>  
122 \ No newline at end of file 1 \ No newline at end of file
  2 +<div class="page-head">
  3 + <div class="page-title">
  4 + <h1>时刻表管理</h1>
  5 + </div>
  6 +</div>
  7 +
  8 +<ul class="page-breadcrumb breadcrumb">
  9 + <li>
  10 + <a href="/pages/home.html" data-pjax>首页</a>
  11 + <i class="fa fa-circle"></i>
  12 + </li>
  13 + <li>
  14 + <span class="active">运营计划管理</span>
  15 + <i class="fa fa-circle"></i>
  16 + </li>
  17 + <li>
  18 + <span class="active">时刻表管理</span>
  19 + </li>
  20 +</ul>
  21 +
  22 +<div class="row">
  23 + <div class="col-md-12" ng-controller="TimeTableManageCtrl as ctrl">
  24 + <div class="portlet light bordered">
  25 + <div class="portlet-title">
  26 + <div class="caption font-dark">
  27 + <i class="fa fa-database font-dark"></i>
  28 + <span class="caption-subject bold uppercase">时刻表</span>
  29 + </div>
  30 + <div class="actions">
  31 + <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.goForm()">
  32 + <i class="fa fa-plus"></i>
  33 + 添加时刻表基础信息
  34 + </a>
  35 +
  36 + <div class="btn-group">
  37 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  38 + <i class="fa fa-share"></i>
  39 + <span>系统工具</span>
  40 + <i class="fa fa-angle-down"></i>
  41 + </a>
  42 + <ul class="dropdown-menu pull-right">
  43 + <li>
  44 + <a href="javascript:" class="tool-action">
  45 + <i class="fa fa-file-excel-o"></i>
  46 + 导出excel
  47 + </a>
  48 + </li>
  49 + <li class="divider"></li>
  50 + <li>
  51 + <a href="javascript:" class="tool-action">
  52 + <i class="fa fa-refresh"></i>
  53 + 刷行数据
  54 + </a>
  55 + </li>
  56 + </ul>
  57 + </div>
  58 + </div>
  59 + </div>
  60 +
  61 + <div class="portlet-body">
  62 + <div ui-view="timeTableManage_list"></div>
  63 + </div>
  64 + </div>
  65 + </div>
  66 +</div>
123 \ No newline at end of file 67 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableList.html renamed to src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/list.html
  View file @d6e8bd5
1 -<table class="table table-striped table-bordered table-hover table-checkable order-column" ng-controller="timeTableManageCtrl as ctrl">  
2 - <thead>  
3 - <tr>  
4 - <th>  
5 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
6 - </th>  
7 - <th>线路</th>  
8 - <th>时刻表名称</th>  
9 - <th>修改时间</th>  
10 - <th>路牌数</th>  
11 - <th>圈数</th>  
12 - <th>是否启用</th>  
13 - <th>操作1</th>  
14 - <th>操作2</th>  
15 - </tr>  
16 - </thead>  
17 - <tbody>  
18 - <tr ng-repeat="info in ctrl.infos" class="odd gradeX">  
19 - <td>  
20 - <input type="checkbox" class="checkboxes"/>  
21 - </td>  
22 - <td>  
23 - <span ng-bind="info.xlName"></span>  
24 - </td>  
25 - <td>  
26 - <span ng-bind="info.name"></span>  
27 - </td>  
28 - <td>  
29 - <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span>  
30 - </td>  
31 - <td>  
32 - <span ng-bind="info.lpCount"></span>  
33 - </td>  
34 - <td>  
35 - <span ng-bind="info.loopCount"></span>  
36 - </td>  
37 - <td>  
38 - <span ng-bind="info.enable"></span>  
39 - </td>  
40 - <td>  
41 - <a href="javascript:" ng-click="ctrl.showDetail()">时刻表明细信息</a>  
42 - </td>  
43 - <td>  
44 - <a href="javascript:">预览</a>  
45 - <a href="javascript:">基础信息修改</a>  
46 - </td>  
47 - </tr>  
48 - </tbody>  
49 -</table>  
50 -  
51 -<div style="text-align: right;">  
52 - <uib-pagination total-items="ctrl.totalItems"  
53 - ng-model="ctrl.currentPage"  
54 - ng-change="ctrl.pageChanged()"  
55 - previous-text="上一页"  
56 - next-text="下一页">  
57 - </uib-pagination> 1 +<!-- ui-route employeeInfoManage.list -->
  2 +<div ng-controller="TimeTableManageListCtrl as ctrl">
  3 + <table class="table table-striped table-bordered table-hover table-checkable order-column">
  4 + <thead>
  5 + <tr role="row" class="heading">
  6 + <th>序号</th>
  7 + <th>线路</th>
  8 + <th>时刻表名称</th>
  9 + <th>路牌数</th>
  10 + <th>圈数</th>
  11 + <th>是否启用</th>
  12 + <th>修改时间</th>
  13 + <th width="25%">操作</th>
  14 + </tr>
  15 + <tr role="row" class="filter">
  16 + <td></td>
  17 + <td></td>
  18 + <td>
  19 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like"/>
  20 + </td>
  21 + <td></td>
  22 + <td></td>
  23 + <td></td>
  24 + <td></td>
  25 + <td>
  26 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  27 + ng-click="ctrl.pageChanaged()">
  28 + <i class="fa fa-search"></i> 搜索</button>
  29 +
  30 + <button class="btn btn-sm red btn-outline filter-cancel"
  31 + ng-click="ctrl.resetSearchCondition()">
  32 + <i class="fa fa-times"></i> 重置</button>
  33 + </td>
  34 + </tr>
  35 +
  36 + </thead>
  37 + <tbody>
  38 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  39 + <td>
  40 + <span ng-bind="$index + 1"></span>
  41 + </td>
  42 + <td>
  43 + <span ng-bind="info.xl.name"></span>
  44 + </td>
  45 + <td>
  46 + <span ng-bind="info.name"></span>
  47 + </td>
  48 + <td>
  49 + <span ng-bind="info.lpCount"></span>
  50 + </td>
  51 + <td>
  52 + <span ng-bind="info.loopCount"></span>
  53 + </td>
  54 + <td>
  55 + <span ng-bind="info.isEnableDisTemplate"></span>
  56 + </td>
  57 + <td>
  58 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  59 + </td>
  60 + <td>
  61 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  62 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  63 + <a ui-sref="busConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改基础信息 </a>
  64 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改时刻表明细 </a>
  65 + </td>
  66 + </tr>
  67 + </tbody>
  68 + </table>
  69 +
  70 + <div style="text-align: right;">
  71 + <uib-pagination total-items="ctrl.pageInfo.totalItems"
  72 + ng-model="ctrl.pageInfo.currentPage"
  73 + ng-change="ctrl.pageChanaged()"
  74 + rotate="false"
  75 + max-size="10"
  76 + boundary-links="true"
  77 + first-text="首页"
  78 + previous-text="上一页"
  79 + next-text="下一页"
  80 + last-text="尾页">
  81 + </uib-pagination>
  82 + </div>
58 </div> 83 </div>
59 \ No newline at end of file 84 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/service.js deleted 100644 → 0
  View file @86e4375
1 -// 时刻表管理 service  
2 -  
3 -//angular.module('timeTableManageApp', ['ngResource', 'ui.router', 'ui.bootstrap'])  
4 -angular.module('timeTableManageApp', ['ngResource', 'ui.bootstrap'])  
5 - //.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {  
6 - // $stateProvider  
7 - // .state("timeTableList", {  
8 - // url: '/timeTableList.html',  
9 - // templateUrl: 'timeTableList.html'  
10 - // })  
11 - // .state("timeTableDetail", {  
12 - // url: '/timeTableDetail.html',  
13 - // templateUrl: 'timeTableDetail.html'  
14 - // });  
15 - // $urlRouterProvider.otherwise('/timeTableList.html');  
16 - //}])  
17 - .factory('TTInfo', ['$resource', function($resource) {  
18 - return $resource(  
19 - '/tic',  
20 - {order: 'id', direction: 'ASC'},  
21 - {  
22 - list: {  
23 - method: 'GET',  
24 - params: {  
25 - page: 0  
26 - }  
27 - }  
28 - }  
29 - );  
30 - }]);  
31 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableDetail.html deleted 100644 → 0
  View file @86e4375
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">799路测试时刻表明细</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="timeTableDetail" ng-app="timeTableManageApp">  
22 - <div class="col-md-12" ng-controller="timeTableManageCtrl as gmc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">799路测试时刻表明细</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 - <a href="javascirpt:" class="btn btn-circle blue">  
35 - <i class="fa fa-plus"></i>  
36 - 分班  
37 - </a>  
38 - <a href="javascirpt:" class="btn btn-circle blue">  
39 - <i class="fa fa-plus"></i>  
40 - 取消分班  
41 - </a>  
42 - <a href="javascirpt:" class="btn btn-circle blue">  
43 - <i class="fa fa-plus"></i>  
44 - 反向  
45 - </a>  
46 - <a href="javascirpt:" class="btn btn-circle blue">  
47 - <i class="fa fa-plus"></i>  
48 - 批量选择  
49 - </a>  
50 - <a href="javascirpt:" class="btn btn-circle blue">  
51 - <i class="fa fa-plus"></i>  
52 - 批量修改  
53 - </a>  
54 - <a href="javascirpt:" class="btn btn-circle blue">  
55 - <i class="fa fa-plus"></i>  
56 - 删除  
57 - </a>  
58 - <div class="btn-group">  
59 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
60 - <i class="fa fa-share"></i>  
61 - <span>系统工具</span>  
62 - <i class="fa fa-angle-down"></i>  
63 - </a>  
64 - <ul class="dropdown-menu pull-right">  
65 - <li>  
66 - <a href="javascript:" class="tool-action">  
67 - <i class="fa fa-file-excel-o"></i>  
68 - 导出excel  
69 - </a>  
70 - </li>  
71 - <li class="divider"></li>  
72 - <li>  
73 - <a href="javascript:" class="tool-action">  
74 - <i class="fa fa-refresh"></i>  
75 - 刷行数据  
76 - </a>  
77 - </li>  
78 - </ul>  
79 - </div>  
80 - </div>  
81 - </div>  
82 -  
83 - <div class="portlet-body">  
84 - <!--<div ng-view></div>-->  
85 - <table class="table table-striped table-bordered table-hover table-checkable order-column" ng-controller="timeTableManageCtrl as ctrl">  
86 - <thead>  
87 - <tr>  
88 - <th>  
89 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
90 - </th>  
91 - <th ng-repeat="head in ctrl.detailHeads">  
92 - <span ng-bind="head"></span>  
93 - </th>  
94 -  
95 - </tr>  
96 - </thead>  
97 - <tbody>  
98 - <tr ng-repeat="info in ctrl.detailInfos">  
99 - <td>  
100 - <input type="checkbox" class="checkboxes"/>  
101 - </td>  
102 - <td ng-repeat="cell in info track by $index">  
103 - <span ng-bind="cell"></span>  
104 - </td>  
105 - </tr>  
106 -  
107 - </tbody>  
108 - </table>  
109 -  
110 - <div style="text-align: right;">  
111 - <uib-pagination total-items="ctrl.totalItems"  
112 - ng-model="ctrl.currentPage"  
113 - ng-change="ctrl.pageChanged()"  
114 - previous-text="上一页"  
115 - next-text="下一页">  
116 - </uib-pagination>  
117 - </div>  
118 -  
119 - </div>  
120 - </div>  
121 - </div>  
122 -</div>  
123 -  
124 -<script src="service.js" inline="true"></script>  
125 -<script src="controller.js" inline="true"></script>  
126 -  
127 -<script type="text/javascript">  
128 - angular.bootstrap(document.getElementById("timeTableDetail"), ["timeTableManageApp"]);  
129 -</script>  
130 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.html deleted 100644 → 0
  View file @86e4375
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>时刻表管理</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">运营计划管理</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">时刻表管理</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="timeTableManage" ng-app="timeTableManageApp">  
22 - <div class="col-md-12" ng-controller="timeTableManageCtrl as gmc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">时刻表</span>  
28 - </div>  
29 - <div class="actions">  
30 - <a href="javascirpt:" class="btn btn-circle blue">  
31 - <i class="fa fa-plus"></i>  
32 - 添加时刻表  
33 - </a>  
34 - <div class="btn-group">  
35 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
36 - <i class="fa fa-share"></i>  
37 - <span>系统工具</span>  
38 - <i class="fa fa-angle-down"></i>  
39 - </a>  
40 - <ul class="dropdown-menu pull-right">  
41 - <li>  
42 - <a href="javascript:" class="tool-action">  
43 - <i class="fa fa-file-excel-o"></i>  
44 - 导出excel  
45 - </a>  
46 - </li>  
47 - <li class="divider"></li>  
48 - <li>  
49 - <a href="javascript:" class="tool-action">  
50 - <i class="fa fa-refresh"></i>  
51 - 刷行数据  
52 - </a>  
53 - </li>  
54 - </ul>  
55 - </div>  
56 - </div>  
57 - </div>  
58 -  
59 - <div class="portlet-body">  
60 - <!--<div ng-view></div>-->  
61 - <table class="table table-striped table-bordered table-hover table-checkable order-column" ng-controller="timeTableManageCtrl as ctrl">  
62 - <thead>  
63 - <tr>  
64 - <th>  
65 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
66 - </th>  
67 - <th>线路</th>  
68 - <th>时刻表名称</th>  
69 - <th>修改时间</th>  
70 - <th>路牌数</th>  
71 - <th>圈数</th>  
72 - <th>是否启用</th>  
73 - <th>操作1</th>  
74 - <th>操作2</th>  
75 - </tr>  
76 - </thead>  
77 - <tbody>  
78 - <tr ng-repeat="info in ctrl.infos" class="odd gradeX">  
79 - <td>  
80 - <input type="checkbox" class="checkboxes"/>  
81 - </td>  
82 - <td>  
83 - <span ng-bind="info.xlName"></span>  
84 - </td>  
85 - <td>  
86 - <span ng-bind="info.name"></span>  
87 - </td>  
88 - <td>  
89 - <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span>  
90 - </td>  
91 - <td>  
92 - <span ng-bind="info.lpCount"></span>  
93 - </td>  
94 - <td>  
95 - <span ng-bind="info.loopCount"></span>  
96 - </td>  
97 - <td>  
98 - <span ng-bind="info.enable"></span>  
99 - </td>  
100 - <td>  
101 - <a href="javascript:" ng-click="ctrl.showDetail()">时刻表明细信息</a>  
102 - </td>  
103 - <td>  
104 - <a href="javascript:">预览</a>  
105 - <a href="javascript:">基础信息修改</a>  
106 - </td>  
107 - </tr>  
108 - </tbody>  
109 - </table>  
110 -  
111 - <div style="text-align: right;">  
112 - <uib-pagination total-items="ctrl.totalItems"  
113 - ng-model="ctrl.currentPage"  
114 - ng-change="ctrl.pageChanged()"  
115 - previous-text="上一页"  
116 - next-text="下一页">  
117 - </uib-pagination>  
118 - </div>  
119 -  
120 - </div>  
121 - </div>  
122 - </div>  
123 -</div>  
124 -  
125 -<script src="service.js" inline="true"></script>  
126 -<script src="controller.js" inline="true"></script>  
127 -  
128 -<script type="text/javascript">  
129 - angular.bootstrap(document.getElementById("timeTableManage"), ["timeTableManageApp"]);  
130 -</script>  
131 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js 0 → 100644
  View file @d6e8bd5
  1 +// 时刻表管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('TimeTableManageService', ['TimeTableManageService_g', function(service) {
  3 + /** 当前的查询条件信息 */
  4 + var currentSearchCondition = {};
  5 +
  6 + /** 当前第几页 */
  7 + var currentPageNo = 1;
  8 +
  9 + return {
  10 + /**
  11 + * 获取查询条件信息，
  12 + * 用于给controller用来和页面数据绑定。
  13 + */
  14 + getSearchCondition: function() {
  15 + return currentSearchCondition;
  16 + },
  17 + /**
  18 + * 重置查询条件信息。
  19 + */
  20 + resetSearchCondition: function() {
  21 + var key;
  22 + for (key in currentSearchCondition) {
  23 + currentSearchCondition[key] = "";
  24 + }
  25 + },
  26 + /**
  27 + * 设置当前页码。
  28 + * @param cpn 从1开始，后台是从0开始的
  29 + */
  30 + setCurrentPageNo: function(cpn) {
  31 + currentPageNo = cpn;
  32 + },
  33 + /**
  34 + * 组装查询参数，返回一个promise查询结果。
  35 + * @param params 查询参数
  36 + * @return 返回一个 promise
  37 + */
  38 + getPage: function() {
  39 + var params = currentSearchCondition; // 查询条件
  40 + params.page = currentPageNo - 1; // 服务端页码从0开始
  41 + return service.list(params).$promise;
  42 + },
  43 + /**
  44 + * 获取明细信息。
  45 + * @param id 车辆id
  46 + * @return 返回一个 promise
  47 + */
  48 + getDetail: function(id) {
  49 + var params = {id: id};
  50 + return service.get(params).$promise;
  51 + },
  52 + /**
  53 + * 保存信息。
  54 + * @param obj 车辆详细信息
  55 + * @return 返回一个 promise
  56 + */
  57 + saveDetail: function(obj) {
  58 + return service.save(obj).$promise;
  59 + }
  60 + };
  61 +
  62 +}]);
  63 +
  64 +angular.module('ScheduleApp').controller('TimeTableManageCtrl', ['TimeTableManageService', '$state', function(timeTableManageService, $state) {
  65 + var self = this;
  66 +
  67 + // 切换到form状态
  68 + self.goForm = function() {
  69 + //alert("切换");
  70 + $state.go("timeTableManage_form");
  71 + }
  72 +}]);
  73 +
  74 +angular.module('ScheduleApp').controller('TimeTableManageListCtrl', ['TimeTableManageService', function(timeTableManageService) {
  75 + var self = this;
  76 + self.pageInfo = {
  77 + totalItems : 0,
  78 + currentPage : 1,
  79 + infos: []
  80 + };
  81 +
  82 + // 初始创建的时候，获取一次列表数据
  83 + timeTableManageService.getPage().then(
  84 + function(result) {
  85 + self.pageInfo.totalItems = result.totalElements;
  86 + self.pageInfo.currentPage = result.number + 1;
  87 + self.pageInfo.infos = result.content;
  88 + timeTableManageService.setCurrentPageNo(result.number + 1);
  89 + },
  90 + function(result) {
  91 + alert("出错啦！");
  92 + }
  93 + );
  94 +
  95 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  96 + // alert("dfdfdf");
  97 + //});
  98 +
  99 + // 翻页的时候调用
  100 + self.pageChanaged = function() {
  101 + timeTableManageService.setCurrentPageNo(self.pageInfo.currentPage);
  102 + timeTableManageService.getPage().then(
  103 + function(result) {
  104 + self.pageInfo.totalItems = result.totalElements;
  105 + self.pageInfo.currentPage = result.number + 1;
  106 + self.pageInfo.infos = result.content;
  107 + timeTableManageService.setCurrentPageNo(result.number + 1);
  108 + },
  109 + function(result) {
  110 + alert("出错啦！");
  111 + }
  112 + );
  113 + };
  114 + // 获取查询条件数据
  115 + self.searchCondition = function() {
  116 + return timeTableManageService.getSearchCondition();
  117 + };
  118 + // 重置查询条件
  119 + self.resetSearchCondition = function() {
  120 + return timeTableManageService.resetSearchCondition();
  121 + };
  122 +
  123 +}]);
  124 +
  125 +angular.module('ScheduleApp').controller('TimeTableManageFormCtrl', ['TimeTableManageService', '$stateParams', '$state', function(timeTableManageService, $stateParams, $state) {
  126 + // TODO：
  127 +}]);
  128 +
  129 +angular.module('ScheduleApp').controller('TimeTableManageDetailCtrl', ['TimeTableManageService', '$stateParams', function(timeTableManageService, $stateParams) {
  130 + // TODO：
  131 +}]);
  132 +
  133 +
  134 +
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @d6e8bd5
@@ -444,10 +444,100 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -444,10 +444,100 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
444 } 444 }
445 }) 445 })
446 446
  447 + // 时刻表管理
  448 + .state("timeTableManage", {
  449 + url: '/timeTableManage',
  450 + views: {
  451 + "": {
  452 + templateUrl: 'pages/scheduleApp/module/core/timeTableManage/index.html'
  453 + },
  454 + "timeTableManage_list@timeTableManage": {
  455 + templateUrl: 'pages/scheduleApp/module/core/timeTableManage/list.html'
  456 + }
  457 + },
  458 +
  459 + resolve: {
  460 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  461 + return $ocLazyLoad.load({
  462 + name: 'timeTableManage_module',
  463 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  464 + files: [
  465 + "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"
  466 + ]
  467 + });
  468 + }]
  469 + }
  470 + })
  471 + .state("timeTableManage_form", {
  472 + url: '/timeTableManage_form',
  473 + views: {
  474 + "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/form.html'}
  475 + },
  476 + resolve: {
  477 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  478 + return $ocLazyLoad.load({
  479 + name: 'timeTableManage_form_module',
  480 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  481 + files: [
  482 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  483 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  484 + "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"
  485 + ]
  486 + });
  487 + }]
  488 + }
  489 + })
  490 + .state("timeTableManage_edit", {
  491 + url: '/timeTableManage_edit/:id',
  492 + views: {
  493 + "": {templateUrl: 'pages/scheduleApp/module/core/timeTableManage/edit.html'}
  494 + },
  495 + resolve: {
  496 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  497 + return $ocLazyLoad.load({
  498 + name: 'timeTableManage_edit_module',
  499 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  500 + files: [
  501 + "assets/bower_components/angular-ui-select/dist/select.min.css",
  502 + "assets/bower_components/angular-ui-select/dist/select.min.js",
  503 + "pages/scheduleApp/module/core/timeTableManage/timeTableManage.js"
  504 + ]
  505 + });
  506 + }]
  507 + }
  508 + })
  509 +
  510 + // 排班计划管理模块
  511 + .state("schedulePlanManage", {
  512 + url: '/schedulePlanManage',
  513 + views: {
  514 + "": {
  515 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index.html'
  516 + },
  517 + "schedulePlanManage_list@schedulePlanManage": {
  518 + templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/list.html'
  519 + }
  520 + },
  521 +
  522 + resolve: {
  523 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  524 + return $ocLazyLoad.load({
  525 + name: 'schedulePlanManage_module',
  526 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  527 + files: [
  528 + "pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js"
  529 + ]
  530 + });
  531 + }]
  532 + }
  533 + })
  534 +
  535 +
447 536
448 537
449 538
450 539
  540 + // TODO:
451 541
452 542
453 543
@@ -590,6 +680,75 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f @@ -590,6 +680,75 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
590 ); 680 );
591 }]); 681 }]);
592 682
  683 +// 时刻表管理service
  684 +angular.module('ScheduleApp').factory('TimeTableManageService_g', ['$resource', function($resource) {
  685 + // TODO：之后返回两个$resource，包含 时刻表和时刻表明细
  686 +
  687 +
  688 + return $resource(
  689 + '/tic/:id',
  690 + {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
  691 + {
  692 + list: {
  693 + method: 'GET',
  694 + params: {
  695 + page: 0
  696 + }
  697 + },
  698 + get: {
  699 + method: 'GET'
  700 + },
  701 + save: {
  702 + method: 'POST'
  703 + }
  704 + }
  705 + );
  706 +}]);
  707 +
  708 +
  709 +// 排班计划管理service
  710 +angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
  711 + return {
  712 + info: $resource(
  713 + '/spc/:id',
  714 + {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
  715 + {
  716 + list: {
  717 + method: 'GET',
  718 + params: {
  719 + page: 0
  720 + }
  721 + },
  722 + get: {
  723 + method: 'GET'
  724 + },
  725 + save: {
  726 + method: 'POST'
  727 + }
  728 + }
  729 + ),
  730 + detail: $resource(
  731 + '/spic/:id',
  732 + {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
  733 + {
  734 + list: {
  735 + method: 'GET',
  736 + params: {
  737 + page: 0
  738 + }
  739 + },
  740 + get: {
  741 + method: 'GET'
  742 + },
  743 + save: {
  744 + method: 'POST'
  745 + }
  746 + }
  747 + )
  748 + }
  749 +}]);
  750 +
  751 +
593 752
594 753
595 754