Update

徐烜
1 parent 053547e4
Showing 10 changed files with 241 additions and 181 deletions
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
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/route.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/service.js
src/test/resources/testdata/problem.properties
@@ -486,12 +486,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id_route'},
+            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', 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; // 业务错误留给控制器处理
+                        }
                     }
                 },
                 get: {
@@ -895,9 +895,25 @@ ScheduleApp.config([
                     }]
                 }
             })
-
-
-        ;
+            .state("schedulePlanInfoExtFormManage_edit", { // 修改套跑form
+                url: '/schedulePlanInfoExtFormManage_edit/:xlId/:xlName/:sd/:lpId/:lpName',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'rerunManage_edit_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",
+                                "pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js"
+                            ]
+                        });
+                    }]
+                }
+            });
     }
 ]);
@@ -56,7 +56,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -139,9 +139,9 @@
     </div>
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.pageInfo.totalItems"
-                        ng-model="ctrl.pageInfo.currentPage"
-                        ng-change="ctrl.pageChanaged()"
+        <uib-pagination total-items="ctrl.page()['totalElements']"
+                        ng-model="ctrl.page()['uiNumber']"
+                        ng-change="ctrl.doPage()"
                         rotate="false"
                         max-size="10"
                         boundary-links="true"
 // 车辆配置管理 service controller 等写在一起
-angular.module('ScheduleApp').factory('SchedulePlanInfoManageService', ['SchedulePlanInfoManageService_g', function(service) {
-    /** 当前的查询条件信息 */
-    var currentSearchCondition = {};
-
-    /** 当前第几页 */
-    var currentPageNo = 1;
-
-    return {
-        /**
-         * 获取查询条件信息，
-         * 用于给controller用来和页面数据绑定。
-         */
-        getSearchCondition: function() {
-            return currentSearchCondition;
-        },
-        /**
-         * 重置查询条件信息。
-         */
-        resetSearchCondition: function() {
-            var key;
-            for (key in currentSearchCondition) {
-                currentSearchCondition[key] = undefined;
-            }
-        },
-        /**
-         * 设置当前页码。
-         * @param cpn 从1开始，后台是从0开始的
-         */
-        setCurrentPageNo: function(cpn) {
-            currentPageNo = cpn;
-        },
-        /**
-         * 组装查询参数，返回一个promise查询结果。
-         * @param params 查询参数
-         * @return 返回一个 promise
-         */
-        getPage: function(spid) {
-            var params = currentSearchCondition; // 查询条件
-            params.page = currentPageNo - 1; // 服务端页码从0开始
-            params["schedulePlan.id_eq"] = spid; // 排班id
-            return service.rest.list(params).$promise;
-        }
+angular.module('ScheduleApp').factory(
+    'SchedulePlanInfoManageService',
+    [
+        'SchedulePlanInfoManageService_g',
+        function(service) {
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {};
+
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
+
+                uiNumber: 1 // 页面绑定的页码
+            };
+
+            // 查询对象
+            var queryClass = service.rest;
+
+            return {
+                getQueryClass: function() {
+                    return queryClass;
+                },
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+                    return currentSearchCondition;
+                },
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+                    }
+                    return currentPage;
+                }
+            };
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('SchedulePlanInfoManageCtrl', ['SchedulePlanInfoManageService', '$state', '$stateParams', '$scope', function(schedulePlanInfoManageService, $state, $stateParams, $scope) {
-    var self = this;
-    var spid = $stateParams.spid; // 排班规则id
-    var xlname = $stateParams.xlname; // 线路名字
-    var ttname = $stateParams.ttname; // 时刻表名字
-    var stime = $stateParams.stime; // 开始时间
-    var etime = $stateParams.etime; // 结束时间
-
-    $scope.spid = spid;
-    $scope.xlname = xlname;
-    $scope.ttname = ttname;
-    $scope.stime = stime;
-    $scope.etime = etime;
-
-    // 切换到form状态
-    self.goForm = function() {
-        alert("等待生成");
-
-    }
-}]);
-
-angular.module('ScheduleApp').controller('SchedulePlanInfoManageListCtrl', ['SchedulePlanInfoManageService', '$scope', function(schedulePlanInfoManageService, $scope) {
-    var self = this;
-    self.pageInfo = {
-        totalItems : 0,
-        currentPage : 1,
-        infos: []
-    };
-
-    // 日期 日期控件开关
-    self.scheduleDate = false;
-    self.scheduleDate_open = function() {
-        self.scheduleDate = true;
-    };
-
-    var spid = $scope.spid;
-
-    // 初始创建的时候，获取一次列表数据
-    schedulePlanInfoManageService.getPage(spid).then(
-        function(result) {
-            self.pageInfo.totalItems = result.totalElements;
-            self.pageInfo.currentPage = result.number + 1;
-            self.pageInfo.infos = result.content;
-            schedulePlanInfoManageService.setCurrentPageNo(result.number + 1);
-        },
-        function(result) {
-            alert("出错啦！");
         }
-    );
-
-    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
-    //    alert("dfdfdf");
-    //});
-
-    // 翻页的时候调用
-    self.pageChanaged = function() {
-        schedulePlanInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
-        schedulePlanInfoManageService.getPage(spid).then(
-            function(result) {
-                self.pageInfo.totalItems = result.totalElements;
-                self.pageInfo.currentPage = result.number + 1;
-                self.pageInfo.infos = result.content;
-                schedulePlanInfoManageService.setCurrentPageNo(result.number + 1);
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    };
-    // 获取查询条件数据
-    self.searchCondition = function() {
-        return schedulePlanInfoManageService.getSearchCondition();
-    };
-    // 重置查询条件
-    self.resetSearchCondition = function() {
-        return schedulePlanInfoManageService.resetSearchCondition();
-    };
-
-    $scope.$watch(
-        function() {
-            return self.searchCondition()['scheduleDate_eq'];
-        },
-        function(newValue, oldValue) {
-            if (newValue == undefined && oldValue == undefined) {
-
-            } else {
-                self.pageChanaged();
+    ]
+);
+
+// index.html页面
+angular.module('ScheduleApp').controller(
+    'SchedulePlanInfoManageCtrl',
+    [
+        '$state',
+        '$stateParams',
+        '$scope',
+        function($state, $stateParams, $scope) {
+            var self = this;
+            var spid = $stateParams.spid; // 排班规则id
+            var xlname = $stateParams.xlname; // 线路名字
+            var ttname = $stateParams.ttname; // 时刻表名字
+            var stime = $stateParams.stime; // 开始时间
+            var etime = $stateParams.etime; // 结束时间
+
+            $scope.spid = spid;
+            $scope.xlname = xlname;
+            $scope.ttname = ttname;
+            $scope.stime = stime;
+            $scope.etime = etime;
+
+            // 切换到form状态
+            self.goForm = function() {
+                alert("等待生成");
+
             }
-        });
+        }
+
+    ]
+);
+
+// list.html页面
+angular.module('ScheduleApp').controller(
+    'SchedulePlanInfoManageListCtrl',
+    [
+        'SchedulePlanInfoManageService',
+        '$scope',
+        function(service, $scope) {
+            var self = this;
+
+            // 日期 日期控件开关
+            self.scheduleDate = false;
+            self.scheduleDate_open = function() {
+                self.scheduleDate = true;
+            };
+
+            // query类
+            var SPlanInfo = service.getQueryClass();
+
+            var spid = $scope.spid;
+
+            self.page = function() {
+                return service.getPage();
+            };
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.searchCondition()["schedulePlan.id_eq"] = spid;
+
+            self.doPage = function() {
+                SPlanInfo.list(self.searchCondition(),
+                    function(rst) {
+                        service.getPage(rst);
+                    },
+                    function(err) {
+                        console.log(err);
+                    }
+                );
+            };
+
+            self.doPage();
+
+            $scope.$watch(
+                function() {
+                    return self.searchCondition()['scheduleDate_eq'];
+                },
+                function(newValue, oldValue) {
+                    if (newValue == undefined && oldValue == undefined) {
+
+                    } else {
+                        self.doPage();
+                    }
+                }
+            );
-}]);
+        }
+    ]
+);
+// TODO：
 \ No newline at end of file
@@ -71,7 +71,7 @@
                     <span ng-bind="$index + 1"></span>
                 </td>
                 <td>
-                    <a ui-sref="" class="btn btn-info btn-sm" > 修改 </a>
+                    <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>
                 </td>
                 <td>
                     <span ng-bind="info.xlName"></span>
 // 调度值勤日报管理 service controller 等写在一起
 // TODO：使用的global服务需要修正
-angular.module('ScheduleApp').factory('SchedulePlanReportExtManageService', [
-    'SchedulePlanInfoManageService_g', 'SchedulePlanManageService_g', '$q',
-    function(service, service2, $q) {
-        /** 当前的查询条件信息 */
-        var currentSearchCondition = {};
-
-        return {
-            /**
-             * 获取查询条件信息，
-             * 用于给controller用来和页面数据绑定。
-             */
-            getSearchCondition: function() {
-                return currentSearchCondition;
-            },
-            /**
-             * 重置查询条件信息。
-             */
-            resetSearchCondition: function() {
-                var key;
-                for (key in currentSearchCondition) {
-                    currentSearchCondition[key] = undefined;
-                }
-            },
-            /**
-             * 组装查询参数，返回一个promise查询结果。
-             * @param params 查询参数
-             * @return 返回一个 promise
-             */
-            getPage: function() {
-                var params = currentSearchCondition; // 查询条件
-                return service.groupInfo_ext.list(params).$promise;
+angular.module('ScheduleApp').factory(
+    'SchedulePlanReportExtManageService',
+    [
+        'SchedulePlanInfoManageService_g',
+        'SchedulePlanManageService_g',
+        '$q',
+        function(service, service2, $q) {
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {};
+
+            // 查询对象
+            var queryClass = service.rest;
+
+            return {
+                getQueryClass: function() {
+                    return queryClass;
+                },
-            }
+                /**
+                 * 获取查询条件信息，
+                 * 用于给controller用来和页面数据绑定。
+                 */
+                getSearchCondition: function() {
+                    return currentSearchCondition;
+                },
+                /**
+                 * 重置查询条件信息。
+                 */
+                resetSearchCondition: function() {
+                    var key;
+                    for (key in currentSearchCondition) {
+                        currentSearchCondition[key] = undefined;
+                    }
+                },
+                /**
+                 * 组装查询参数，返回一个promise查询结果。
+                 * @param params 查询参数
+                 * @return 返回一个 promise
+                 */
+                getPage: function() {
+                    var params = currentSearchCondition; // 查询条件
+                    return service.groupInfo_ext.list(params).$promise;
-        };
+                }
+
+            };
-    }]);
+        }
+    ]
+);
+// index.html页面
 angular.module('ScheduleApp').controller(
     'SchedulePlanReportExtManageCtrl',
     [
@@ -54,6 +68,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
 );
+// list.html控制器
 angular.module('ScheduleApp').controller(
     'SchedulePlanReportExtManageListCtrl',
     [
@@ -34,9 +34,25 @@ ScheduleApp.config([
                     }]
                 }
             })
-
-
-        ;
+            .state("schedulePlanInfoExtFormManage_edit", { // 修改套跑form
+                url: '/schedulePlanInfoExtFormManage_edit/:xlId/:xlName/:sd/:lpId/:lpName',
+                views: {
+                    "": {templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html'}
+                },
+                resolve: {
+                    deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                        return $ocLazyLoad.load({
+                            name: 'rerunManage_edit_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",
+                                "pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js"
+                            ]
+                        });
+                    }]
+                }
+            });
     }
 ]);
 \ No newline at end of file
@@ -64,12 +64,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id_route'},
+            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', 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; // 业务错误留给控制器处理
+                        }
                     }
                 },
                 get: {
@@ -19,4 +19,7 @@
 19=线路运营概览
 20=排班规则备注
 21=时刻表，两点间空驶，算空驶
+22=搭班编码自动生成
+23=时刻表明细修改终点站停驶（停止1个半小时以上）
+24=线路标准里如果里程是0，用标准里程