diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 4273eda..ab1dac2 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-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
index 2ea753c..2676806 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/config-management/index.js b/04.系统编码/App/Content/scripts/system-management/config-management/index.js
index 113f603..532b73d 100644
--- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js
@@ -27,26 +27,45 @@
$('.manage-table, .manage-table .datagrid').width(width - 247);
$('.manage-table, .manage-table .datagrid').height(height - 109);
+ this.formatLastColumn();
};
this.InitDataGrid = function () {
$('#task-grid').datagrid({
columns: [[
- { field: 'Id', title: '名称', align: 'center', width: 10 },
- { field: 'Value', title: '值', align: 'center', width: 10 },
- { field: 'Unit', title: '单位', align: 'center', width: 10, formatter: this.formatUnit.bind(this) },
- { field: 'Description', title: '描述', align: 'left', width: 60, formatter: this.formatDescription.bind(this) }
+ { field: 'Id', title: '名称', align: 'left', width: 120 },
+ { field: 'Value', title: '值', align: 'left', width: 150 },
+ { field: 'Unit', title: '单位', align: 'center', width: 100, formatter: this.formatUnit.bind(this) },
+ { field: 'Description', title: '描述', align: 'left', width: 200, formatter: this.formatDescription.bind(this) },
+ { field: 'Null', title: '', align: 'left' }
]],
striped: true,
singleSelect: false,
- fitColumns: true,
fit: true,
scrollbarSize: 0,
onSelect: this.OnTaskSelected.bind(this),
- onUnselect: this.OnTaskUnselected.bind(this)
+ onUnselect: this.OnTaskUnselected.bind(this),
+ onLoadSuccess: function (data) {
+ if (data.total === 0) {
+ var body = $(this).data().datagrid.dc.body2;
+ 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 - 571) + 'px');
+ bodyTable.find('tr').find('td:last').css('width', (width - 571) + 'px');
+ };
+
this.ReLoadTableData = function () {
$.ajax({
type: "POST",
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 27f5061..71a648c 100644
--- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js
@@ -30,23 +30,24 @@
$('.manage-table, .manage-table .datagrid').width(width - 247);
$('.manage-table, .manage-table .datagrid').height(height - 109);
+ this.formatLastColumn();
};
this.InitDataGrid = function () {
$('#task-grid').datagrid({
columns: [[
- { field: 'Name', title: '名称', align: 'center', width: 10 },
- { field: 'CreateTime', title: '创建时间', align: 'left', width: 80, formatter: this.formatTime.bind(this) }
+ { field: 'Name', title: '名称', align: 'left', width: 120 },
+ { field: 'CreateTime', title: '创建时间', align: 'left', width: 160, formatter: this.formatTime.bind(this) },
+ { field: 'Null', title: '', align: 'left' }
]],
striped: true,
singleSelect: false,
- fitColumns: true,
fit: true,
scrollbarSize: 0,
pagination: true,
pageNumber: 1,
- pageSize: 30,
- pageList: [30, 40, 50],
+ pageSize: 50,
+ pageList: [10, 20, 50, 100, 150, 200],
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
@@ -56,10 +57,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 - 181) + 'px');
+ bodyTable.find('tr').find('td:last').css('width', (width - 181) + 'px');
+ };
+
this.ReLoadTableData = function () {
$('#task-grid').datagrid({
method: "POST",
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 5c46031..c628b92 100644
--- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
@@ -85,7 +85,8 @@
{ 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) }
+ { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) },
+ { field: 'Null', title: '', align: 'left' }
]],
striped: true,
singleSelect: false,
@@ -93,7 +94,7 @@
scrollbarSize: 0,
pagination: true,
pageNumber: 1,
- pageSize: 20,
+ pageSize: 50,
pageList: [10, 20, 50, 100, 150, 200],
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
@@ -115,8 +116,8 @@
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');
+ headerTd.css('width', (width - 502) + 'px');
+ bodyTable.find('tr').find('td:last').css('width', (width - 502) + 'px');
};
this.formatTime = function (time) {
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 92e1f3b..49c66a6 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
@@ -65,12 +65,13 @@
this.userGrid.datagrid({
columns: [[
{ 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: 'OrgName', title: '所属机构', align: 'left', width: 120 },
+ { field: 'LoginName', title: '登录账户', align: 'left', width: 120 },
+ { field: 'LoginPassWord', title: '登录密码', align: 'left', 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) }
+ { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastTime.bind(this)},
+ { field: 'CreateTime', title: '最后登录时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) },
+ { field: 'Null', title: '', align: 'left' }
]],
striped: true,
singleSelect: false,
@@ -78,7 +79,7 @@
scrollbarSize: 0,
pagination: true,
pageNumber: 1,
- pageSize: 20,
+ pageSize: 50,
pageList: [10, 20, 50, 100, 150, 200],
loadMsg: '正在加载数据，请稍后...',
onSelect: this.OnTaskSelected.bind(this),
@@ -100,9 +101,8 @@
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');
+ headerTd.css('width', (width - 901) + 'px');
+ bodyTable.find('tr').find('td:last').css('width', (width - 901) + 'px');
};
this.onQueryButtonClick = function () {
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index e12de31..c9ac115 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@@ -233,6 +233,10 @@
background-color: #dddddd
}*/
+.manage-table .datagrid-cell {
+ padding: 0 8px;
+}
+
.statistic-table .datagrid-header td:last-of-type .datagrid-cell:after,
.statistic-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after {
left: 180px;
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml
index 470df00..2a3d7c0 100644
--- a/04.系统编码/App/Views/UserManagement/Index.cshtml
+++ b/04.系统编码/App/Views/UserManagement/Index.cshtml
@@ -37,7 +37,7 @@
-