update

徐烜
1 parent 952112f4
Showing 6 changed files with 243 additions and 55 deletions
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
src/main/resources/static/pages/scheduleApp/module/main.js
@@ -14,7 +14,7 @@
             <th>终止日期</th>
             <th>停车点</th>
             <th>是否切换</th>
-            <th>操作</th>
+            <th width="14%">操作</th>
         </tr>
         <tr role="row" class="filter">
             <td></td>
 // 人员配置管理 service controller 等写在一起
-angular.module('ScheduleApp').factory('EmployeeConfigService', ['$resource', function($resource) {
-    // TODO：测试
-    return $resource(
-        '/cci',
-        {},
-        {
-            list: {
-                method: 'GET'
+angular.module('ScheduleApp').factory('EmployeeConfigService', ['EmployeeConfigService_g', function(service) {
+    /** 当前的查询条件信息 */
+    var currentSearchCondition = {};
+
+    /** 当前第几页 */
+    var currentPageNo = 1;
+
+    return {
+        /**
+         * 获取查询条件信息，
+         * 用于给controller用来和页面数据绑定。
+         */
+        getSearchCondition: function() {
+            return currentSearchCondition;
+        },
+        /**
+         * 重置查询条件信息。
+         */
+        resetSearchCondition: function() {
+            var key;
+            for (key in currentSearchCondition) {
+                currentSearchCondition[key] = "";
             }
+        },
+        /**
+         * 设置当前页码。
+         * @param cpn 从1开始，后台是从0开始的
+         */
+        setCurrentPageNo: function(cpn) {
+            currentPageNo = cpn;
+        },
+        /**
+         * 组装查询参数，返回一个promise查询结果。
+         * @param params 查询参数
+         * @return 返回一个 promise
+         */
+        getPage: function() {
+            var params = currentSearchCondition; // 查询条件
+            params.page = currentPageNo - 1; // 服务端页码从0开始
+            return service.list(params).$promise;
+        },
+        /**
+         * 获取明细信息。
+         * @param id 车辆id
+         * @return 返回一个 promise
+         */
+        getDetail: function(id) {
+            var params = {id: id};
+            return service.get(params).$promise;
+        },
+        /**
+         * 保存信息。
+         * @param obj 车辆详细信息
+         * @return 返回一个 promise
+         */
+        saveDetail: function(obj) {
+            return service.save(obj).$promise;
         }
-    );
+    };
 }]);
-angular.module('ScheduleApp').controller('EmployeeConfigCtrl', ['EmployeeConfigService', function(employeeConfigService) {
+angular.module('ScheduleApp').controller('EmployeeConfigCtrl', ['EmployeeConfigService', '$state', function(employeeConfigService, $state) {
+    var self = this;
+    // 切换到form状态
+    self.goForm = function() {
+        //alert("切换");
+        $state.go("employeeConfig_form");
+    }
 }]);
 angular.module('ScheduleApp').controller('EmployeeConfigListCtrl', ['EmployeeConfigService', function(employeeConfigService) {
-    // TODO：模拟数据
     var self = this;
-    self.totalItems = 64;
-    self.currentPage = 4;
-    self.infos = {};
-    self.pageChanaged = function() {
-        console.log("页面跳转到：" + currentPage.currentPage);
-    }
-}]);
+    self.pageInfo = {
+        totalItems : 0,
+        currentPage : 1,
+        infos: []
+    };
+
+    // 初始创建的时候，获取一次列表数据
+    employeeConfigService.getPage().then(
+        function(result) {
+            self.pageInfo.totalItems = result.totalElements;
+            self.pageInfo.currentPage = result.number + 1;
+            self.pageInfo.infos = result.content;
+            employeeConfigService.setCurrentPageNo(result.number + 1);
+        },
+        function(result) {
+            alert("出错啦！");
+        }
+    );
-angular.module('ScheduleApp').controller('EmployeeConfigFormCtrl', ['EmployeeConfigService', function(employeeConfigService) {
+    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
+    //    alert("dfdfdf");
+    //});
+    // 翻页的时候调用
+    self.pageChanaged = function() {
+        employeeConfigService.setCurrentPageNo(self.pageInfo.currentPage);
+        employeeConfigService.getPage().then(
+            function(result) {
+                self.pageInfo.totalItems = result.totalElements;
+                self.pageInfo.currentPage = result.number + 1;
+                self.pageInfo.infos = result.content;
+                employeeConfigService.setCurrentPageNo(result.number + 1);
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
+    };
+    // 获取查询条件数据
+    self.searchCondition = function() {
+        return employeeConfigService.getSearchCondition();
+    };
+    // 重置查询条件
+    self.resetSearchCondition = function() {
+        return employeeConfigService.resetSearchCondition();
+    };
 }]);
-angular.module('ScheduleApp').controller('EmployeeConfigDetailCtrl', ['EmployeeConfigService', function(employeeConfigService) {
+angular.module('ScheduleApp').controller('EmployeeConfigFormCtrl', ['EmployeeConfigService', '$stateParams', '$state', function(employeeConfigService, $stateParams, $state) {
+    // TODO：
+}]);
+angular.module('ScheduleApp').controller('EmployeeConfigDetailCtrl', ['EmployeeConfigService', '$stateParams', function(employeeConfigService, $stateParams) {
+    // TODO：
 }]);
 <div class="page-head">
     <div class="page-title">
-        <h1>人员配置</h1>
+        <h1>人员配置管理</h1>
     </div>
 </div>
@@ -14,7 +14,7 @@
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">人员配置</span>
+        <span class="active">人员配置管理</span>
     </li>
 </ul>
@@ -27,7 +27,7 @@
                     <span class="caption-subject bold uppercase">配置表</span>
                 </div>
                 <div class="actions">
-                    <a href="javascirpt:" class="btn btn-circle blue">
+                    <a href="javascirpt:" class="btn btn-circle blue" ng-click="ctrl.goForm()">
                         <i class="fa fa-plus"></i>
                         添加配置
                     </a>
@@ -58,7 +58,7 @@
             </div>
             <div class="portlet-body">
-                <div ui-view="list"></div>
+                <div ui-view="employeeConfig_list"></div>
             </div>
         </div>
     </div>
@@ -2,7 +2,7 @@
 <div ng-controller="EmployeeConfigListCtrl as ctrl">
     <table class="table table-striped table-bordered table-hover table-checkable order-column">
         <thead>
-        <tr>
+        <tr role="row" class="heading">
             <th>
                 <input type="checkbox" class="group-checkable"/>
             </th>
@@ -13,17 +13,37 @@
             <th>驾驶员</th>
             <th>售票员工号</th>
             <th>售票员</th>
-            <th>车辆内部编号</th>
-            <th>操作</th>
+            <th width="14%">操作</th>
         </tr>
+        <tr role="row" class="filter">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+                <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
+                        ng-click="ctrl.pageChanaged()">
+                    <i class="fa fa-search"></i> 搜索</button>
+
+                <button class="btn btn-sm red btn-outline filter-cancel"
+                        ng-click="ctrl.resetSearchCondition()">
+                    <i class="fa fa-times"></i> 重置</button>
+            </td>
+
+        </tr>
+
         </thead>
         <tbody>
-        <tr ng-repeat="info in ctrl.infos" class="odd gradeX">
+        <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
             <td>
                 <input type="checkbox"/>
             </td>
             <td>
-                <span>TODO</span>
+                <span ng-bind="$index + 1"></span>
             </td>
             <td>
                 <span ng-bind="info.xl.name"></span>
@@ -44,21 +64,26 @@
                 <span ng-bind="info.spy.personnelName"></span>
             </td>
             <td>
-                <span ng-bind="info.cl.insideCode"></span>
-            </td>
-            <td>
-                <span>TODO</span>
+                <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
+                <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
+                <a ui-sref="employeeConfig_detail({id: info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
+                <a ui-sref="employeeConfig_edit({id: info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
             </td>
         </tr>
         </tbody>
     </table>
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.totalItems"
-                        ng-model="ctrl.currentPage"
-                        ng-change="ctrl.pageChanged()"
+        <uib-pagination total-items="ctrl.pageInfo.totalItems"
+                        ng-model="ctrl.pageInfo.currentPage"
+                        ng-change="ctrl.pageChanaged()"
+                        rotate="false"
+                        max-size="10"
+                        boundary-links="true"
+                        first-text="首页"
                         previous-text="上一页"
-                        next-text="下一页">
+                        next-text="下一页"
+                        last-text="尾页">
         </uib-pagination>
     </div>
 </div>
 \ No newline at end of file
@@ -364,21 +364,6 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             }
         })
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         // 人员配置模块
         .state("employeeConfig", {
             url: '/employeeConfig',
@@ -386,7 +371,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                 "": {
                     templateUrl: 'pages/scheduleApp/module/core/employeeConfig/index.html'
                 },
-                "list@employeeConfig": {
+                "employeeConfig_list@employeeConfig": {
                     templateUrl: 'pages/scheduleApp/module/core/employeeConfig/list.html'
                 }
             },
@@ -403,6 +388,71 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
                 }]
             }
         })
+        .state("employeeConfig_form", {
+            url: '/employeeConfig_form',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/form.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'employeeConfig_form_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/employeeConfig/employeeConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("employeeConfig_edit", {
+            url: '/employeeConfig_edit/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/edit.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'employeeConfig_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/employeeConfig/employeeConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+        .state("employeeConfig_detail", {
+            url: '/employeeConfig_detail/:id',
+            views: {
+                "": {templateUrl: 'pages/scheduleApp/module/core/employeeConfig/detail.html'}
+            },
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'employeeConfig_detail_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "pages/scheduleApp/module/core/employeeConfig/employeeConfig.js"
+                        ]
+                    });
+                }]
+            }
+        })
+
+
+
+
+
+
+
+
+
+
         // 路牌管理模块
         .state("guideboardManage", {
             url: '/guideboardManage',
@@ -518,7 +568,27 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, functi
     );
 }]);
-
+// 人员配置service
+angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
+    return $resource(
+        '/eci/:id',
+        {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
+        {
+            list: {
+                method: 'GET',
+                params: {
+                    page: 0
+                }
+            },
+            get: {
+                method: 'GET'
+            },
+            save: {
+                method: 'POST'
+            }
+        }
+    );
+}]);