Update

徐烜
1 parent ea927fc8
Showing 3 changed files with 22 additions and 16 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
-//所有模块service配置
+//所有模块service配置
 // 车辆信息service
 angular.module('ScheduleApp').factory(
     'BusInfoManageService_g',
@@ -79,7 +79,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
@@ -119,7 +119,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;DeviceInfoManageService_g&#39;, [&#39;$resource&#39;,
             }
         }
     );
-}]);
+}]);
 // 人员信息service
 angular.module('ScheduleApp').factory(
     'EmployeeInfoManageService_g',
@@ -183,7 +183,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
 );
-
+
 // 车辆配置service
 angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', 'UserPrincipal', function($resource, UserPrincipal) {
     return {
@@ -238,7 +238,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, &#39;UserP
             }
         )
     };
-}]);
+}]);
 // 线路运营统计service
 angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
     return $resource(
@@ -254,7 +254,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusLineInfoStatService_g&#39;, [&#39;$resource&#39;, 
         }
     );
 }]);
-
+
 // 人员配置service
 angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
     return {
@@ -338,7 +338,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
             }
         )
     };
-}]);
+}]);
 // 路牌管理service
 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
     return {
@@ -411,7 +411,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
             }
         )
     };
-}]);
+}]);
 // 套跑管理service
 angular.module('ScheduleApp').factory('rerunManageService_g', ['$resource', function($resource) {
     return {
@@ -453,7 +453,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
             }
         )
     };
-}]);
+}]);
 // 排班计划管理service
 angular.module('ScheduleApp').factory('SchedulePlanManageService_g', ['$resource', function($resource) {
     return {
@@ -612,13 +612,13 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     };
-}]);
+}]);
 // 排班管理service
 angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
     return {
         rest: $resource(
             '/sr1fc/:id',
-            {order: 'xl.id,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,ASC', id: '@id'},
+            {order: 'xl.id,fbtype,updateDate,carConfigInfo.cl.insideCode', direction: 'ASC,DESC,DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -671,7 +671,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
         )
     };
 }]);
-
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory(
     'TTInfoManageService_g',
@@ -838,7 +838,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
+);
 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
 // 文件下载服务
@@ -56,7 +56,8 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']"
+                ng-class="{odd: true, gradeX: true, info: ctrl.isFBGSMODE(info.fbtype), 'row-active': ctrl.isFBGSMODE(info.fbtype)}">
                 <td>
                     <div>
                         <a href="#">
@@ -107,7 +108,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.ryDbbms}}"
                        tooltip-class="headClass">
                         {{info.ryDbbms}}
@@ -116,7 +117,7 @@
                 <td>
                     <a href="#"
                        tooltip-animation="false"
-                       tooltip-placement="top"
+                       tooltip-placement="left-top"
                        uib-tooltip="{{info.fbgs}}"
                        tooltip-class="headClass">
                         {{info.fbgs}}
@@ -245,6 +245,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.doPage();
+            // 是否是翻班格式模式
+            self.isFBGSMODE = function(type) {
+                return type == "FBGSMODE";
+            }
+
         }
     ]
 );