diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/index.js b/04.系统编码/App/Content/scripts/system-management/user-management/index.js index 43ce8bb..5196b89 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -1,5 +1,5 @@ var App = function () { - + this.userGrid = $('#task-grid'); this.data = {}; this.selectedRow = []; this.AddDialog = new AddDialog(this); @@ -62,7 +62,7 @@ }; this.InitDataGrid = function () { - $('#task-grid').datagrid({ + this.userGrid.datagrid({ columns: [[ { field: 'RealName', title: '姓名', align: 'center', width: 10 }, { field: 'LoginName', title: '登录账户', align: 'center', width: 10 }, @@ -77,8 +77,9 @@ scrollbarSize: 0, pagination: true, pageNumber: 1, - pageSize: 30, - pageList: [30, 40, 50], + pageSize: 20, + pageList: [10, 20, 50, 100, 150, 200], + loadMsg: '正在加载数据,请稍后...', onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this), onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), @@ -98,7 +99,7 @@ }; this.ReLoadTableData = function (orgId) { - $.ajax({ +/* $.ajax({ type: "POST", dataType: 'text', url: '/UserManagement/Query', @@ -108,8 +109,15 @@ pageSize: 30 }, success: function (result) { - $('#task-grid').datagrid('loadData', JSON.parse(result)); + this.userGrid.datagrid('loadData', JSON.parse(result)); }.bind(this) + });*/ + this.userGrid.datagrid({ + method: "POST", + url: '/UserManagement/Query', + queryParams: { + orgId: orgId + } }); }; @@ -134,8 +142,7 @@ }; this.OnTableGridBeforeLoad = function () { - var page = $('#task-grid').datagrid('getPager'); - $(page).pagination({ + this.userGrid.datagrid('getPager').pagination({ beforePageText: '第', afterPageText: '页   共{pages}页', displayMsg: '当前显示{from}-{to}条记录   共{total}条记录', diff --git a/04.系统编码/App/Controllers/ConfigManagementController.cs b/04.系统编码/App/Controllers/ConfigManagementController.cs index 1143a1a..b0c0c36 100644 --- a/04.系统编码/App/Controllers/ConfigManagementController.cs +++ b/04.系统编码/App/Controllers/ConfigManagementController.cs @@ -22,9 +22,9 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers } [HttpPost] - public JsonResult Query(int pageIndex, int pageSize) + public JsonResult Query(int page, int rows) { - List configs = ConfigBLL.Query(pageIndex, pageSize); + List configs = ConfigBLL.Query(page, rows); return Json(configs); } } diff --git a/04.系统编码/App/Controllers/OrgManagementController.cs b/04.系统编码/App/Controllers/OrgManagementController.cs index 1100148..9641a5b 100644 --- a/04.系统编码/App/Controllers/OrgManagementController.cs +++ b/04.系统编码/App/Controllers/OrgManagementController.cs @@ -36,9 +36,9 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers } [HttpPost] - public JsonResult Query(int pageIndex, int pageSize) + public JsonResult Query(int page, int rows) { - Pagination orgs = OrgBLL.Query(pageIndex, pageSize); + Pagination orgs = OrgBLL.Query(page, rows); return Json(orgs); } } diff --git a/04.系统编码/App/Controllers/StatisticAnalysisController.cs b/04.系统编码/App/Controllers/StatisticAnalysisController.cs index ca5ac46..a963c68 100644 --- a/04.系统编码/App/Controllers/StatisticAnalysisController.cs +++ b/04.系统编码/App/Controllers/StatisticAnalysisController.cs @@ -15,9 +15,9 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers } [HttpPost] - public JsonResult Query(DateTime fromTime, DateTime toTime, int pageIndex, int pageSize) + public JsonResult Query(DateTime fromTime, DateTime toTime, int page, int rows) { - Pagination page = ComputeBLL.Statistics(fromTime, toTime, pageIndex, pageSize); + Pagination page = ComputeBLL.Statistics(fromTime, toTime, page, rows); return Json(page); } } diff --git a/04.系统编码/App/Controllers/UserManagementController.cs b/04.系统编码/App/Controllers/UserManagementController.cs index 85689e3..a98ae35 100644 --- a/04.系统编码/App/Controllers/UserManagementController.cs +++ b/04.系统编码/App/Controllers/UserManagementController.cs @@ -36,9 +36,9 @@ namespace Pingchuan.BeijingSafeguard.App.Controllers } [HttpPost] - public JsonResult Query(int orgId, int pageIndex, int pageSize) + public JsonResult Query(int orgId, int page, int rows) { - Pagination users = UserBLL.Query(orgId, pageIndex, pageSize); + Pagination users = UserBLL.Query(orgId, page, rows); return Json(users); } } diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 60cee97..7b8b767 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -38,7 +38,7 @@
-
+