From 83aa217861c877799f71569962aa88a0aa23db7f Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Fri, 14 Jan 2022 14:27:44 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 221184 -> 213504 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes .../App/Content/scripts/register/register.js | 2 +- .../statistic-analysis/index.js | 50 ++++++++---------- .../user-management/index.js | 36 +++++++++---- 04.系统编码/App/Content/styles/common.css | 6 +-- .../App/Views/UserManagement/Index.cshtml | 2 +- 7 files changed, 53 insertions(+), 43 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 75605ddd80a93de14d8950fa0f8394da059ff15f..4273edaf03bf0ad268f2a82557bc4008cf3daea3 100644 GIT binary patch delta 7212 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 fux#|-{Y%EpQU2~<_wugfk?NJ!$`c|3w=3 delta 9166 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

Z|Eu)DF*)0orGeFrRMsJfSuuBBVR z{`MtdJ;=MzxF^CX7A&ZgX6a@wd)%}tKw<1@-}3Fr_qi>bxR!N$mu`Yt^duA>o`i(gj+YV3(+GClIV z^ays7y3nm=d^-AgI|QYpbgA+Z_#`)Cq~ z4EfG^=U}o@;Qs=C`nRDt(MWNq4Spvkw?T#2eF1ie{Hw53Bs>S{PRm6oRI=k@`89Bg z^3QPz)fs3N_Rm1)M7^BFgz5_@XFJ`~yZ#DBR^zV6{}qzh6N3E+W^O497aP8Wtu#1S zH1tJ_uK5}wJ(_(Av(q7-6b)ZP6kEj;x7{s`;{7XQaep9oU4Z+1Ou(hIk=Q&&T>b>l zL`Fee+6FPs)t6y4V;kM;fAtL{umd#h{atqB@jJxA@8BRiC0hOqUZYe|fcv}QOCI9H z^HWQru$APpi>@(0zI8%%8xY4p|@y zuHpHRjtA?01PgCZp&yPGORhl+^Ia}CnU*8d-9^H47a@vcLIGPTUfSw&fJ=p;V#m)A z$+o-qd;U5q``S2ZF1TlRf+8m58MBaX| zNr@$j`F>4e$%s3o#1egfqK~g~Vu{E%3PInW1mbA~eNUsr(l!JjdQB{ezwC$moZoK% zG@O4>NxKvc2QY7o(M_xTv;Y8ctG zy-x_T;KA{H5@ylzIgv{g%P<@%#aOFQYVLEl+#sqC!YqD3r$b&P{X4h`PIMCttoH=u zKukLKmO7`9V%T0oJ-|QX+sIg-ZznT@Z%&P;GjDFRu$PYl6jOV@!1Odrj|p~n>>cBc zz5l;*?Y-^0hmRTFxc*mtyAaEoAXP^e+g;*ZK8I1luE3GoSLr0)(% zP*5gC+L81bE5GYAR^e2iRIhs+S!T7|FHW?8Nk^7aE|g)ALS}EYdaD$ki^Z)_tn58D l9TCub5c+TTy^Kw8qIoul`q)4x+Q3zPeT<1SJY5L^{|i#mkN^Mx diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 12457af17e0d985b0010364cbacac22c9e150488..2ea753c2a00c944f3ff39a226d3f25bde9f26c4b 100644 GIT binary patch delta 12205 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 VpbMZYpc|k&AQI4ng=R+0{yWI%+iw5> delta 15281 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 diff --git a/04.系统编码/App/Content/scripts/register/register.js b/04.系统编码/App/Content/scripts/register/register.js index fc86303..03c3788 100644 --- a/04.系统编码/App/Content/scripts/register/register.js +++ b/04.系统编码/App/Content/scripts/register/register.js @@ -57,7 +57,7 @@ dataType: 'text', url: '/UserManagement/Add', data: { - OrgId: $("#select option:selected").val(), + OrgId: $('#org-list').combobox('getValue'), //Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')), RealName: $("#username").val().trim(), LoginName: $("#login-account").val().trim(), 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 8efdd50..5c46031 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -1,6 +1,5 @@ var App = function () { - - + this.statisticGrid = $('#task-grid'); this.selectedRow = []; this.Startup = function () { @@ -22,6 +21,7 @@ $('.manage-table, .manage-table .datagrid').width(width - 247); $('.manage-table, .manage-table .datagrid').height(height - 109); + this.formatLastColumn(); }; this.OnQueryButtonClick = function () { @@ -29,22 +29,7 @@ }; this.ReLoadTableData = function () { - //$.ajax({ - // type: "POST", - // dataType: 'text', - // url: '/StatisticAnalysis/Query', - // data: { - // fromTime: $("#from-date").datetimebox('getValue'), - // toTime: $("#to-date").datetimebox('getValue'), - // page: 1, - // rows: 10 - // }, - // success: function (result) { - // $('#task-grid').datagrid('loadData', JSON.parse(result)); - // }.bind(this) - //}); - - $('#task-grid').datagrid({ + this.statisticGrid.datagrid({ method: "POST", url: '/StatisticAnalysis/Query', queryParams: { @@ -95,15 +80,15 @@ }; this.InitDataGrid = function () { - $('#task-grid').datagrid({ + this.statisticGrid.datagrid({ columns: [[ - { field: 'User', title: '姓名', align: 'center', width: 10 }, - { field: 'ComputeCount', title: '计算次数', align: 'center', width: 10 }, - { field: 'LastComputeTime', title: '最后计算时间', align: 'left', width: 70 } + { field: 'UserName', title: '姓名', align: 'center', width: 120 }, + { field: 'OrgName', title: '所属机构', align: 'center', width: 120 }, + { field: 'ComputeCount', title: '计算次数', align: 'center', width: 100 }, + { field: 'LastComputeTime', title: '最后计算时间', align: 'left', formatter: this.formatTime.bind(this) } ]], striped: true, singleSelect: false, - fitColumns: true, fit: true, scrollbarSize: 0, pagination: true, @@ -119,12 +104,23 @@ body.addClass('null-data-body'); body.append('

暂无数据

'); } - } + + this.formatLastColumn(); + }.bind(this) }); }; - this.formatText = function (value) { - return value === 1 ? '已启用' : '已禁用'; + this.formatLastColumn = function () { + var width = $('.container').width(); + var headerTable = $('.datagrid-header'); + var bodyTable = $('.datagrid-body'); + var headerTd = headerTable.find('td:last'); + headerTd.css('width', (width - 342) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 342) + 'px'); + }; + + this.formatTime = function (time) { + return '{0}'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); }; this.OnTaskSelected = function (index, row) { @@ -164,7 +160,7 @@ }; this.OnTableGridBeforeLoad = function () { - $('#task-grid').datagrid('getPager').pagination({ + this.statisticGrid.datagrid('getPager').pagination({ beforePageText: '第', afterPageText: '页   共{pages}页', displayMsg: '当前显示{from}-{to}条记录   共{total}条记录', 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 052af53..92e1f3b 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -32,6 +32,7 @@ var height = $(window).height(); $('.manage-table, .manage-table .datagrid').width(width -247); $('.manage-table, .manage-table .datagrid').height(height - 109); + this.formatLastColumn(); }; this.InitOrgList = function () { @@ -63,17 +64,16 @@ this.InitDataGrid = function () { this.userGrid.datagrid({ columns: [[ - { field: 'RealName', title: '姓名', align: 'center', width: 10 }, - { field: 'OrgName', title: '所属机构', align: 'center', width: 10 }, - { field: 'LoginName', title: '登录账户', align: 'center', width: 10 }, - { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 10, formatter: this.formatPassword.bind(this) }, - { field: 'ComputeCount', title: '登录次数', align: 'center', width: 10 }, - { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 15}, - { field: 'CreateTime', title: '最后登录时间', align: 'left', width: 35, formatter: this.formatTime.bind(this) } + { field: 'RealName', title: '姓名', align: 'center', width: 120 }, + { field: 'OrgName', title: '所属机构', align: 'center', width: 120 }, + { field: 'LoginName', title: '登录账户', align: 'center', width: 120 }, + { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 120, formatter: this.formatPassword.bind(this) }, + { field: 'ComputeCount', title: '登录次数', align: 'center', width: 100 }, + { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 170, formatter: this.formatLastTime.bind(this)}, + { field: 'CreateTime', title: '最后登录时间', align: 'left', formatter: this.formatTime.bind(this) } ]], striped: true, singleSelect: false, - fitColumns: true, fit: true, scrollbarSize: 0, pagination: true, @@ -90,10 +90,21 @@ body.addClass('null-data-body'); body.append('

暂无数据

'); } - } + this.formatLastColumn(); + }.bind(this) }); }; + this.formatLastColumn = function () { + var width = $('.container').width(); + var headerTable = $('.datagrid-header'); + var bodyTable = $('.datagrid-body'); + var headerTd = headerTable.find('td:last'); + headerTd.css('width', (width - 753) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 753) + 'px'); + //bodyTd.eq(headerTd.length - 2).css('width', '172px'); + }; + this.onQueryButtonClick = function () { var orgId = $('#org-list').combobox('getValue') === '' ? 0 : $('#org-list').combobox('getValue'); this.ReLoadTableData(orgId); @@ -119,12 +130,15 @@ }; this.formatTime = function (time) { - console.log(moment(time).format('YYYY/MM/DD HH:mm:ss')) return '{0}'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); }; + this.formatLastTime = function (time) { + var value = time === null ? '-' : format(moment(time).format('YYYY/MM/DD HH:mm:ss')); + return '{0}'.format(value); + }; + this.OnTaskSelected = function (index, row) { - console.log(row) this.selectedRow = row; $('.datagrid-btable tr').removeClass('datagrid-row-selected'); $('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected'); diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 38bfdb8..e12de31 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -219,10 +219,10 @@ } .manage-table .datagrid-header td:last-of-type .datagrid-cell { - padding-left: 40px; + /*padding-left: 40px;*/ } -.manage-table .datagrid-header td:last-of-type .datagrid-cell:after, +/*.manage-table .datagrid-header td:last-of-type .datagrid-cell:after, .manage-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after { content: ''; width: 1px; @@ -231,7 +231,7 @@ top: -6px; left: 165px; background-color: #dddddd -} +}*/ .statistic-table .datagrid-header td:last-of-type .datagrid-cell:after, .statistic-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after { diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 2a3d7c0..470df00 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -37,7 +37,7 @@ -
+