root
/
BeijingSafeguard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

commit

master
hhx 3 years ago
parent
2a771d9c2b
commit
83aa217861
7 changed files with 53 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/.suo
  2. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
  3. 2
      04.系统编码/App/Content/scripts/register/register.js
  4. 50
      04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
  5. 36
      04.系统编码/App/Content/scripts/system-management/user-management/index.js
  6. 6
      04.系统编码/App/Content/styles/common.css
  7. 2
      04.系统编码/App/Views/UserManagement/Index.cshtml

BIN
04.系统编码/.vs/BeijingSafeguard/v15/.suo
View File

Binary file not shown.

BIN
04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

2
04.系统编码/App/Content/scripts/register/register.js
View File

@ -57,7 +57,7 @@
dataType: 'text', dataType: 'text',
url: '/UserManagement/Add', url: '/UserManagement/Add',
data: { data: {
OrgId: $("#select option:selected").val(), OrgId: $('#org-list').combobox('getValue'),
//Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')), //Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')),
RealName: $("#username").val().trim(), RealName: $("#username").val().trim(),
LoginName: $("#login-account").val().trim(), LoginName: $("#login-account").val().trim(),

50
04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
View File

@ -1,6 +1,5 @@
var App = function () { var App = function () {
this.statisticGrid = $('#task-grid');
this.selectedRow = []; this.selectedRow = [];
this.Startup = function () { this.Startup = function () {
@ -22,6 +21,7 @@
$('.manage-table, .manage-table .datagrid').width(width - 247); $('.manage-table, .manage-table .datagrid').width(width - 247);
$('.manage-table, .manage-table .datagrid').height(height - 109); $('.manage-table, .manage-table .datagrid').height(height - 109);
this.formatLastColumn();
}; };
this.OnQueryButtonClick = function () { this.OnQueryButtonClick = function () {
@ -29,22 +29,7 @@
}; };
this.ReLoadTableData = function () { this.ReLoadTableData = function () {
//$.ajax({ this.statisticGrid.datagrid({
// 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({
method: "POST", method: "POST",
url: '/StatisticAnalysis/Query', url: '/StatisticAnalysis/Query',
queryParams: { queryParams: {
@ -95,15 +80,15 @@
}; };
this.InitDataGrid = function () { this.InitDataGrid = function () {
$('#task-grid').datagrid({ this.statisticGrid.datagrid({
columns: [[ columns: [[
{ field: 'User', title: '姓名', align: 'center', width: 10 }, { field: 'UserName', title: '姓名', align: 'center', width: 120 },
{ field: 'ComputeCount', title: '计算次数', align: 'center', width: 10 }, { field: 'OrgName', title: '所属机构', align: 'center', width: 120 },
{ field: 'LastComputeTime', title: '最后计算时间', align: 'left', width: 70 } { field: 'ComputeCount', title: '计算次数', align: 'center', width: 100 },
{ field: 'LastComputeTime', title: '最后计算时间', align: 'left', formatter: this.formatTime.bind(this) }
]], ]],
striped: true, striped: true,
singleSelect: false, singleSelect: false,
fitColumns: true,
fit: true, fit: true,
scrollbarSize: 0, scrollbarSize: 0,
pagination: true, pagination: true,
@ -119,12 +104,23 @@
body.addClass('null-data-body'); body.addClass('null-data-body');
body.append('<div class="null-data"><span></span><p>暂无数据</p></div>'); body.append('<div class="null-data"><span></span><p>暂无数据</p></div>');
} }
}
this.formatLastColumn();
}.bind(this)
}); });
}; };
this.formatText = function (value) { this.formatLastColumn = function () {
return value === 1 ? '<span style="color: #00c541">已启用</span>' : '<span style="color: #f40000">已禁用</span>'; 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 '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss'));
}; };
this.OnTaskSelected = function (index, row) { this.OnTaskSelected = function (index, row) {
@ -164,7 +160,7 @@
}; };
this.OnTableGridBeforeLoad = function () { this.OnTableGridBeforeLoad = function () {
$('#task-grid').datagrid('getPager').pagination({ this.statisticGrid.datagrid('getPager').pagination({
beforePageText: '第', beforePageText: '第',
afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页', afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页',
displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录', displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录',

36
04.系统编码/App/Content/scripts/system-management/user-management/index.js
View File

@ -32,6 +32,7 @@
var height = $(window).height(); var height = $(window).height();
$('.manage-table, .manage-table .datagrid').width(width -247); $('.manage-table, .manage-table .datagrid').width(width -247);
$('.manage-table, .manage-table .datagrid').height(height - 109); $('.manage-table, .manage-table .datagrid').height(height - 109);
this.formatLastColumn();
}; };
this.InitOrgList = function () { this.InitOrgList = function () {
@ -63,17 +64,16 @@
this.InitDataGrid = function () { this.InitDataGrid = function () {
this.userGrid.datagrid({ this.userGrid.datagrid({
columns: [[ columns: [[
{ field: 'RealName', title: '姓名', align: 'center', width: 10 }, { field: 'RealName', title: '姓名', align: 'center', width: 120 },
{ field: 'OrgName', title: '所属机构', align: 'center', width: 10 }, { field: 'OrgName', title: '所属机构', align: 'center', width: 120 },
{ field: 'LoginName', title: '登录账户', align: 'center', width: 10 }, { field: 'LoginName', title: '登录账户', align: 'center', width: 120 },
{ field: 'LoginPassWord', title: '登录密码', align: 'center', width: 10, formatter: this.formatPassword.bind(this) }, { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 120, formatter: this.formatPassword.bind(this) },
{ field: 'ComputeCount', title: '登录次数', align: 'center', width: 10 }, { field: 'ComputeCount', title: '登录次数', align: 'center', width: 100 },
{ field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 15}, { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 170, formatter: this.formatLastTime.bind(this)},
{ field: 'CreateTime', title: '最后登录时间', align: 'left', width: 35, formatter: this.formatTime.bind(this) } { field: 'CreateTime', title: '最后登录时间', align: 'left', formatter: this.formatTime.bind(this) }
]], ]],
striped: true, striped: true,
singleSelect: false, singleSelect: false,
fitColumns: true,
fit: true, fit: true,
scrollbarSize: 0, scrollbarSize: 0,
pagination: true, pagination: true,
@ -90,10 +90,21 @@
body.addClass('null-data-body'); body.addClass('null-data-body');
body.append('<div class="null-data"><span></span><p>暂无数据</p></div>'); body.append('<div class="null-data"><span></span><p>暂无数据</p></div>');
} }
} 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 () { this.onQueryButtonClick = function () {
var orgId = $('#org-list').combobox('getValue') === '' ? 0 : $('#org-list').combobox('getValue'); var orgId = $('#org-list').combobox('getValue') === '' ? 0 : $('#org-list').combobox('getValue');
this.ReLoadTableData(orgId); this.ReLoadTableData(orgId);
@ -119,12 +130,15 @@
}; };
this.formatTime = function (time) { this.formatTime = function (time) {
console.log(moment(time).format('YYYY/MM/DD HH:mm:ss'))
return '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); return '<span>{0}</span>'.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 '<span>{0}</span>'.format(value);
};
this.OnTaskSelected = function (index, row) { this.OnTaskSelected = function (index, row) {
console.log(row)
this.selectedRow = row; this.selectedRow = row;
$('.datagrid-btable tr').removeClass('datagrid-row-selected'); $('.datagrid-btable tr').removeClass('datagrid-row-selected');
$('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected'); $('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected');

6
04.系统编码/App/Content/styles/common.css
View File

@ -219,10 +219,10 @@
} }
.manage-table .datagrid-header td:last-of-type .datagrid-cell { .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 { .manage-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after {
content: ''; content: '';
width: 1px; width: 1px;
@ -231,7 +231,7 @@
top: -6px; top: -6px;
left: 165px; left: 165px;
background-color: #dddddd background-color: #dddddd
} }*/
.statistic-table .datagrid-header td:last-of-type .datagrid-cell:after, .statistic-table .datagrid-header td:last-of-type .datagrid-cell:after,
.statistic-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after { .statistic-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after {

2
04.系统编码/App/Views/UserManagement/Index.cshtml
View File

@ -37,7 +37,7 @@
<button type="button" class="btn query-btn" id="query-btn">查询</button> <button type="button" class="btn query-btn" id="query-btn">查询</button>
</div> </div>
</div> </div>
<div class="table manage-table"> <div class="table manage-table user-table">
<table id="task-grid" class="easyui-datagrid"></table> <table id="task-grid" class="easyui-datagrid"></table>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save