update

徐烜
1 parent 2388c41f
Showing 4 changed files with 199 additions and 57 deletions
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/guideboardManage.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
src/main/resources/static/pages/scheduleApp/module/main.js
 // 路牌管理 service controller 等写在一起
  
-angular.module('ScheduleApp').factory('GuideboardManageService', ['$resource', function($resource) {
-    // TODO：测试
-    return $resource(
-        '/cci',
-        {},
-        {
-            list: {
-                method: 'GET'
+angular.module('ScheduleApp').factory('GuideboardManageService', ['GuideboardManageService_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('GuideboardManageCtrl', ['GuideboardManageService', function(guideboardManageService) {
+angular.module('ScheduleApp').controller('GuideboardManageCtrl', ['GuideboardManageService', '$state', function(guideboardManageService, $state) {
+    var self = this;
  
+    // 切换到form状态
+    self.goForm = function() {
+        alert("切换添加");
+    }
 }]);
  
 angular.module('ScheduleApp').controller('GuideboardManageListCtrl', ['GuideboardManageService', function(guideboardManageService) {
-    // 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: []
+    };
  
-angular.module('ScheduleApp').controller('GuideboardManageFormCtrl', ['GuideboardManageService', function(guideboardManageService) {
+    // 初始创建的时候，获取一次列表数据
+    guideboardManageService.getPage().then(
+        function(result) {
+            self.pageInfo.totalItems = result.totalElements;
+            self.pageInfo.currentPage = result.number + 1;
+            self.pageInfo.infos = result.content;
+            guideboardManageService.setCurrentPageNo(result.number + 1);
+        },
+        function(result) {
+            alert("出错啦！");
+        }
+    );
+
+    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
+    //    alert("dfdfdf");
+    //});
+
+    // 翻页的时候调用
+    self.pageChanaged = function() {
+        guideboardManageService.setCurrentPageNo(self.pageInfo.currentPage);
+        guideboardManageService.getPage().then(
+            function(result) {
+                self.pageInfo.totalItems = result.totalElements;
+                self.pageInfo.currentPage = result.number + 1;
+                self.pageInfo.infos = result.content;
+                guideboardManageService.setCurrentPageNo(result.number + 1);
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
+    };
+    // 获取查询条件数据
+    self.searchCondition = function() {
+        return guideboardManageService.getSearchCondition();
+    };
+    // 重置查询条件
+    self.resetSearchCondition = function() {
+        return guideboardManageService.resetSearchCondition();
+    };
  
 }]);
  
-angular.module('ScheduleApp').controller('GuideboardManageDetailCtrl', ['GuideboardManageService', function(guideboardManageService) {
+angular.module('ScheduleApp').controller('GuideboardManageFormCtrl', '$stateParams', '$state', ['GuideboardManageService', function(guideboardManageService, $stateParams, $state) {
+    // TODO：
+}]);
  
+angular.module('ScheduleApp').controller('GuideboardManageDetailCtrl', '$stateParams', ['GuideboardManageService', function(guideboardManageService, $stateParams) {
+    // TODO:
 }]);
  
  
@@ -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="guideboardManage_list"></div>
             </div>
         </div>
     </div>
@@ -2,7 +2,7 @@
 <div ng-controller="GuideboardManageListCtrl 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>
@@ -11,15 +11,33 @@
             <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>
+                <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>
@@ -33,16 +51,27 @@
             <td>
                 <span ng-bind="info.lpType"></span>
             </td>
+            <td>
+                <!--<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="#" class="btn default blue-stripe btn-sm"> 详细 </a>
+                <a ui-sref="#" 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
@@ -444,6 +444,32 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
             }
         })
  
+        // 路牌管理
+        .state("guideboardManage", {
+            url: '/guideboardManage',
+            views: {
+                "": {
+                    templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
+                },
+                "guideboardManage_list@guideboardManage": {
+                    templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
+                }
+            },
+
+            resolve: {
+                deps: ['$ocLazyLoad', function($ocLazyLoad) {
+                    return $ocLazyLoad.load({
+                        name: 'guideboardManage_module',
+                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
+                        files: [
+                            "pages/scheduleApp/module/core/guideboardManage/guideboardManage.js"
+                        ]
+                    });
+                }]
+            }
+        })
+
+
         // 时刻表管理
         .state("timeTableManage", {
             url: '/timeTableManage',
@@ -578,34 +604,6 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
  
         // TODO:
  
-
-
-
-
-        // 路牌管理模块
-        .state("guideboardManage", {
-            url: '/guideboardManage',
-            views: {
-                "": {
-                    templateUrl: 'pages/scheduleApp/module/core/guideboardManage/index.html'
-                },
-                "list@guideboardManage": {
-                    templateUrl: 'pages/scheduleApp/module/core/guideboardManage/list.html'
-                }
-            },
-
-            resolve: {
-                deps: ['$ocLazyLoad', function($ocLazyLoad) {
-                    return $ocLazyLoad.load({
-                        name: 'guideboardManage_module',
-                        insertBefore: '#ng_load_plugins_before', // 动态载入模块时放置的位置
-                        files: [
-                            "pages/scheduleApp/module/core/guideboardManage/guideboardManage.js"
-                        ]
-                    });
-                }]
-            }
-        })
 }]);
  
 // 全局service放置在此处，
@@ -719,6 +717,28 @@ 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 $resource(
+        '/gic/:id',
+        {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
+        {
+            list: {
+                method: 'GET',
+                params: {
+                    page: 0
+                }
+            },
+            get: {
+                method: 'GET'
+            },
+            save: {
+                method: 'POST'
+            }
+        }
+    );
+}]);
+
 // 时刻表管理service
 angular.module('ScheduleApp').factory('TimeTableManageService_g', ['$resource', function($resource) {
     // TODO：之后返回两个$resource，包含 时刻表和时刻表明细