潘钊 / bsth_control · Commits

Commit 235222054cad23c0e094a0204e04c816f8303c87

Authored by 徐烜
1 parent b44ee184
build: skipped

p1_0623

Inline Side-by-side
Showing 3 changed files with 14 additions and 4 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
  View file @2352220
@@ -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: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'}, 523 + {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,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 @2352220
@@ -84,10 +84,20 @@ @@ -84,10 +84,20 @@
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 - <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span> 87 + <a href="#" ng-if="info.xlDir == '0'">
  88 + <i class="fa fa-arrow-up" aria-hidden="true"></i>
  89 + <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
  90 + </a>
  91 + <a href="#" ng-if="info.xlDir == '1'">
  92 + <i class="fa fa-arrow-circle-down" aria-hidden="true"></i>
  93 + <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
  94 + </a>
88 </td> 95 </td>
89 <td> 96 <td>
90 - <span ng-bind="info.fcsj"></span> 97 + <a href="#">
  98 + <i class="fa fa-clock-o" aria-hidden="true"></i>
  99 + <span ng-bind="info.fcsj"></span>
  100 + </a>
91 </td> 101 </td>
92 <td> 102 <td>
93 <a href="#" 103 <a href="#"
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/service.js
  View file @2352220
@@ -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: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id'}, 67 + {order: 'xl,scheduleDate,lp,xlDir,fcno', direction: 'ASC,ASC,ASC,ASC,ASC', id: '@id'},
68 { 68 {
69 list: { 69 list: {
70 method: 'GET', 70 method: 'GET',