From 19f92c65ef4dc5dc0c1f522e5d80c3651620dc5f Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Thu, 13 Jan 2022 09:21:58 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 196608 -> 209920 bytes .../v15/Server/sqlite3/storage.ide-shm | Bin 32768 -> 32768 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4140632 -> 4140632 bytes .../config-management/index.js | 21 +++- .../system-management/org-management/add.js | 21 +++- .../system-management/org-management/edit.js | 21 +++- .../system-management/org-management/index.js | 110 +++++++++--------- .../statistic-analysis/index.js | 35 +++--- .../system-management/user-management/add.js | 30 ++++- .../system-management/user-management/edit.js | 42 ++++++- .../user-management/index.js | 75 ++++++------ 04.系统编码/App/Content/styles/common.css | 20 +++- .../App/Views/OrgManagement/Index.cshtml | 4 +- .../App/Views/UserManagement/AddDialog.cshtml | 4 +- .../Views/UserManagement/EditDialog.cshtml | 6 +- .../App/Views/UserManagement/Index.cshtml | 9 +- 16 files changed, 273 insertions(+), 125 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 1461f2cf7d5fea7a6972667f97489199ffe979e1..26288eb2e53daddf044b5fb46be5745a4df2dc9a 100644 GIT binary patch delta 12241 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 delta 11044 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 JIN6K0@(-gCTc7{{ delta 410 zcmZo@U}|V!s+V}A%K!o_K+MR%AP@*7DuH-%>^b4GWs$}@6H_`Hn#Rz14 znXKkwv)L*69OL8y&M%u)+`ljad0dQ>mAo{7(l;h6d20dbHH>+i6FJoxCoA}x0Oc1k zPX6X+1r&cbSuVf;NC#}57mxtbDaW{3CYXa6C{)Itz>vXE#K1J!G1-6ehcGUn*f+*L zh%pk8T|mV?jFaC*i2xZQjGM(`o-l4s;*?^XED|pT6cS+EY?tr>WF#NsW}Da)~Rj+np(rOS*z|EBLD{2 BjgtTX diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 9c929b7a73d3719672b24a66ebab285ff842d08d..f3149e5047ccd408a1bd4964c268d97768a148e8 100644 GIT binary patch delta 80717 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 NfN*{D$sGdT{6AI!H17Za diff --git a/04.系统编码/App/Content/scripts/system-management/config-management/index.js b/04.系统编码/App/Content/scripts/system-management/config-management/index.js index f9f1a6e..33651a7 100644 --- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js @@ -12,13 +12,16 @@ this.EditLocateIcon = new EditLocateIcon(this); this.Startup = function () { + $('#manage').addClass('active'); + this.ReLayout(); this.InitDataGrid(); + this.ReLoadTableData(); + this.EditLineWidth.Setup(); this.EditLineColor.Setup(); this.EditLocateIcon.Setup(); - $('#manage').addClass('active'); $('#edit-btn').on('click', this.onEditButtonClick.bind(this)); window.onresize = this.ReLayout.bind(this); @@ -47,8 +50,22 @@ onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this) }); + }; - $('#task-grid').datagrid('loadData', this.data); + this.ReLoadTableData = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/ConfigManagement/Query', + data: { + pageIndex: 1, + pageSize: 100 + }, + success: function (result) { + console.log(result) + $('#task-grid').datagrid('loadData', JSON.parse(result)); + }.bind(this) + }); }; this.formatIcon = function (value) { diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/add.js b/04.系统编码/App/Content/scripts/system-management/org-management/add.js index 7e61eb7..f0cf403 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/add.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/add.js @@ -12,10 +12,29 @@ }; this.OnSureButtonClick = function () { - $('#add-dialog').hide(); + this.HideDialog(); + this.AddOrg(); + }; + + this.AddOrg = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Add', + data: { + + }, + success: function () { + this.Parent.ReLoadTableData(); + }.bind(this) + }); }; this.HideDialog = function () { $('#add-dialog').hide(); }; + + this.clearInput = function () { + $("#name").textbox('setValue', ''); + }; }; \ No newline at end of file diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/edit.js b/04.系统编码/App/Content/scripts/system-management/org-management/edit.js index 0f930ce..3d66dbb 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/edit.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/edit.js @@ -13,10 +13,29 @@ }; this.OnSureButtonClick = function () { - $('#edit-dialog').hide(); + this.HideDialog(); + this.EditOrg(); + }; + + this.EditOrg = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Update', + data: { + + }, + success: function () { + this.Parent.ReLoadTableData(); + }.bind(this) + }); }; this.HideDialog = function () { $('#edit-dialog').hide(); }; + + this.clearInput = function () { + $("#username").textbox('setValue', ''); + }; }; \ No newline at end of file diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/index.js b/04.系统编码/App/Content/scripts/system-management/org-management/index.js index b3073c9..b1166c4 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -1,63 +1,24 @@ var App = function () { - - this.data = { - "total": 20, - "rows": [{ Id: 1, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 2, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 3, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 4, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 5, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 6, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 7, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 8, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 9, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 10, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 11, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 12, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 13, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 14, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 15, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 16, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 17, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 18, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 19, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 20, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 21, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 22, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 23, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 24, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 25, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 26, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 27, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 28, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 29, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 30, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 31, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 32, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 33, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 34, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 }, - { Id: 35, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 36, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 37, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 38, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }, - { Id: 39, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }] - }; + this.selectedRow = []; this.AddDialog = new AddDialog(this); this.EditDialog = new EditDialog(this); this.Startup = function () { + $('#manage').addClass('active'); + this.ReLayout(); this.InitDataGrid(); + this.ReLoadTableData(); + this.AddDialog.Setup(); this.EditDialog.Setup(); - $('#manage').addClass('active'); $('#add-btn').on('click', this.OnAddButtonClick.bind(this)); $('#edit-btn').on('click', this.onEditButtonClick.bind(this)); $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this)); $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this)); - $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this)); + $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this)); $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this)); window.onresize = this.ReLayout.bind(this); @@ -74,9 +35,8 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'OrgName', title: '名称', align: 'center', width: 10 }, - { field: 'CreateTime', title: '创建时间', align: 'center', width: 15 }, - { field: 'isEnable', title: '启用', align: 'left', width: 70, formatter: this.formatText.bind(this) } + { field: 'Name', title: '名称', align: 'center', width: 10 }, + { field: 'CreateTime', title: '创建时间', align: 'left', width: 80, formatter: this.formatTime.bind(this) } ]], striped: true, singleSelect: false, @@ -85,14 +45,29 @@ scrollbarSize: 0, pagination: true, onSelect: this.OnTaskSelected.bind(this), - onUnselect: this.OnTaskUnselected.bind(this) + onUnselect: this.OnTaskUnselected.bind(this), + onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), }); + }; - $('#task-grid').datagrid('loadData', this.data); + this.ReLoadTableData = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Query', + data: { + pageIndex: 1, + pageSize: 10 + }, + success: function (result) { + console.log(JSON.parse(result)) + $('#task-grid').datagrid('loadData', JSON.parse(result)); + }.bind(this) + }); }; - this.formatText = function (value) { - return value === 1 ? '已启用' : '已禁用'; + this.formatTime = function (time) { + return '{0}'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); }; this.OnTaskSelected = function (index, row) { @@ -114,6 +89,16 @@ $('#disable-btn').prop('disabled', true); }; + this.OnTableGridBeforeLoad = function () { + var page = $('#task-grid').datagrid('getPager'); + $(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(); }; @@ -124,12 +109,31 @@ this.onDeleteButtonClick = function () { $('.dialog-delete').show(); - $('.dialog-clear h2').text('确定删除名为「{0}」的机构吗？'.format(this.selectedRow.OrgName)); + $('.dialog-clear h2').text('确定删除名为「{0}」的机构吗？'.format(this.selectedRow.Name)); + }; + + this.OnSureOfDeleteButtonClick = function () { + this.CloseDeleteDialog(); + this.DeleteOrg(); }; this.CloseDeleteDialog = function () { $('.dialog-delete').hide(); }; + + this.DeleteOrg = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Delete', + data: { + id: this.selectedRow.Id + }, + success: function () { + this.ReLoadTableData(); + }.bind(this) + }); + }; }; $(document).ready(function () { 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 aa471eb..2a6f21f 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -4,12 +4,14 @@ this.selectedRow = []; this.Startup = function () { + $('#manage').addClass('active'); + this.ReLayout(); this.InitDate(); this.InitDataGrid(); - this.ReLoadTableData(); - - $('#manage').addClass('active'); + + $('#query-btn').on('click', this.OnQueryButtonClick.bind(this)); + $('#query-btn').trigger('click'); window.onresize = this.ReLayout.bind(this); }; @@ -22,14 +24,24 @@ $('.manage-table, .manage-table .datagrid').height(height - 109); }; + this.OnQueryButtonClick = function () { + this.ReLoadTableData(); + }; + this.ReLoadTableData = function () { - $('#task-table').datagrid({ - method: "POST", - url: '/StatisticAnalysisController/Query', - queryParams: { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/StatisticAnalysis/Query', + data: { + fromTime: $("#from-date").datetimebox('getValue'), + toTime: $("#to-date").datetimebox('getValue'), pageIndex: 1, pageSize: 10 - } + }, + success: function (result) { + $('#task-grid').datagrid('loadData', JSON.parse(result)); + }.bind(this) }); }; @@ -91,11 +103,8 @@ pageList: [10, 20, 30], onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this), - onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), - //onLoadSuccess: this.OnTableGridLoaded.bind(this) + onBeforeLoad: this.OnTableGridBeforeLoad.bind(this) }); - - //$('#task-grid').datagrid('loadData', this.data); }; this.formatText = function (value) { @@ -139,7 +148,7 @@ }; this.OnTableGridBeforeLoad = function () { - $('#task-table').datagrid('getPager').pagination({ + $('#task-grid').datagrid('getPager').pagination({ beforePageText: '第', afterPageText: '页   共{pages}页', displayMsg: '当前显示{from}-{to}条记录   共{total}条记录', diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/add.js b/04.系统编码/App/Content/scripts/system-management/user-management/add.js index 49a3e3b..6a0f625 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/add.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/add.js @@ -18,10 +18,38 @@ }; this.OnSureButtonClick = function () { - $('#add-dialog').hide(); + this.HideDialog(); + this.AddUser(); }; this.HideDialog = function () { $('#add-dialog').hide(); + + this.clearInput(); + }; + + this.AddUser = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/UserManagement/Add', + data: { + OrgId: 1, + Gender: parseInt($('.sex-select span.active').attr('gender')), + RealName: $("#name").textbox('getValue'), + LoginName: $('#loginAccount').textbox('getValue'), + LoginPassword: $('#loginPassword').textbox('getValue') + }, + success: function () { + this.Parent.ReLoadTableData(); + }.bind(this) + }); + }; + + this.clearInput = function () { + $("#name").textbox('setValue', ''); + $('#loginAccount').textbox('setValue', ''); + $('#loginPassword').textbox('setValue', ''); + $('.sex-select span').eq(0).addClass("active"); }; }; \ No newline at end of file diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js index 0f9d8d3..5afd243 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js @@ -9,12 +9,13 @@ }; this.Show = function (data) { + console.log(data) $('#edit-dialog').show(); - $("#username").textbox('setValue', data.Name); - $("#account").textbox('setValue', data.LoginAccount); - $("#pass").textbox('setValue', data.LoginPassword); - $('#sex span').eq(0).attr('type') === data.Sex ? $('#sex span').eq(0).addClass('active') : $('#sex span').eq(0).removeClass('active'); - $('#sex span').eq(1).attr('type') === data.Sex ? $('#sex span').eq(1).addClass('active') : $('#sex span').eq(1).removeClass('active'); + $("#username").textbox('setValue', data.RealName); + $("#account").textbox('setValue', data.LoginName); + $("#password").textbox('setValue', data.LoginPassWord); + parseInt($('#sex span').eq(0).attr('gender')) === data.Gender ? $('#sex span').eq(0).addClass('active') : $('#sex span').eq(0).removeClass('active'); + parseInt($('#sex span').eq(1).attr('gender')) === data.Gender ? $('#sex span').eq(1).addClass('active') : $('#sex span').eq(1).removeClass('active'); }; this.OnSexButtonClick = function (event) { @@ -23,10 +24,39 @@ }; this.OnSureButtonClick = function () { - $('#edit-dialog').hide(); + this.HideDialog(); + this.EditUser(); }; this.HideDialog = function () { $('#edit-dialog').hide(); + + this.clearInput(); + }; + + this.EditUser = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/UserManagement/Update', + data: { + OrgId: 1, + Gender: parseInt($('#sex span.active').attr('gender')), + RealName: $("#username").textbox('getValue'), + LoginName: $('#account').textbox('getValue'), + LoginPassword: $('#password').textbox('getValue') + }, + success: function (result) { + console.log(result) + this.Parent.ReLoadTableData(); + }.bind(this) + }); + }; + + this.clearInput = function () { + $("#username").textbox('setValue', ''), + $('#account').textbox('setValue', ''), + $('#password').textbox('setValue', ''), + $('#sex span').eq(0).addClass("active"); }; }; \ No newline at end of file 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 259ac06..89211bc 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -1,25 +1,25 @@ var App = function () { - + this.data = {}; this.selectedRow = []; this.AddDialog = new AddDialog(this); this.EditDialog = new EditDialog(this); this.Startup = function () { + $('#manage').addClass('active'); + 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)); $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this)); $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this)); - $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this)); + $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this)); $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this)); window.onresize = this.ReLayout.bind(this); @@ -40,8 +40,7 @@ { 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) } + { field: 'CreateTime', title: '最后登录时间', align: 'left', width: 60, formatter: this.formatTime.bind(this) } ]], striped: true, singleSelect: false, @@ -54,24 +53,11 @@ pagination: true, onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this), - onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), + onBeforeLoad: this.OnTableGridBeforeLoad.bind(this) }); }; this.ReLoadTableData = function () { - $('#task-table').datagrid({ - method: "POST", - url: '/UserManagement/Query', - queryParams: { - pageIndex: 1, - pageSize: 10 - } - }); - - console.log('ok') - }; - - this.aa = function () { $.ajax({ type: "POST", dataType: 'text', @@ -81,15 +67,16 @@ pageSize: 10 }, success: function (result) { - console.log($.parseJSON(result)) + console.log(JSON.parse(result)) + $('#task-grid').datagrid('loadData', JSON.parse(result)); }.bind(this) }); - } - - this.formatText = function (value) { - return value === 1 ? '已启用' : '已禁用'; }; + this.formatTime = function (time) { + return '{0}'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); + } + this.OnTaskSelected = function (index, row) { this.selectedRow = row; $('.datagrid-btable tr').removeClass('datagrid-row-selected'); @@ -110,14 +97,13 @@ }; 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'] - //}); + var page = $('#task-grid').datagrid('getPager'); + $(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 () { @@ -130,12 +116,31 @@ this.onDeleteButtonClick = function () { $('.dialog-delete').show(); - $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗？'.format(this.selectedRow.Name)); + $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗？'.format(this.selectedRow.RealName)); + }; + + this.OnSureOfDeleteButtonClick = function () { + this.CloseDeleteDialog(); + this.DeleteUser(); }; this.CloseDeleteDialog = function () { $('.dialog-delete').hide(); }; + + this.DeleteUser = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/UserManagement/Delete', + data: { + id: this.selectedRow.Id + }, + success: function () { + this.ReLoadTableData(); + }.bind(this) + }); + }; }; $(document).ready(function () { diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 7541d81..67e0b70 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -225,7 +225,7 @@ height: 28px; position: absolute; top: -6px; - left: 70px; + left: 165px; background-color: #dddddd } @@ -426,13 +426,19 @@ background-position-x: 7px; } +.user-toolbar { + align-items: center; + justify-content: space-between; +} + .statistic-toolbar { padding-right: 10px; align-items: center; justify-content: flex-end; } -.statistic-toolbar .query-btn { +.statistic-toolbar .query-btn, +.user-toolbar .query-btn{ height: 28px; margin-left: 10px; padding: 0 16px; @@ -442,14 +448,20 @@ background: linear-gradient(to bottom, #febd52, #faa71c); } -.statistic-toolbar .tip { +.statistic-toolbar .tip, +.user-toolbar .tip{ margin: 0 6px; } -.statistic-toolbar .query-btn:hover { +.statistic-toolbar .query-btn:hover, +.user-toolbar .query-btn:hover{ color: #ffffff } +.user-toolbar .btn-groups { + margin-top: 0; +} + .delete-user-dialog .dialog-title h2 { background: none !important; padding-left: 14px; diff --git a/04.系统编码/App/Views/OrgManagement/Index.cshtml b/04.系统编码/App/Views/OrgManagement/Index.cshtml index 5928b6b..25b37b0 100644 --- a/04.系统编码/App/Views/OrgManagement/Index.cshtml +++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml @@ -27,10 +27,10 @@ -
+ @*
-
+
*@
diff --git a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml index 761a724..cd60194 100644 --- a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml +++ b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml @@ -16,8 +16,8 @@
- 男 - 女 + 男 + 女
diff --git a/04.系统编码/App/Views/UserManagement/EditDialog.cshtml b/04.系统编码/App/Views/UserManagement/EditDialog.cshtml index 9f8a5b0..0deb1bb 100644 --- a/04.系统编码/App/Views/UserManagement/EditDialog.cshtml +++ b/04.系统编码/App/Views/UserManagement/EditDialog.cshtml @@ -16,8 +16,8 @@
- 男 - 女 + 男 + 女
@@ -28,7 +28,7 @@
- +
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 7ca3b6d..1b8c741 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -21,15 +21,20 @@
-
+
-
+ @*
+
*@ +
+ 机构名称 + +