潘钊 / bsth_control · Commits

Commit 5493fdf8fff18aee9bbb7b986011d797f032634f

Authored by 徐烜
1 parent 2c72a7a6

pagebar update

Inline Side-by-side
Showing 25 changed files with 452 additions and 190 deletions
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @5493fdf
... ... @@ -817,19 +817,19 @@ var BaseFun = function() {
817 817 var list = baseF.getBxRcListCollection(map.bxrc);
818 818 // 把班型分配到对应的具体路牌上.
819 819 baseF.bxAlloTotLp(list,cara);
820   - //return {'json':markArray,'bxrcgs':null};
  820 + return {'json':markArray,'bxrcgs':null};
821 821  
822 822  
823   - // 第六步 抽车来满足工时.
824   - var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
825   - // return {'json':tempA,'bxrcgs':null};
826   - // 第七步 确定吃饭时间.
827   - baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
828   - baseF.resizeByPitStopTime(cara , tempA , dataMap);
829   - baseF.updfcno01(tempA,0);
830   - // return {'json':tempA,'bxrcgs':null};
831   - // 确定进出场、早晚例保时间.并返回班次数组集合
832   - return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
  823 + //// 第六步 抽车来满足工时.
  824 + //var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
  825 + //// return {'json':tempA,'bxrcgs':null};
  826 + //// 第七步 确定吃饭时间.
  827 + //baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
  828 + //baseF.resizeByPitStopTime(cara , tempA , dataMap);
  829 + //baseF.updfcno01(tempA,0);
  830 + //// return {'json':tempA,'bxrcgs':null};
  831 + //// 确定进出场、早晚例保时间.并返回班次数组集合
  832 + //return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
833 833 },
834 834  
835 835 markeEatTime : function(list , markArray , cara , saa , dataMap ,map) {
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @5493fdf
1 1 <!-- ui-route busInfoManage.list -->
2 2 <div ng-controller="BusInfoManageListCtrl as ctrl">
3 3 <div class="fixDiv">
4   - <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
  4 + <table class="table fixTable table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7 7 <th style="width:70px;">序号</th>
... ... @@ -121,21 +121,27 @@
121 121 </td>
122 122 </tr>
123 123 </tbody>
124   -
125 124 </table>
126 125 </div>
127 126  
128   - <div style="text-align: right;">
129   - <uib-pagination total-items="ctrl.page()['totalElements']"
130   - ng-model="ctrl.page()['uiNumber']"
131   - ng-change="ctrl.doPage()"
132   - rotate="false"
133   - max-size="10"
134   - boundary-links="true"
135   - first-text="首页"
136   - previous-text="上一页"
137   - next-text="下一页"
138   - last-text="尾页">
139   - </uib-pagination>
  127 + <div class="pageBar">
  128 + <div class="pageBarLeft">
  129 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  130 + </div>
  131 +
  132 + <div class="pageBarRight">
  133 + <uib-pagination total-items="ctrl.page()['totalElements']"
  134 + ng-model="ctrl.page()['uiNumber']"
  135 + ng-change="ctrl.doPage()"
  136 + rotate="false"
  137 + max-size="10"
  138 + boundary-links="true"
  139 + first-text="首页"
  140 + previous-text="上一页"
  141 + next-text="下一页"
  142 + last-text="尾页">
  143 + </uib-pagination>
  144 + </div>
140 145 </div>
  146 +
141 147 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
  View file @5493fdf
... ... @@ -21,7 +21,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
21 21 number: 0, // 后台返回的页码，spring返回从0开始
22 22 content: [],
23 23  
24   - uiNumber: 1 // 页面绑定的页码
  24 + uiNumber: 1, // 页面绑定的页码
  25 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  26 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
25 27 };
26 28  
27 29 // 查询对象
... ... @@ -54,6 +56,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
54 56 currentPage.totalElements = page.totalElements;
55 57 currentPage.number = page.number;
56 58 currentPage.content = page.content;
  59 +
  60 + // 计算当前页开始记录，结束记录
  61 + if (page.numberOfElements && page.numberOfElements > 0) {
  62 + currentPage.uiFromRecord = page.number * 10 + 1;
  63 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  64 + }
57 65 }
58 66 return currentPage;
59 67 },
... ... @@ -63,7 +71,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
63 71 totalElements: 0,
64 72 number: 0,
65 73 content: [],
66   - uiNumber: 1
  74 + uiNumber: 1,
  75 + uiFromRecord: 0,
  76 + uiToRecord: 0
67 77 };
68 78 },
69 79  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 40pt;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 15%;">线路名称</th>
9 9 <th style="width: 10%;">内部编号</th>
10 10 <th style="width: 100px;">启用日期</th>
... ... @@ -57,7 +57,12 @@
57 57 <tbody>
58 58 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
59 59 <td>
60   - <span ng-bind="$index + 1"></span>
  60 + <div>
  61 + <a href="#">
  62 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  63 + {{$index + ctrl.page().number * 10 + 1}}
  64 + </a>
  65 + </div>
61 66 </td>
62 67 <td>
63 68 <span ng-bind="info.xlName"></span>
... ... @@ -110,17 +115,23 @@
110 115 </table>
111 116 </div>
112 117  
113   - <div style="text-align: right;">
114   - <uib-pagination total-items="ctrl.page()['totalElements']"
115   - ng-model="ctrl.page()['uiNumber']"
116   - ng-change="ctrl.doPage()"
117   - rotate="false"
118   - max-size="10"
119   - boundary-links="true"
120   - first-text="首页"
121   - previous-text="上一页"
122   - next-text="下一页"
123   - last-text="尾页">
124   - </uib-pagination>
  118 + <div class="pageBar">
  119 + <div class="pageBarLeft">
  120 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  121 + </div>
  122 +
  123 + <div class="pageBarRight">
  124 + <uib-pagination total-items="ctrl.page()['totalElements']"
  125 + ng-model="ctrl.page()['uiNumber']"
  126 + ng-change="ctrl.doPage()"
  127 + rotate="false"
  128 + max-size="10"
  129 + boundary-links="true"
  130 + first-text="首页"
  131 + previous-text="上一页"
  132 + next-text="下一页"
  133 + last-text="尾页">
  134 + </uib-pagination>
  135 + </div>
125 136 </div>
126 137 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
  View file @5493fdf
... ... @@ -15,7 +15,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
15 15 number: 0, // 后台返回的页码，spring返回从0开始
16 16 content: [],
17 17  
18   - uiNumber: 1 // 页面绑定的页码
  18 + uiNumber: 1, // 页面绑定的页码
  19 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  20 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
19 21 };
20 22  
21 23 // 查询对象
... ... @@ -39,6 +41,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
39 41 currentPage.totalElements = page.totalElements;
40 42 currentPage.number = page.number;
41 43 currentPage.content = page.content;
  44 +
  45 + // 计算当前页开始记录，结束记录
  46 + if (page.numberOfElements && page.numberOfElements > 0) {
  47 + currentPage.uiFromRecord = page.number * 10 + 1;
  48 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  49 + }
42 50 }
43 51 return currentPage;
44 52 },
... ... @@ -48,7 +56,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 56 totalElements: 0,
49 57 number: 0,
50 58 content: [],
51   - uiNumber: 1
  59 + uiNumber: 1,
  60 + uiFromRecord: 0,
  61 + uiToRecord: 0
52 62 };
53 63 }
54 64  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @5493fdf
... ... @@ -146,18 +146,23 @@
146 146 </table>
147 147 </div>
148 148  
  149 + <div class="pageBar">
  150 + <div class="pageBarLeft">
  151 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  152 + </div>
149 153  
150   - <div style="text-align: right;">
151   - <uib-pagination total-items="ctrl.page()['totalElements']"
152   - ng-model="ctrl.page()['uiNumber']"
153   - ng-change="ctrl.doPage()"
154   - rotate="false"
155   - max-size="10"
156   - boundary-links="true"
157   - first-text="首页"
158   - previous-text="上一页"
159   - next-text="下一页"
160   - last-text="尾页">
161   - </uib-pagination>
  154 + <div class="pageBarRight">
  155 + <uib-pagination total-items="ctrl.page()['totalElements']"
  156 + ng-model="ctrl.page()['uiNumber']"
  157 + ng-change="ctrl.doPage()"
  158 + rotate="false"
  159 + max-size="10"
  160 + boundary-links="true"
  161 + first-text="首页"
  162 + previous-text="上一页"
  163 + next-text="下一页"
  164 + last-text="尾页">
  165 + </uib-pagination>
  166 + </div>
162 167 </div>
163 168 </div>
164 169 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @5493fdf
... ... @@ -21,7 +21,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
21 21 number: 0, // 后台返回的页码，spring返回从0开始
22 22 content: [],
23 23  
24   - uiNumber: 1 // 页面绑定的页码
  24 + uiNumber: 1, // 页面绑定的页码
  25 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  26 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
25 27 };
26 28  
27 29 // 查询对象
... ... @@ -54,7 +56,14 @@ angular.module(&#39;ScheduleApp&#39;).factory(
54 56 currentPage.totalElements = page.totalElements;
55 57 currentPage.number = page.number;
56 58 currentPage.content = page.content;
  59 +
  60 + // 计算当前页开始记录，结束记录
  61 + if (page.numberOfElements && page.numberOfElements > 0) {
  62 + currentPage.uiFromRecord = page.number * 10 + 1;
  63 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  64 + }
57 65 }
  66 +
58 67 return currentPage;
59 68 },
60 69 resetStatus: function() {
... ... @@ -63,7 +72,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
63 72 totalElements: 0,
64 73 number: 0,
65 74 content: [],
66   - uiNumber: 1
  75 + uiNumber: 1,
  76 + uiFromRecord: 0,
  77 + uiToRecord: 0
67 78 };
68 79 },
69 80  
... ...
src/main/resources/static/pages/scheduleApp/module/common/main.css
  View file @5493fdf
... ... @@ -40,6 +40,7 @@ form input.ng-valid.ng-dirty.ng-valid-required {
40 40 /* 固定表格，防止内容撑出表格 */
41 41 .fixTable {
42 42 table-layout: fixed;
  43 + margin-bottom: 10px;
43 44 }
44 45  
45 46 /** 内容不换行，多余的用...表示 */
... ... @@ -83,4 +84,22 @@ form input.ng-valid.ng-dirty.ng-valid-required {
83 84 /* 结束时的样式 */
84 85 .uv.ng-enter.ng-enter-active {
85 86 opacity: 1;
  87 +}
  88 +
  89 +/* 分页条样式 */
  90 +.pageBar {
  91 + height: 55px;
  92 + border: solid 1px #ddd;
  93 + background-color: #fafafa;
  94 +
  95 +}
  96 +.pageBar > .pageBarLeft {
  97 + float: left;
  98 + margin-top: 15px;
  99 + margin-left: 5px;
  100 + color: #337ab7;
  101 +}
  102 +.pageBar > .pageBarRight {
  103 + float: right;
  104 + margin-right: 5px;
86 105 }
87 106 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 150px;">线路</th>
9 9 <th style="width: 150px;">内部编号</th>
10 10 <th style="width: 150px;">设备编号</th>
... ... @@ -58,7 +58,12 @@
58 58 <tbody>
59 59 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
60 60 <td>
61   - <span ng-bind="$index + 1"></span>
  61 + <div>
  62 + <a href="#">
  63 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  64 + {{$index + ctrl.page().number * 10 + 1}}
  65 + </a>
  66 + </div>
62 67 </td>
63 68 <td>
64 69 <span ng-bind="info.xl.name"></span>
... ... @@ -96,17 +101,24 @@
96 101 </table>
97 102 </div>
98 103  
99   - <div style="text-align: right;">
100   - <uib-pagination total-items="ctrl.page()['totalElements']"
101   - ng-model="ctrl.page()['uiNumber']"
102   - ng-change="ctrl.doPage()"
103   - rotate="false"
104   - max-size="10"
105   - boundary-links="true"
106   - first-text="首页"
107   - previous-text="上一页"
108   - next-text="下一页"
109   - last-text="尾页">
110   - </uib-pagination>
  104 + <div class="pageBar">
  105 + <div class="pageBarLeft">
  106 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  107 + </div>
  108 +
  109 + <div class="pageBarRight">
  110 + <uib-pagination total-items="ctrl.page()['totalElements']"
  111 + ng-model="ctrl.page()['uiNumber']"
  112 + ng-change="ctrl.doPage()"
  113 + rotate="false"
  114 + max-size="10"
  115 + boundary-links="true"
  116 + first-text="首页"
  117 + previous-text="上一页"
  118 + next-text="下一页"
  119 + last-text="尾页">
  120 + </uib-pagination>
  121 + </div>
111 122 </div>
  123 +
112 124 </div>
113 125 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象
... ... @@ -48,6 +50,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 50 currentPage.totalElements = page.totalElements;
49 51 currentPage.number = page.number;
50 52 currentPage.content = page.content;
  53 +
  54 + // 计算当前页开始记录，结束记录
  55 + if (page.numberOfElements && page.numberOfElements > 0) {
  56 + currentPage.uiFromRecord = page.number * 10 + 1;
  57 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  58 + }
51 59 }
52 60 return currentPage;
53 61 },
... ... @@ -57,7 +65,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
57 65 totalElements: 0,
58 66 number: 0,
59 67 content: [],
60   - uiNumber: 1
  68 + uiNumber: 1,
  69 + uiFromRecord: 0,
  70 + uiToRecord: 0
61 71 };
62 72 },
63 73  
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 150px;">线路</th>
9 9 <th style="width: 80px;">搭班编码</th>
10 10 <th >驾驶员工号</th>
... ... @@ -66,7 +66,12 @@
66 66 <tbody>
67 67 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
68 68 <td>
69   - <span ng-bind="$index + 1"></span>
  69 + <div>
  70 + <a href="#">
  71 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  72 + {{$index + ctrl.page().number * 10 + 1}}
  73 + </a>
  74 + </div>
70 75 </td>
71 76 <td>
72 77 <span ng-bind="info.xl.name"></span>
... ... @@ -107,17 +112,24 @@
107 112 </table>
108 113 </div>
109 114  
110   - <div style="text-align: right;">
111   - <uib-pagination total-items="ctrl.page()['totalElements']"
112   - ng-model="ctrl.page()['uiNumber']"
113   - ng-change="ctrl.doPage()"
114   - rotate="false"
115   - max-size="10"
116   - boundary-links="true"
117   - first-text="首页"
118   - previous-text="上一页"
119   - next-text="下一页"
120   - last-text="尾页">
121   - </uib-pagination>
  115 + <div class="pageBar">
  116 + <div class="pageBarLeft">
  117 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  118 + </div>
  119 +
  120 + <div class="pageBarRight">
  121 + <uib-pagination total-items="ctrl.page()['totalElements']"
  122 + ng-model="ctrl.page()['uiNumber']"
  123 + ng-change="ctrl.doPage()"
  124 + rotate="false"
  125 + max-size="10"
  126 + boundary-links="true"
  127 + first-text="首页"
  128 + previous-text="上一页"
  129 + next-text="下一页"
  130 + last-text="尾页">
  131 + </uib-pagination>
  132 + </div>
122 133 </div>
  134 +
123 135 </div>
124 136 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象类
... ... @@ -48,6 +50,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 50 currentPage.totalElements = page.totalElements;
49 51 currentPage.number = page.number;
50 52 currentPage.content = page.content;
  53 +
  54 + // 计算当前页开始记录，结束记录
  55 + if (page.numberOfElements && page.numberOfElements > 0) {
  56 + currentPage.uiFromRecord = page.number * 10 + 1;
  57 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  58 + }
51 59 }
52 60 return currentPage;
53 61 },
... ... @@ -57,7 +65,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
57 65 totalElements: 0,
58 66 number: 0,
59 67 content: [],
60   - uiNumber: 1
  68 + uiNumber: 1,
  69 + uiFromRecord: 0,
  70 + uiToRecord: 0
61 71 };
62 72 },
63 73  
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px">序号</th>
  7 + <th style="width: 70px">序号</th>
8 8 <th style="width: 150px;">线路</th>
9 9 <th style="width: 100px;">路牌编号</th>
10 10 <th >路牌名称</th>
... ... @@ -54,7 +54,12 @@
54 54 <tbody>
55 55 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
56 56 <td>
57   - <span ng-bind="$index + 1"></span>
  57 + <div>
  58 + <a href="#">
  59 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  60 + {{$index + ctrl.page().number * 10 + 1}}
  61 + </a>
  62 + </div>
58 63 </td>
59 64 <td>
60 65 <span ng-bind="info.xl.name"></span>
... ... @@ -90,17 +95,24 @@
90 95 </table>
91 96 </div>
92 97  
93   - <div style="text-align: right;">
94   - <uib-pagination total-items="ctrl.page()['totalElements']"
95   - ng-model="ctrl.page()['uiNumber']"
96   - ng-change="ctrl.doPage()"
97   - rotate="false"
98   - max-size="10"
99   - boundary-links="true"
100   - first-text="首页"
101   - previous-text="上一页"
102   - next-text="下一页"
103   - last-text="尾页">
104   - </uib-pagination>
  98 + <div class="pageBar">
  99 + <div class="pageBarLeft">
  100 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  101 + </div>
  102 +
  103 + <div class="pageBarRight">
  104 + <uib-pagination total-items="ctrl.page()['totalElements']"
  105 + ng-model="ctrl.page()['uiNumber']"
  106 + ng-change="ctrl.doPage()"
  107 + rotate="false"
  108 + max-size="10"
  109 + boundary-links="true"
  110 + first-text="首页"
  111 + previous-text="上一页"
  112 + next-text="下一页"
  113 + last-text="尾页">
  114 + </uib-pagination>
  115 + </div>
105 116 </div>
  117 +
106 118 </div>
107 119 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
  View file @5493fdf
... ... @@ -15,7 +15,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
15 15 number: 0, // 后台返回的页码，spring返回从0开始
16 16 content: [],
17 17  
18   - uiNumber: 1 // 页面绑定的页码
  18 + uiNumber: 1, // 页面绑定的页码
  19 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  20 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
19 21 };
20 22  
21 23 // 查询对象类
... ... @@ -49,7 +51,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
49 51 totalElements: 0,
50 52 number: 0,
51 53 content: [],
52   - uiNumber: 1
  54 + uiNumber: 1,
  55 + uiFromRecord: 0,
  56 + uiToRecord: 0
53 57 };
54 58 },
55 59 /**
... ... @@ -62,6 +66,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
62 66 currentPage.totalElements = page.totalElements;
63 67 currentPage.number = page.number;
64 68 currentPage.content = page.content;
  69 +
  70 + // 计算当前页开始记录，结束记录
  71 + if (page.numberOfElements && page.numberOfElements > 0) {
  72 + currentPage.uiFromRecord = page.number * 10 + 1;
  73 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  74 + }
65 75 }
66 76 return currentPage;
67 77 },
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/list.html
  View file @5493fdf
... ... @@ -3,7 +3,7 @@
3 3 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
4 4 <thead>
5 5 <tr role="row" class="heading">
6   - <th style="width: 50px;">序号</th>
  6 + <th style="width: 70px;">序号</th>
7 7 <th style="width: 150px;">套跑线路</th>
8 8 <th style="width: 180px">套跑时刻表/路牌</th>
9 9 <th style="width: 100px">套跑类型</th>
... ... @@ -54,7 +54,12 @@
54 54 <tbody>
55 55 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
56 56 <td>
57   - <span ng-bind="$index + 1"></span>
  57 + <div>
  58 + <a href="#">
  59 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  60 + {{$index + ctrl.page().number * 10 + 1}}
  61 + </a>
  62 + </div>
58 63 </td>
59 64 <td>
60 65 <span ng-bind="info.rerunXl.name"></span>
... ... @@ -113,18 +118,24 @@
113 118 </table>
114 119 </div>
115 120  
  121 + <div class="pageBar">
  122 + <div class="pageBarLeft">
  123 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  124 + </div>
116 125  
117   - <div style="text-align: right;">
118   - <uib-pagination total-items="ctrl.page()['totalElements']"
119   - ng-model="ctrl.page()['uiNumber']"
120   - ng-change="ctrl.doPage()"
121   - rotate="false"
122   - max-size="10"
123   - boundary-links="true"
124   - first-text="首页"
125   - previous-text="上一页"
126   - next-text="下一页"
127   - last-text="尾页">
128   - </uib-pagination>
  126 + <div class="pageBarRight">
  127 + <uib-pagination total-items="ctrl.page()['totalElements']"
  128 + ng-model="ctrl.page()['uiNumber']"
  129 + ng-change="ctrl.doPage()"
  130 + rotate="false"
  131 + max-size="10"
  132 + boundary-links="true"
  133 + first-text="首页"
  134 + previous-text="上一页"
  135 + next-text="下一页"
  136 + last-text="尾页">
  137 + </uib-pagination>
  138 + </div>
129 139 </div>
  140 +
130 141 </div>
131 142 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象
... ... @@ -39,6 +41,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
39 41 currentPage.totalElements = page.totalElements;
40 42 currentPage.number = page.number;
41 43 currentPage.content = page.content;
  44 +
  45 + // 计算当前页开始记录，结束记录
  46 + if (page.numberOfElements && page.numberOfElements > 0) {
  47 + currentPage.uiFromRecord = page.number * 10 + 1;
  48 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  49 + }
42 50 }
43 51 return currentPage;
44 52 },
... ... @@ -48,7 +56,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 56 totalElements: 0,
49 57 number: 0,
50 58 content: [],
51   - uiNumber: 1
  59 + uiNumber: 1,
  60 + uiFromRecord: 0,
  61 + uiToRecord: 0
52 62 };
53 63 }
54 64 };
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 80px;">线路</th>
9 9 <th style="width: 150px;">日期</th>
10 10 <th style="width: 50px;">路牌</th>
... ... @@ -58,7 +58,12 @@
58 58 <tbody>
59 59 <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
60 60 <td>
61   - <span ng-bind="$index + 1"></span>
  61 + <div>
  62 + <a href="#">
  63 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  64 + {{$index + ctrl.page().number * 10 + 1}}
  65 + </a>
  66 + </div>
62 67 </td>
63 68  
64 69 <td>
... ... @@ -161,17 +166,24 @@
161 166 </table>
162 167 </div>
163 168  
164   - <div style="text-align: right;">
165   - <uib-pagination total-items="ctrl.page()['totalElements']"
166   - ng-model="ctrl.page()['uiNumber']"
167   - ng-change="ctrl.doPage()"
168   - rotate="false"
169   - max-size="10"
170   - boundary-links="true"
171   - first-text="首页"
172   - previous-text="上一页"
173   - next-text="下一页"
174   - last-text="尾页">
175   - </uib-pagination>
  169 + <div class="pageBar">
  170 + <div class="pageBarLeft">
  171 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  172 + </div>
  173 +
  174 + <div class="pageBarRight">
  175 + <uib-pagination total-items="ctrl.page()['totalElements']"
  176 + ng-model="ctrl.page()['uiNumber']"
  177 + ng-change="ctrl.doPage()"
  178 + rotate="false"
  179 + max-size="10"
  180 + boundary-links="true"
  181 + first-text="首页"
  182 + previous-text="上一页"
  183 + next-text="下一页"
  184 + last-text="尾页">
  185 + </uib-pagination>
  186 + </div>
176 187 </div>
  188 +
177 189 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/module.js
  View file @5493fdf
... ... @@ -13,7 +13,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
13 13 number: 0, // 后台返回的页码，spring返回从0开始
14 14 content: [],
15 15  
16   - uiNumber: 1 // 页面绑定的页码
  16 + uiNumber: 1, // 页面绑定的页码
  17 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  18 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
17 19 };
18 20  
19 21 // 查询对象
... ... @@ -32,6 +34,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
32 34 currentPage.totalElements = page.totalElements;
33 35 currentPage.number = page.number;
34 36 currentPage.content = page.content;
  37 +
  38 + // 计算当前页开始记录，结束记录
  39 + if (page.numberOfElements && page.numberOfElements > 0) {
  40 + currentPage.uiFromRecord = page.number * 10 + 1;
  41 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  42 + }
35 43 }
36 44 return currentPage;
37 45 },
... ... @@ -41,7 +49,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
41 49 totalElements: 0,
42 50 number: 0,
43 51 content: [],
44   - uiNumber: 1
  52 + uiNumber: 1,
  53 + uiFromRecord: 0,
  54 + uiToRecord: 0
45 55 };
46 56 }
47 57 };
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 150px;">线路</th>
9 9 <th style="width: 100%;">关联时刻表</th>
10 10 <th style="width: 150px;">排班开始日期</th>
... ... @@ -30,7 +30,7 @@
30 30 </sa-Select5>
31 31 </td>
32 32 <td>
33   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like" placeholder="输入时刻表名称..."/>
  33 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().ttInfoNames_like" placeholder="输入时刻表名称..."/>
34 34 </td>
35 35 <td>
36 36 <div class="input-group">
... ... @@ -77,14 +77,23 @@
77 77 <tbody>
78 78 <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
79 79 <td>
80   - <span ng-bind="$index + 1"></span>
  80 + <div>
  81 + <a href="#">
  82 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  83 + {{$index + ctrl.page().number * 10 + 1}}
  84 + </a>
  85 + </div>
81 86 </td>
82 87 <td>
83 88 <span ng-bind="info.xl.name"></span>
84 89 </td>
85 90 <td>
86 91 <div ng-repeat="tinfo in info.rst">
87   - <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : tinfo.ttInfoId, xlname: info.xl.name, ttname : tinfo.ttInfoName, rflag : true})">
  92 + <a tooltip-animation="false"
  93 + tooltip-placement="top"
  94 + uib-tooltip="{{tinfo.ttInfoName}}"
  95 + tooltip-class="headClass"
  96 + ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : tinfo.ttInfoId, xlname: info.xl.name, ttname : tinfo.ttInfoName, rflag : true})">
88 97 <i class="fa fa-table" aria-hidden="true"></i>
89 98 {{tinfo.ttInfoName}}
90 99 </a>
... ... @@ -135,18 +144,24 @@
135 144 </table>
136 145 </div>
137 146  
  147 + <div class="pageBar">
  148 + <div class="pageBarLeft">
  149 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  150 + </div>
138 151  
139   - <div style="text-align: right;">
140   - <uib-pagination total-items="ctrl.page()['totalElements']"
141   - ng-model="ctrl.page()['uiNumber']"
142   - ng-change="ctrl.doPage()"
143   - rotate="false"
144   - max-size="10"
145   - boundary-links="true"
146   - first-text="首页"
147   - previous-text="上一页"
148   - next-text="下一页"
149   - last-text="尾页">
150   - </uib-pagination>
  152 + <div class="pageBarRight">
  153 + <uib-pagination total-items="ctrl.page()['totalElements']"
  154 + ng-model="ctrl.page()['uiNumber']"
  155 + ng-change="ctrl.doPage()"
  156 + rotate="false"
  157 + max-size="10"
  158 + boundary-links="true"
  159 + first-text="首页"
  160 + previous-text="上一页"
  161 + next-text="下一页"
  162 + last-text="尾页">
  163 + </uib-pagination>
  164 + </div>
151 165 </div>
  166 +
152 167 </div>
153 168 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象
... ... @@ -39,6 +41,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
39 41 currentPage.totalElements = page.totalElements;
40 42 currentPage.number = page.number;
41 43 currentPage.content = page.content;
  44 +
  45 + // 计算当前页开始记录，结束记录
  46 + if (page.numberOfElements && page.numberOfElements > 0) {
  47 + currentPage.uiFromRecord = page.number * 10 + 1;
  48 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  49 + }
42 50 }
43 51 return currentPage;
44 52 },
... ... @@ -48,7 +56,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 56 totalElements: 0,
49 57 number: 0,
50 58 content: [],
51   - uiNumber: 1
  59 + uiNumber: 1,
  60 + uiFromRecord: 0,
  61 + uiToRecord: 0
52 62 };
53 63 }
54 64  
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
  View file @5493fdf
... ... @@ -16,7 +16,7 @@
16 16 style="width: 1600px; min-height: 500px;">
17 17 <thead>
18 18 <tr role="row" class="heading">
19   - <th style="width: 50px;">序号</th>
  19 + <th style="width: 70px;">序号</th>
20 20 <th style="width: 80px;">操作</th>
21 21 <th style="width: 180px;">线路</th>
22 22 <th style="width: 180px">日期</th>
... ... @@ -75,7 +75,12 @@
75 75 <tbody>
76 76 <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
77 77 <td>
78   - <span ng-bind="$index + 1"></span>
  78 + <div>
  79 + <a href="#">
  80 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  81 + {{$index + 1}}
  82 + </a>
  83 + </div>
79 84 </td>
80 85 <td>
81 86 <a ui-sref="schedulePlanInfoExtFormManage_edit({xlId: info.xlId, xlName: info.xlName, sd: info.scheduleDate, lpId: info.lpId, lpName: info.lpName})" class="btn btn-info btn-sm" > 修改 </a>
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
  View file @5493fdf
... ... @@ -3,7 +3,7 @@
3 3 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
4 4 <thead>
5 5 <tr role="row" class="heading">
6   - <th style="width: 5%;">序号</th>
  6 + <th style="width: 70px;">序号</th>
7 7 <th style="width: 15%;">线路</th>
8 8 <th style="width: 15%;">修改人/修改时间</th>
9 9 <th style="width: 10%;">启用日期</th>
... ... @@ -58,7 +58,12 @@
58 58 <tbody>
59 59 <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
60 60 <td>
61   - <span ng-bind="$index + 1"></span>
  61 + <div>
  62 + <a href="#">
  63 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  64 + {{$index + ctrl.page().number * 10 + 1}}
  65 + </a>
  66 + </div>
62 67 </td>
63 68 <td>
64 69 <span ng-bind="info.xl.name"></span>
... ... @@ -132,18 +137,24 @@
132 137 </table>
133 138 </div>
134 139  
  140 + <div class="pageBar">
  141 + <div class="pageBarLeft">
  142 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  143 + </div>
135 144  
136   - <div style="text-align: right;">
137   - <uib-pagination total-items="ctrl.page()['totalElements']"
138   - ng-model="ctrl.page()['uiNumber']"
139   - ng-change="ctrl.doPage()"
140   - rotate="false"
141   - max-size="10"
142   - boundary-links="true"
143   - first-text="首页"
144   - previous-text="上一页"
145   - next-text="下一页"
146   - last-text="尾页">
147   - </uib-pagination>
  145 + <div class="pageBarRight">
  146 + <uib-pagination total-items="ctrl.page()['totalElements']"
  147 + ng-model="ctrl.page()['uiNumber']"
  148 + ng-change="ctrl.doPage()"
  149 + rotate="false"
  150 + max-size="10"
  151 + boundary-links="true"
  152 + first-text="首页"
  153 + previous-text="上一页"
  154 + next-text="下一页"
  155 + last-text="尾页">
  156 + </uib-pagination>
  157 + </div>
148 158 </div>
  159 +
149 160 </div>
150 161 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象
... ... @@ -44,6 +46,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
44 46 currentPage.totalElements = page.totalElements;
45 47 currentPage.number = page.number;
46 48 currentPage.content = page.content;
  49 +
  50 + // 计算当前页开始记录，结束记录
  51 + if (page.numberOfElements && page.numberOfElements > 0) {
  52 + currentPage.uiFromRecord = page.number * 10 + 1;
  53 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  54 + }
47 55 }
48 56 return currentPage;
49 57 },
... ... @@ -53,7 +61,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
53 61 totalElements: 0,
54 62 number: 0,
55 63 content: [],
56   - uiNumber: 1
  64 + uiNumber: 1,
  65 + uiFromRecord: 0,
  66 + uiToRecord: 0
57 67 };
58 68 },
59 69  
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
  View file @5493fdf
... ... @@ -4,7 +4,7 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 50px;">序号</th>
  7 + <th style="width: 70px;">序号</th>
8 8 <th style="width: 150px;">线路</th>
9 9 <th style="width: 180px;">时刻表名称</th>
10 10 <th style="width: 80px">上下行</th>
... ... @@ -61,13 +61,26 @@
61 61 <tbody>
62 62 <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
63 63 <td>
64   - <span ng-bind="$index + 1"></span>
  64 + <div>
  65 + <a href="#">
  66 + <i class="fa fa-list-ol" aria-hidden="true"></i>
  67 + {{$index + ctrl.page().number * 10 + 1}}
  68 + </a>
  69 + </div>
65 70 </td>
66 71 <td>
67 72 <span ng-bind="info.xl.name"></span>
68 73 </td>
69 74 <td>
70   - <span ng-bind="info.name" title="{{info.name}}"></span>
  75 + <div>
  76 + <a href="#"
  77 + tooltip-animation="false"
  78 + tooltip-placement="top"
  79 + uib-tooltip="{{info.name}}"
  80 + tooltip-class="headClass">
  81 + {{info.name}}
  82 + </a>
  83 + </div>
71 84 </td>
72 85 <td>
73 86 <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
... ... @@ -134,17 +147,24 @@
134 147 </table>
135 148 </div>
136 149  
137   - <div style="text-align: right;">
138   - <uib-pagination total-items="ctrl.page()['totalElements']"
139   - ng-model="ctrl.page()['uiNumber']"
140   - ng-change="ctrl.doPage()"
141   - rotate="false"
142   - max-size="10"
143   - boundary-links="true"
144   - first-text="首页"
145   - previous-text="上一页"
146   - next-text="下一页"
147   - last-text="尾页">
148   - </uib-pagination>
  150 + <div class="pageBar">
  151 + <div class="pageBarLeft">
  152 + {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
  153 + </div>
  154 +
  155 + <div class="pageBarRight">
  156 + <uib-pagination total-items="ctrl.page()['totalElements']"
  157 + ng-model="ctrl.page()['uiNumber']"
  158 + ng-change="ctrl.doPage()"
  159 + rotate="false"
  160 + max-size="10"
  161 + boundary-links="true"
  162 + first-text="首页"
  163 + previous-text="上一页"
  164 + next-text="下一页"
  165 + last-text="尾页">
  166 + </uib-pagination>
  167 + </div>
149 168 </div>
  169 +
150 170 </div>
151 171 \ No newline at end of file
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
  View file @5493fdf
... ... @@ -14,7 +14,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
14 14 number: 0, // 后台返回的页码，spring返回从0开始
15 15 content: [],
16 16  
17   - uiNumber: 1 // 页面绑定的页码
  17 + uiNumber: 1, // 页面绑定的页码
  18 + uiFromRecord: 0, // 页面绑定，当前页第几条记录
  19 + uiToRecord: 0 // 页面绑定，当前页到第几条记录
18 20 };
19 21  
20 22 // 查询对象类
... ... @@ -39,6 +41,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
39 41 currentPage.totalElements = page.totalElements;
40 42 currentPage.number = page.number;
41 43 currentPage.content = page.content;
  44 +
  45 + // 计算当前页开始记录，结束记录
  46 + if (page.numberOfElements && page.numberOfElements > 0) {
  47 + currentPage.uiFromRecord = page.number * 10 + 1;
  48 + currentPage.uiToRecord = page.number * 10 + page.numberOfElements;
  49 + }
42 50 }
43 51 return currentPage;
44 52 },
... ... @@ -48,7 +56,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(
48 56 totalElements: 0,
49 57 number: 0,
50 58 content: [],
51   - uiNumber: 1
  59 + uiNumber: 1,
  60 + uiFromRecord: 0,
  61 + uiToRecord: 0
52 62 };
53 63 },
54 64 /**
... ...