计划调度功能增加

1、编辑时刻表的预览模式中，添加一列显示班次的行驶时间

计划调度功能增加
1、编辑时刻表的预览模式中，添加一列显示班次的行驶时间
徐烜
1 parent 32fa7e2f
Showing 7 changed files with 138 additions and 124 deletions
src/main/resources/application-dev.properties
src/main/resources/application.properties
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreView.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreViewTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js
@@ -8,10 +8,10 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.url= jdbc:mysql://192.168.168.240:3306/jd_control_test?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url= jdbc:mysql://192.168.168.240:3306/jd_control_test?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -32,4 +32,4 @@ http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
 http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -159,6 +159,7 @@ angular.module(&quot;ScheduleApp&quot;).directive(
                             // 构造内部班次对象
                             _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
                             _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
+                            _internalBcObj.xxsj = bcObj.bcsj; // 行驶时间
                             _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
                             _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
                             _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
@@ -323,4 +324,4 @@ angular.module(&quot;ScheduleApp&quot;).directive(
             };
         }
     ]
-);
 \ No newline at end of file
+);
@@ -135,10 +135,14 @@
         height: 34px;
     }
     .ttpv_table_head dl dt:nth-of-type(4) {
-        width: 100px;
+        width: 80px;
         height: 34px;
     }
     .ttpv_table_head dl dt:nth-of-type(5) {
+        width: 80px;
+        height: 34px;
+    }
+    .ttpv_table_head dl dt:nth-of-type(6) {
         width: 200px;
         height: 34px;
     }
@@ -186,10 +190,14 @@
         text-align: left;
     }
     .ttpv_table_body dl dd:nth-of-type(4) {
-        width: 100px;
+        width: 80px;
         height: 30px;
     }
     .ttpv_table_body dl dd:nth-of-type(5) {
+        width: 80px;
+        height: 30px;
+    }
+    .ttpv_table_body dl dd:nth-of-type(6) {
         width: 200px;
         height: 30px;
     }
@@ -269,6 +277,7 @@
                                             <dt>路牌</dt>
                                             <dt>发车时间</dt>
                                             <dt>到达时间</dt>
+                                            <dt>行驶时间</dt>
                                             <dt>备注</dt>
                                         </dl>
                                     </div>
@@ -298,6 +307,9 @@
                                             <dd ng-class="{isClick : bc.isClick}">
                                                 {{bc.ddsj}}
                                             </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.xxsj}}
+                                            </dd>
                                             <dd ng-class="{isClick : bc.isClick}">{{bc.remark}}</dd>
                                         </dl>
                                     </div>
@@ -326,6 +338,7 @@
                                             <dt>路牌</dt>
                                             <dt>发车时间</dt>
                                             <dt>到达时间</dt>
+                                            <dt>行驶时间</dt>
                                             <dt>备注</dt>
                                         </dl>
                                     </div>
@@ -355,6 +368,9 @@
                                             <dd ng-class="{isClick : bc.isClick}">
                                                 {{bc.ddsj}}
                                             </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.xxsj}}
+                                            </dd>
                                             <dd ng-class="{isClick : bc.isClick}">{{bc.remark}}</dd>
                                         </dl>
                                     </div>
@@ -4571,6 +4571,7 @@ angular.module(&quot;ScheduleApp&quot;).directive(
                             // 构造内部班次对象
                             _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
                             _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
+                            _internalBcObj.xxsj = bcObj.bcsj; // 行驶时间
                             _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
                             _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
                             _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
@@ -4735,7 +4736,8 @@ angular.module(&quot;ScheduleApp&quot;).directive(
             };
         }
     ]
-);
+);
+
 /**
  * 滚动事件控制指令。
  */
-//所有模块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 {
@@ -621,7 +621,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     };
-}]);
+}]);
 // 排班管理service
 angular.module('ScheduleApp').factory('ScheduleRuleManageService_g', ['$resource', function($resource) {
     return {
@@ -680,7 +680,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;ScheduleRuleManageService_g&#39;, [&#39;$resource
         )
     };
 }]);
-
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory(
     'TTInfoManageService_g',
@@ -898,57 +898,54 @@ angular.module(&#39;ScheduleApp&#39;).factory(
         }
     ]
-);
-
-// 用户登录日志service
-angular.module('ScheduleApp').factory(
-    "UserSignManageService_g",
-    [
-        '$resource',
-        function($resource) {
-            return {
-                rest: $resource(
-                    "/logger_user_sign/:id",
-                    {id: '@id'},
-                    {
-                        list: {
-                            method: 'GET',
-                            params: {
-                                page: 0
-                            },
-                            transformResponse: function(rs) {
-                                var dst = angular.fromJson(rs);
-                                if (dst.status == 'SUCCESS') {
-                                    return dst.data;
-                                } else {
-                                    return dst; // 业务错误留给控制器处理
-                                }
-                            }
-                        }
-                    }
-                ),
-                dataTools: $resource(
-                    '/logger_user_sign/:type',
-                    {},
-                    {
-                        dataExport: {
-                            method: 'GET',
-                            responseType: "arraybuffer",
-                            params: {
-                                type: "exportFile"
-                            },
-                            transformResponse: function(data, headers){
-                                return {data : data};
-                            }
-                        }
-                    }
-                )
-            };
-        }
-    ]
-);
-
-
+);
+// 用户登录日志service
+angular.module('ScheduleApp').factory(
+    "UserSignManageService_g",
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest: $resource(
+                    "/logger_user_sign/:id",
+                    {id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        }
+                    }
+                ),
+                dataTools: $resource(
+                    '/logger_user_sign/:type',
+                    {},
+                    {
+                        dataExport: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            params: {
+                                type: "exportFile"
+                            },
+                            transformResponse: function(data, headers){
+                                return {data : data};
+                            }
+                        }
+                    }
+                )
+            };
+        }
+    ]
+);
 // 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
 // 文件下载服务
@@ -91,7 +91,7 @@ ScheduleApp.config([
                 }
             })
     }
-]);
+]);
 // ui route 配置
 /** 车辆设备信息模块配置route */
@@ -185,7 +185,7 @@ ScheduleApp.config([
             })
     }
-]);
+]);
 // ui route 配置
 /** 人员基础信息模块配置route */
@@ -279,7 +279,7 @@ ScheduleApp.config([
                 }
             })
-}]);
+}]);
 // ui route 配置
 /** 车辆配置模块页面route */
@@ -376,7 +376,7 @@ ScheduleApp.config([
 ]);
-
+
 // ui route 配置
 /** 线路运营概览配置route */
@@ -413,7 +413,7 @@ ScheduleApp.config([
             });
     }
-]);
+]);
 // ui route 配置
 /** 人员配置模块页面route */
@@ -508,7 +508,7 @@ ScheduleApp.config([
             })
     }
-]);
+]);
 // ui route 配置
 /** 路牌管理配置所有模块页面route */
@@ -603,7 +603,7 @@ ScheduleApp.config([
             })
-}]);
+}]);
 // ui route 配置
 /** 套跑管理模块配置页面route */
@@ -696,7 +696,7 @@ ScheduleApp.config([
                 }
             })
     }
-]);
+]);
 // ui route 配置
 /** 排班计划管理配置route */
@@ -758,7 +758,7 @@ ScheduleApp.config([
     }
-]);
+]);
 // ui route 配置
 /** 排班计划明细配置route */
@@ -814,7 +814,7 @@ ScheduleApp.config([
             });
     }
-]);
+]);
 // ui route 配置
 /** 排班调度值勤日报配置route */
@@ -876,7 +876,7 @@ ScheduleApp.config([
             });
     }
-]);
+]);
 // ui route 配置
 /** 排班调度值勤日报配置route */
@@ -934,7 +934,7 @@ ScheduleApp.config([
             });
     }
-]);
+]);
 // ui route 配置
 /** 排班规则模块配置route */
@@ -1028,7 +1028,7 @@ ScheduleApp.config([
                 }
             })
     }
-]);
+]);
 // ui route 配置
 /** 时刻表管理配置route */
@@ -1140,7 +1140,7 @@ ScheduleApp.config([
     }
-]);
+]);
 // ui route 配置
 /** 时刻表编辑管理配置route */
@@ -1287,47 +1287,45 @@ ScheduleApp.config([
         ;
     }
-]);
-// ui route 配置
-
-
-/** 用户登录日志模块配置route */
-ScheduleApp.config([
-    '$stateProvider',
-    '$urlRouterProvider',
-    function($stateProvider, $urlRouterProvider) {
-        $stateProvider
-            .state("userSignManage", { // index页面
-                url: "/userSignManage",
-                views: {
-                    "": {
-                        templateUrl: "pages/scheduleApp/module/sys/userSignManage/index.html"
-                    },
-                    "userSignManage_list@userSignManage": {
-                        templateUrl: "pages/scheduleApp/module/sys/userSignManage/list.html"
-                    }
-                },
-
-                resolve: {
-                    deps: ["$ocLazyLoad", function($ocLazyLoad) {
-                        return $ocLazyLoad.load({
-                            name: 'userSignManage_module',
-                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
-                            files: [
-                                "assets/bower_components/angular-ui-select/dist/select.min.css",
-                                "assets/bower_components/angular-ui-select/dist/select.min.js",
-                                "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
-                                "pages/scheduleApp/module/sys/userSignManage/module.js"
-                            ]
-                        });
-                    }]
-                }
-            })
-    }
-]);
+]);
+// ui route 配置
+
+/** 用户登录日志模块配置route */
+ScheduleApp.config([
+    '$stateProvider',
+    '$urlRouterProvider',
+    function($stateProvider, $urlRouterProvider) {
+        $stateProvider
+            .state("userSignManage", { // index页面
+                url: "/userSignManage",
+                views: {
+                    "": {
+                        templateUrl: "pages/scheduleApp/module/sys/userSignManage/index.html"
+                    },
+                    "userSignManage_list@userSignManage": {
+                        templateUrl: "pages/scheduleApp/module/sys/userSignManage/list.html"
+                    }
+                },
+
+                resolve: {
+                    deps: ["$ocLazyLoad", function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'userSignManage_module',
+                            insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                            files: [
+                                "assets/bower_components/angular-ui-select/dist/select.min.css",
+                                "assets/bower_components/angular-ui-select/dist/select.min.js",
+                                "assets/bower_components/angular-file-upload/dist/angular-file-upload.min.js",
+                                "pages/scheduleApp/module/sys/userSignManage/module.js"
+                            ]
+                        });
+                    }]
+                }
+            })
+    }
+]);
 // ui route 配置
-
 /** 时刻表管理配置route */
 ScheduleApp.config([
     '$stateProvider',