潘钊 / bsth_control · Commits

Commit 93b233a1359b18b1362383f4e9bd003d3a812f03

Authored by 徐烜
1 parent 74ab5ef0
build: skipped

update

Inline Side-by-side
Showing 9 changed files with 344 additions and 191 deletions
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/controller.js deleted 100644 → 0
  View file @74ab5ef
1 -// 线路运营概览 控制器  
2 -  
3 -angular.module('busLineInfoOverviewApp')  
4 - .controller('busLineInfoOverviewCtrl', ['BusinessInfo', function(BusinessInfo) {  
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 - BusinessInfo.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 - BusinessInfo.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 -  
28 - }]);  
29 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/service.js deleted 100644 → 0
  View file @74ab5ef
1 -// 线路运营概览 服务  
2 -  
3 -angular.module('busLineInfoOverviewApp', ['ngResource', 'ui.bootstrap'])  
4 - .factory('BusinessInfo', ['$resource', function($resource) {  
5 - return $resource(  
6 - '/bic',  
7 - {order: 'id', direction: 'ASC'},  
8 - {  
9 - list: {  
10 - method: 'GET',  
11 - params: {  
12 - page: 0  
13 - }  
14 - }  
15 - }  
16 - );  
17 - }]);  
18 \ No newline at end of file 0 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/busLineInfoStat.js 0 → 100644
  View file @93b233a
  1 +// 车辆配置管理 service controller 等写在一起
  2 +angular.module('ScheduleApp').factory('BusLineInfoStatService', ['BusLineInfoStatService_g', function(service) {
  3 + /** 当前的查询条件信息 */
  4 + var currentSearchCondition = {};
  5 +
  6 + /** 当前第几页 */
  7 + var currentPageNo = 1;
  8 +
  9 + return {
  10 + /**
  11 + * 获取查询条件信息，
  12 + * 用于给controller用来和页面数据绑定。
  13 + */
  14 + getSearchCondition: function() {
  15 + return currentSearchCondition;
  16 + },
  17 + /**
  18 + * 重置查询条件信息。
  19 + */
  20 + resetSearchCondition: function() {
  21 + var key;
  22 + for (key in currentSearchCondition) {
  23 + currentSearchCondition[key] = "";
  24 + }
  25 + },
  26 + /**
  27 + * 设置当前页码。
  28 + * @param cpn 从1开始，后台是从0开始的
  29 + */
  30 + setCurrentPageNo: function(cpn) {
  31 + currentPageNo = cpn;
  32 + },
  33 + /**
  34 + * 组装查询参数，返回一个promise查询结果。
  35 + * @param params 查询参数
  36 + * @return 返回一个 promise
  37 + */
  38 + getPage: function() {
  39 + var params = currentSearchCondition; // 查询条件
  40 + params.page = currentPageNo - 1; // 服务端页码从0开始
  41 + return service.list(params).$promise;
  42 + },
  43 + /**
  44 + * 获取明细信息。
  45 + * @param id 车辆id
  46 + * @return 返回一个 promise
  47 + */
  48 + getDetail: function(id) {
  49 + var params = {id: id};
  50 + return service.get(params).$promise;
  51 + },
  52 + /**
  53 + * 保存信息。
  54 + * @param obj 车辆详细信息
  55 + * @return 返回一个 promise
  56 + */
  57 + saveDetail: function(obj) {
  58 + return service.save(obj).$promise;
  59 + }
  60 + };
  61 +
  62 +}]);
  63 +
  64 +angular.module('ScheduleApp').controller('BusLineInfoStatCtrl', ['BusLineInfoStatService', '$state', function(busLineInfoStatService, $state) {
  65 + var self = this;
  66 +
  67 + // 切换到form状态
  68 + self.goForm = function() {
  69 + alert("切换");
  70 + }
  71 +}]);
  72 +
  73 +angular.module('ScheduleApp').controller('BusLineInfoStatListCtrl', ['BusLineInfoStatService', function(busLineInfoStatService) {
  74 + var self = this;
  75 + self.pageInfo = {
  76 + totalItems : 0,
  77 + currentPage : 1,
  78 + infos: []
  79 + };
  80 +
  81 + // 初始创建的时候，获取一次列表数据
  82 + busLineInfoStatService.getPage().then(
  83 + function(result) {
  84 + self.pageInfo.totalItems = result.totalElements;
  85 + self.pageInfo.currentPage = result.number + 1;
  86 + self.pageInfo.infos = result.content;
  87 + busLineInfoStatService.setCurrentPageNo(result.number + 1);
  88 + },
  89 + function(result) {
  90 + alert("出错啦！");
  91 + }
  92 + );
  93 +
  94 + //$scope.$watch("ctrl.pageInfo.currentPage", function() {
  95 + // alert("dfdfdf");
  96 + //});
  97 +
  98 + // 翻页的时候调用
  99 + self.pageChanaged = function() {
  100 + busLineInfoStatService.setCurrentPageNo(self.pageInfo.currentPage);
  101 + busLineInfoStatService.getPage().then(
  102 + function(result) {
  103 + self.pageInfo.totalItems = result.totalElements;
  104 + self.pageInfo.currentPage = result.number + 1;
  105 + self.pageInfo.infos = result.content;
  106 + busLineInfoStatService.setCurrentPageNo(result.number + 1);
  107 + },
  108 + function(result) {
  109 + alert("出错啦！");
  110 + }
  111 + );
  112 + };
  113 + // 获取查询条件数据
  114 + self.searchCondition = function() {
  115 + return busLineInfoStatService.getSearchCondition();
  116 + };
  117 + // 重置查询条件
  118 + self.resetSearchCondition = function() {
  119 + return busLineInfoStatService.resetSearchCondition();
  120 + };
  121 +
  122 +}]);
  123 +
  124 +angular.module('ScheduleApp').controller('BusLineInfoStatFormCtrl', ['BusLineInfoStatService', '$stateParams', '$state', function(busLineInfoStatService, $stateParams, $state) {
  125 + // TODO：
  126 +}]);
  127 +
  128 +angular.module('ScheduleApp').controller('BusLineInfoStatDetailCtrl', ['BusLineInfoStatService', '$stateParams', function(busLineInfoStatService, $stateParams) {
  129 + // TODO：
  130 +}]);
  131 +
  132 +
  133 +
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/dist/busLineInfoOverview.dist.html renamed to src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/busLineInfoOverview.dist.html
  View file @93b233a
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/dist/controller.min.js renamed to src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/controller.min.js
  View file @93b233a
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/dist/service.min.js renamed to src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/dist/service.min.js
  View file @93b233a
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoOverview/busLineInfoOverview.html renamed to src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/index.html
  View file @93b233a
1 -<div class="page-head">  
2 - <div class="page-title">  
3 - <h1>线路运营概览</h1>  
4 - </div>  
5 -</div>  
6 -  
7 -<ul class="page-breadcrumb breadcrumb">  
8 - <li>  
9 - <a href="/pages/home.html" data-pjax>首页</a>  
10 - <i class="fa fa-circle"></i>  
11 - </li>  
12 - <li>  
13 - <span class="active">线路运营概览</span>  
14 - <i class="fa fa-circle"></i>  
15 - </li>  
16 - <li>  
17 - <span class="active">路牌管理</span>  
18 - </li>  
19 -</ul>  
20 -  
21 -<div class="row" id="busLineInfoOverview" ng-app="busLineInfoOverviewApp">  
22 - <div class="col-md-12" ng-controller="busLineInfoOverviewCtrl as gmc">  
23 - <div class="portlet light bordered">  
24 - <div class="portlet-title">  
25 - <div class="caption font-dark">  
26 - <i class="fa fa-database font-dark"></i>  
27 - <span class="caption-subject bold uppercase">概览</span>  
28 - </div>  
29 - <div class="actions">  
30 - <div class="btn-group">  
31 - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">  
32 - <i class="fa fa-share"></i>  
33 - <span>系统工具</span>  
34 - <i class="fa fa-angle-down"></i>  
35 - </a>  
36 - <ul class="dropdown-menu pull-right">  
37 - <li>  
38 - <a href="javascript:" class="tool-action">  
39 - <i class="fa fa-file-excel-o"></i>  
40 - 导出excel  
41 - </a>  
42 - </li>  
43 - <li class="divider"></li>  
44 - <li>  
45 - <a href="javascript:" class="tool-action">  
46 - <i class="fa fa-refresh"></i>  
47 - 刷行数据  
48 - </a>  
49 - </li>  
50 - </ul>  
51 - </div>  
52 - </div>  
53 - </div>  
54 -  
55 - <div class="portlet-body">  
56 - <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">  
57 - <thead>  
58 - <tr>  
59 - <th>  
60 - <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>  
61 - </th>  
62 - <th>线路名称</th>  
63 - <th>线路编号</th>  
64 - <th>公司</th>  
65 - <th>分公司</th>  
66 -  
67 - <th>配车数</th>  
68 - <th>人员数</th>  
69 - <th>路牌数</th>  
70 - <th>套跑数</th>  
71 - <th>时刻表数</th>  
72 - <th>排班规则数</th>  
73 - <th>排班计划数</th>  
74 - </tr>  
75 - </thead>  
76 - <tbody>  
77 - <tr ng-repeat="info in gmc.infos" class="odd gradeX">  
78 - <td>  
79 - <input type="checkbox" class="checkboxes"/>  
80 - </td>  
81 - <td>  
82 - <span ng-bind="info.xlName"></span>  
83 - </td>  
84 - <td>  
85 - <span ng-bind="info.xlBm"></span>  
86 - </td>  
87 - <td>  
88 - <span ng-bind="info.gsName"></span>  
89 - </td>  
90 - <td>  
91 - <span ng-bind="info.fgsName"></span>  
92 - </td>  
93 -  
94 - <td>  
95 - <span ng-bind="info.pcCount"></span>  
96 - </td>  
97 - <td>  
98 - <span ng-bind="info.ryCount"></span>  
99 - </td>  
100 - <td>  
101 - <span ng-bind="info.lpCount"></span>  
102 - </td>  
103 - <td>  
104 - <span ng-bind="info.tpCount"></span>  
105 - </td>  
106 - <td>  
107 - <span ng-bind="info.ttCount"></span>  
108 - </td>  
109 - <td>  
110 - <span ng-bind="info.srCount"></span>  
111 - </td>  
112 - <td>  
113 - <span ng-bind="info.spCount"></span>  
114 - </td>  
115 - </tr>  
116 - </tbody>  
117 - </table>  
118 -  
119 - <div style="text-align: right;">  
120 - <uib-pagination total-items="gmc.totalItems"  
121 - ng-model="gmc.currentPage"  
122 - ng-change="gmc.pageChanged()"  
123 - previous-text="上一页"  
124 - next-text="下一页">  
125 - </uib-pagination>  
126 - </div>  
127 -  
128 - </div>  
129 - </div>  
130 - </div>  
131 -</div>  
132 -  
133 -<script src="service.js" inline="true"></script>  
134 -<script src="controller.js" inline="true"></script>  
135 -  
136 -<script type="text/javascript">  
137 - angular.bootstrap(document.getElementById("busLineInfoOverview"), ["busLineInfoOverviewApp"]);  
138 -</script>  
139 \ 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="BusLineInfoStatCtrl 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 + <div class="btn-group">
  32 + <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
  33 + <i class="fa fa-share"></i>
  34 + <span>系统工具</span>
  35 + <i class="fa fa-angle-down"></i>
  36 + </a>
  37 + <ul class="dropdown-menu pull-right">
  38 + <li>
  39 + <a href="javascript:" class="tool-action">
  40 + <i class="fa fa-file-excel-o"></i>
  41 + 导出excel
  42 + </a>
  43 + </li>
  44 + <li class="divider"></li>
  45 + <li>
  46 + <a href="javascript:" class="tool-action">
  47 + <i class="fa fa-refresh"></i>
  48 + 刷行数据
  49 + </a>
  50 + </li>
  51 + </ul>
  52 + </div>
  53 + </div>
  54 + </div>
  55 +
  56 + <div class="portlet-body">
  57 + <div ui-view="busLineInfoStat_list"></div>
  58 +
  59 + </div>
  60 + </div>
  61 + </div>
  62 +</div>
src/main/resources/static/pages/scheduleApp/module/core/busLineInfoStat/list.html 0 → 100644
  View file @93b233a
  1 +<div ng-controller="BusLineInfoStatCtrl as ctrl">
  2 + <table class="table table-striped table-bordered table-hover table-checkable order-column" id="busConfigInfoTable">
  3 + <thead>
  4 + <tr role="row" class="heading">
  5 + <th>
  6 + <input type="checkbox" class="group-checkable" data-set="#busConfigInfoTable.checkboxes"/>
  7 + </th>
  8 + <th>线路名称</th>
  9 + <th>线路编号</th>
  10 + <th>公司</th>
  11 + <th>分公司</th>
  12 +
  13 + <th>配车数</th>
  14 + <th>人员数</th>
  15 + <th>路牌数</th>
  16 + <th>套跑数</th>
  17 + <th>时刻表数</th>
  18 + <th>排班规则数</th>
  19 + <th>排班计划数</th>
  20 + <th width="14%">操作</th>
  21 + </tr>
  22 + <tr role="row" class="filter">
  23 + <td></td>
  24 + <td></td>
  25 + <td></td>
  26 + <td></td>
  27 + <td></td>
  28 + <td></td>
  29 + <td></td>
  30 + <td></td>
  31 + <td></td>
  32 + <td></td>
  33 + <td></td>
  34 + <td></td>
  35 + <td>
  36 + <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
  37 + ng-click="ctrl.pageChanaged()">
  38 + <i class="fa fa-search"></i> 搜索</button>
  39 +
  40 + <button class="btn btn-sm red btn-outline filter-cancel"
  41 + ng-click="ctrl.resetSearchCondition()">
  42 + <i class="fa fa-times"></i> 重置</button>
  43 + </td>
  44 + </tr>
  45 + </thead>
  46 + <tbody>
  47 + <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
  48 + <td>
  49 + <input type="checkbox" class="checkboxes"/>
  50 + </td>
  51 + <td>
  52 + <span ng-bind="info.xlName"></span>
  53 + </td>
  54 + <td>
  55 + <span ng-bind="info.xlBm"></span>
  56 + </td>
  57 + <td>
  58 + <span ng-bind="info.gsName"></span>
  59 + </td>
  60 + <td>
  61 + <span ng-bind="info.fgsName"></span>
  62 + </td>
  63 +
  64 + <td>
  65 + <span ng-bind="info.pcCount"></span>
  66 + </td>
  67 + <td>
  68 + <span ng-bind="info.ryCount"></span>
  69 + </td>
  70 + <td>
  71 + <span ng-bind="info.lpCount"></span>
  72 + </td>
  73 + <td>
  74 + <span ng-bind="info.tpCount"></span>
  75 + </td>
  76 + <td>
  77 + <span ng-bind="info.ttCount"></span>
  78 + </td>
  79 + <td>
  80 + <span ng-bind="info.srCount"></span>
  81 + </td>
  82 + <td>
  83 + <span ng-bind="info.spCount"></span>
  84 + </td>
  85 + <td>
  86 + <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
  87 + <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
  88 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 详细 </a>
  89 + <a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改 </a>
  90 + </td>
  91 + </tr>
  92 + </tbody>
  93 + </table>
  94 +
  95 + <div style="text-align: right;">
  96 + <uib-pagination total-items="ctrl.pageInfo.totalItems"
  97 + ng-model="ctrl.pageInfo.currentPage"
  98 + ng-change="ctrl.pageChanaged()"
  99 + rotate="false"
  100 + max-size="10"
  101 + boundary-links="true"
  102 + first-text="首页"
  103 + previous-text="上一页"
  104 + next-text="下一页"
  105 + last-text="尾页">
  106 + </uib-pagination>
  107 + </div>
  108 +
  109 +</div>
0 \ No newline at end of file 110 \ No newline at end of file
src/main/resources/static/pages/scheduleApp/module/main.js
  View file @93b233a
@@ -598,12 +598,38 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi @@ -598,12 +598,38 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
598 } 598 }
599 }) 599 })
600 600
  601 + // 线路运营概览模块
  602 + .state("busLineInfoStat", {
  603 + url: '/busLineInfoStat',
  604 + views: {
  605 + "": {
  606 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/index.html'
  607 + },
  608 + "busLineInfoStat_list@busLineInfoStat": {
  609 + templateUrl: 'pages/scheduleApp/module/core/busLineInfoStat/list.html'
  610 + }
  611 + },
  612 +
  613 + resolve: {
  614 + deps: ['$ocLazyLoad', function($ocLazyLoad) {
  615 + return $ocLazyLoad.load({
  616 + name: 'busLineInfoStat_module',
  617 + insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
  618 + files: [
  619 + "pages/scheduleApp/module/core/busLineInfoStat/busLineInfoStat.js"
  620 + ]
  621 + });
  622 + }]
  623 + }
  624 + })
  625 +
601 626
602 627
603 628
604 629
605 // TODO: 630 // TODO:
606 631
  632 + ;
607 }]); 633 }]);
608 634
609 // 全局service放置在此处， 635 // 全局service放置在此处，
@@ -807,14 +833,21 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource @@ -807,14 +833,21 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource
807 } 833 }
808 }]); 834 }]);
809 835
810 -  
811 -  
812 -  
813 -  
814 -  
815 -  
816 -  
817 - 836 +// 线路运营统计service
  837 +angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
  838 + return $resource(
  839 + '/bic/:id',
  840 + {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
  841 + {
  842 + list: {
  843 + method: 'GET',
  844 + params: {
  845 + page: 0
  846 + }
  847 + }
  848 + }
  849 + );
  850 +}]);
818 851
819 852
820 853