潘钊 / bsth_control · Commits

Commit 7ae37be10558bb99ee54e8d33e440b17de566e15

Authored by 徐烜
1 parent 931d141f

Update

Inline Side-by-side
Showing 3 changed files with 24 additions and 11 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @7ae37be
@@ -520,7 +520,7 @@ angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$reso @@ -520,7 +520,7 @@ angular.module('ScheduleApp').factory('SchedulePlanInfoManageService_g', ['$reso
520 return { 520 return {
521 rest : $resource( 521 rest : $resource(
522 '/spic/:id', 522 '/spic/:id',
523 - {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'}, 523 + {order: 'xl,scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC,ASC', id: '@id'},
524 { 524 {
525 list: { 525 list: {
526 method: 'GET', 526 method: 'GET',
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
  View file @7ae37be
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <th style="width: 120px;">驾驶员（工号）</th> 12 <th style="width: 120px;">驾驶员（工号）</th>
13 <!--<th style="width: 120px;">售票员（工号）</th>--> 13 <!--<th style="width: 120px;">售票员（工号）</th>-->
14 <th style="width: 80px;">班次类型</th> 14 <th style="width: 80px;">班次类型</th>
15 - <th style="width: 80px;">上下行</th>  
16 <th style="width: 80px;">发车时间</th> 15 <th style="width: 80px;">发车时间</th>
  16 + <th style="width: 80px;">上下行</th>
17 <th style="width: 80px;">起点站</th> 17 <th style="width: 80px;">起点站</th>
18 <th style="width: 80px;">终点站</th> 18 <th style="width: 80px;">终点站</th>
19 <th style="width: 60px">备注</th> 19 <th style="width: 60px">备注</th>
@@ -84,6 +84,12 @@ @@ -84,6 +84,12 @@
84 <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span> 84 <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span>
85 </td> 85 </td>
86 <td> 86 <td>
  87 + <a href="#">
  88 + <i class="fa fa-clock-o" aria-hidden="true"></i>
  89 + <span ng-bind="info.fcsj"></span>
  90 + </a>
  91 + </td>
  92 + <td>
87 <a href="#" ng-if="info.xlDir == '0'"> 93 <a href="#" ng-if="info.xlDir == '0'">
88 <i class="fa fa-arrow-up" aria-hidden="true"></i> 94 <i class="fa fa-arrow-up" aria-hidden="true"></i>
89 <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span> 95 <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
@@ -94,12 +100,6 @@ @@ -94,12 +100,6 @@
94 </a> 100 </a>
95 </td> 101 </td>
96 <td> 102 <td>
97 - <a href="#">  
98 - <i class="fa fa-clock-o" aria-hidden="true"></i>  
99 - <span ng-bind="info.fcsj"></span>  
100 - </a>  
101 - </td>  
102 - <td>  
103 <a href="#" 103 <a href="#"
104 tooltip-animation="false" 104 tooltip-animation="false"
105 tooltip-placement="top" 105 tooltip-placement="top"
@@ -136,10 +136,23 @@ @@ -136,10 +136,23 @@
136 </a> 136 </a>
137 </td> 137 </td>
138 <td> 138 <td>
139 - <span ng-bind="info.updateBy.userName"></span> 139 + <a href="#"
  140 + tooltip-animation="false"
  141 + tooltip-placement="top"
  142 + uib-tooltip="{{info.updateBy.userName}}"
  143 + tooltip-class="headClass">
  144 + <i class="fa fa-user"></i>
  145 + <span ng-bind="info.updateBy.userName"></span>
  146 + </a>
140 </td> 147 </td>
141 <td> 148 <td>
142 - <span ng-bind="info.updateDate | date: 'yyyy-MM-dd'"></span> 149 + <a href="#"
  150 + tooltip-animation="false"
  151 + tooltip-placement="left"
  152 + uib-tooltip="{{info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'}}"
  153 + tooltip-class="headClass">
  154 + <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  155 + </a>
143 </td> 156 </td>
144 157
145 </tr> 158 </tr>
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/service.js
  View file @7ae37be
@@ -64,7 +64,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso @@ -64,7 +64,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
64 return { 64 return {
65 rest : $resource( 65 rest : $resource(
66 '/spic/:id', 66 '/spic/:id',
67 - {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'}, 67 + {order: 'xl,scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC,ASC', id: '@id'},
68 { 68 {
69 list: { 69 list: {
70 method: 'GET', 70 method: 'GET',