diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index f3a153d..1461f2c 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and b/04.系统编码/.vs/BeijingSafeguard/v15/.suo differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide index a48c5cb..5756d43 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm index 1942347..17055f7 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 755cd62..9c929b7 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal differ diff --git a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js index afb27f4..aa471eb 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -1,53 +1,13 @@ var App = function () { - this.data = { - "total": 20, - "rows": [{ Id: 1, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 2, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 3, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 4, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 5, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 6, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 7, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 8, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 9, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 10, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 11, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 12, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 13, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 14, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 15, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 16, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 17, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 18, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 19, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 20, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 21, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 22, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 23, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 24, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 25, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 26, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 27, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 28, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 29, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 30, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 31, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 32, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 33, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 34, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 35, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 36, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 37, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 38, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }, - { Id: 39, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }] - }; + this.selectedRow = []; this.Startup = function () { this.ReLayout(); this.InitDate(); this.InitDataGrid(); + this.ReLoadTableData(); $('#manage').addClass('active'); @@ -62,6 +22,17 @@ $('.manage-table, .manage-table .datagrid').height(height - 109); }; + this.ReLoadTableData = function () { + $('#task-table').datagrid({ + method: "POST", + url: '/StatisticAnalysisController/Query', + queryParams: { + pageIndex: 1, + pageSize: 10 + } + }); + }; + this.InitDate = function () { $('#from-date').datetimebox({ panelWidth: 190, @@ -105,9 +76,9 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Name', title: '姓名', align: 'center', width: 10 }, - { field: 'CalcNumber', title: '计算次数', align: 'center', width: 10 }, - { field: 'CalcTime', title: '最后计算时间', align: 'left', width: 70 } + { field: 'User', title: '姓名', align: 'center', width: 10 }, + { field: 'ComputeCount', title: '计算次数', align: 'center', width: 10 }, + { field: 'LastComputeTime', title: '最后计算时间', align: 'left', width: 70 } ]], striped: true, singleSelect: false, @@ -115,11 +86,16 @@ fit: true, scrollbarSize: 0, pagination: true, + pageNumber: 1, + pageSize: 20, + pageList: [10, 20, 30], onSelect: this.OnTaskSelected.bind(this), - onUnselect: this.OnTaskUnselected.bind(this) + onUnselect: this.OnTaskUnselected.bind(this), + onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), + //onLoadSuccess: this.OnTableGridLoaded.bind(this) }); - $('#task-grid').datagrid('loadData', this.data); + //$('#task-grid').datagrid('loadData', this.data); }; this.formatText = function (value) { @@ -161,6 +137,15 @@ this.CloseDeleteDialog = function () { $('.dialog-delete').hide(); }; + + this.OnTableGridBeforeLoad = function () { + $('#task-table').datagrid('getPager').pagination({ + beforePageText: '第', + afterPageText: '页   共{pages}页', + displayMsg: '当前显示{from}-{to}条记录   共{total}条记录', + layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info'] + }); + }; }; $(document).ready(function () { 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 661420e..259ac06 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -1,47 +1,6 @@ var App = function () { - this.data = { - "total": 20, - "rows": [{ Id: 1, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 2, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 3, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 4, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 5, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 6, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 7, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 8, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 9, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 10, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 11, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 12, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 13, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 14, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 15, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 16, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 17, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 18, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 19, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 20, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 21, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 22, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 23, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 24, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 25, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 26, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 27, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 28, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 29, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 30, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 31, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 32, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 33, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 34, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 35, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 36, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 37, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 38, Name: "张三", Sex: '男', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 39, Name: "张三", Sex: '女', LoginAccount: "zhangsan", LoginPassword: '123456', LoginNumber: 11, LoginTime: '2021/12/15 10:00:00', isEnable: 1 },] - }; + this.selectedRow = []; this.AddDialog = new AddDialog(this); this.EditDialog = new EditDialog(this); @@ -49,9 +8,12 @@ this.Startup = function () { this.ReLayout(); this.InitDataGrid(); + this.ReLoadTableData(); this.AddDialog.Setup(); this.EditDialog.Setup(); + this.aa(); + $('#manage').addClass('active'); $('#add-btn').on('click', this.OnAddButtonClick.bind(this)); $('#edit-btn').on('click', this.onEditButtonClick.bind(this)); @@ -74,26 +36,56 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Name', title: '姓名', align: 'center', width: 10 }, - { field: 'LoginAccount', title: '登录账户', align: 'center', width: 10 }, - { field: 'LoginPassword', title: '登录密码', align: 'center', width: 10 }, - { field: 'LoginNumber', title: '登录次数', align: 'center', width: 10 }, - { field: 'LoginTime', title: '最后登录时间', align: 'center', width: 20 }, - { field: 'isEnable', title: '启用', align: 'left', width: 50, formatter: this.formatText.bind(this) } + { field: 'RealName', title: '姓名', align: 'center', width: 10 }, + { field: 'LoginName', title: '登录账户', align: 'center', width: 10 }, + { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 10 }, + { field: 'ComputeCount', title: '登录次数', align: 'center', width: 10 }, + { field: 'LastComputeTime', title: '最后登录时间', align: 'center', width: 20 }, + { field: 'Enabled', title: '启用', align: 'left', width: 50, formatter: this.formatText.bind(this) } ]], striped: true, singleSelect: false, fitColumns: true, fit: true, scrollbarSize: 0, + pageNumber: 1, + pageSize: 20, + pageList: [10, 20, 30], pagination: true, onSelect: this.OnTaskSelected.bind(this), - onUnselect: this.OnTaskUnselected.bind(this) + onUnselect: this.OnTaskUnselected.bind(this), + onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), + }); + }; + + this.ReLoadTableData = function () { + $('#task-table').datagrid({ + method: "POST", + url: '/UserManagement/Query', + queryParams: { + pageIndex: 1, + pageSize: 10 + } }); - $('#task-grid').datagrid('loadData', this.data); + console.log('ok') }; + this.aa = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/UserManagement/Query', + data: { + pageIndex: 1, + pageSize: 10 + }, + success: function (result) { + console.log($.parseJSON(result)) + }.bind(this) + }); + } + this.formatText = function (value) { return value === 1 ? '已启用' : '已禁用'; }; @@ -117,6 +109,17 @@ $('#disable-btn').prop('disabled', true); }; + this.OnTableGridBeforeLoad = function () { + //var page = $('#task-table').datagrid('getPager'); + //console.log(page) + //$(page).pagination({ + // beforePageText: '第', + // afterPageText: '页   共{pages}页', + // displayMsg: '当前显示{from}-{to}条记录   共{total}条记录', + // layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info'] + //}); + }; + this.OnAddButtonClick = function () { this.AddDialog.Show(); };