diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 15d8918..75605dd 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 5756d43..625b54e 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 33ed497..590b2c0 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 688580f..12457af 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/register/register.js b/04.系统编码/App/Content/scripts/register/register.js
index 94fc7fd..fc86303 100644
--- a/04.系统编码/App/Content/scripts/register/register.js
+++ b/04.系统编码/App/Content/scripts/register/register.js
@@ -1,23 +1,74 @@
var Register = function () {
this.Startup = function () {
- $('#select').on('click', this.OnSelectChange.bind(this));
+ this.InitOrgList();
+ //$('#select').on('click', this.OnSelectChange.bind(this));
+ $('#register-button').on('click', this.OnRegisterButtonClick.bind(this));
};
- this.OnSelectChange = function () {
- var option = $("#select option:selected");
- console.log(option.val());
- if (option.val() !== '请选择') {
- $('#select').css({
- color: '#3a3a3a',
- fontSize: '16px'
- });
+ this.InitOrgList = function () {
+ $.ajax({
+ type: "POST",
+ dataType: 'text',
+ url: '/OrgManagement/Query',
+ data: {
+ page: 1,
+ rows: 10000
+ },
+ success: function (result) {
+ $('#org-list').combobox({
+ valueField: 'Id',
+ textField: 'Name',
+ editable: false,
+ panelHeight: 'auto',
+ data: JSON.parse(result).rows
+ });
+ }.bind(this)
+ });
+ };
+
+ this.OnRegisterButtonClick = function () {
+ this.validation();
+ };
+
+ this.validation = function () {
+ if ($("#username").val().trim() === '' || $("#username").val().trim === null) {
+ alert('请输入用户名');
+ return
+ } else if ($('#org-list').combobox('getValue') === '') {
+ alert('请选择机构');
+ return;
+ } else if ($("#login-account").val().trim() === '' || $("#login-account").val().trim === null) {
+ alert('请输入登录账户');
+ return
+ } else if ($("#password").val().trim() === '' || $("#password").val().trim === null) {
+ alert('请输入密码');
+ return
+ } else if ($("#password").val().length < 6) {
+ alert('密码长度至少为6位');
+ return
} else {
- $('#select').css({
- color: '#868686',
- fontSize: '14px'
- });
+ this.RegisterUser();
}
};
+
+ this.RegisterUser = function () {
+ $.ajax({
+ type: "POST",
+ dataType: 'text',
+ url: '/UserManagement/Add',
+ data: {
+ OrgId: $("#select option:selected").val(),
+ //Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')),
+ RealName: $("#username").val().trim(),
+ LoginName: $("#login-account").val().trim(),
+ LoginPassword: $("#password").val().trim()
+ },
+ success: function () {
+ alert('注册成功,即将跳转到登录页。');
+ window.location.href = '/User/Login';
+ }.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 bdd282b..8efdd50 100644
--- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
@@ -29,19 +29,28 @@
};
this.ReLoadTableData = function () {
- $.ajax({
- type: "POST",
- dataType: 'text',
+ //$.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({
+ method: "POST",
url: '/StatisticAnalysis/Query',
- data: {
+ queryParams: {
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)
+ }
});
};
@@ -100,7 +109,7 @@
pagination: true,
pageNumber: 1,
pageSize: 20,
- pageList: [10, 20, 30],
+ pageList: [10, 20, 50, 100, 150, 200],
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
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 c800fd1..c71f51b 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/add.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/add.js
@@ -24,7 +24,6 @@
rows: 10000
},
success: function (result) {
- console.log(result)
$('#add-dialog-org-list').combobox({
valueField: 'Id',
textField: 'Name',
@@ -96,6 +95,9 @@
} else if ($("#loginPassword").textbox('getValue').trim() === '' || $("#loginPassword").textbox('getValue').trim === null) {
alert('请输入登录密码');
return
+ } else if ($("#loginPassword").textbox('getValue').trim().length < 6) {
+ alert('密码长度至少为6位');
+ return
} else {
this.AddUser();
this.HideDialog();
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 4b5cd96..2e597d0 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
@@ -66,6 +66,9 @@
} else if ($("#password").textbox('getValue').trim() === '' || $("#password").textbox('getValue').trim === null) {
alert('请输入登录密码');
return
+ } else if ($("#password").textbox('getValue').trim().length < 6) {
+ alert('密码长度至少为6位');
+ return
} else {
this.User.OrgId = $('#edit-dialog-org-list').combobox('getValue');
this.User.Gender = parseInt($('#sex span.active').attr('gender'));
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 f2a4844..052af53 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
@@ -30,7 +30,6 @@
this.ReLayout = function () {
var width = $(window).width();
var height = $(window).height();
-
$('.manage-table, .manage-table .datagrid').width(width -247);
$('.manage-table, .manage-table .datagrid').height(height - 109);
};
@@ -65,10 +64,12 @@
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 },
+ { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 10, formatter: this.formatPassword.bind(this) },
{ field: 'ComputeCount', title: '登录次数', align: 'center', width: 10 },
- { field: 'CreateTime', title: '最后登录时间', align: 'left', width: 60, formatter: this.formatTime.bind(this) }
+ { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 15},
+ { field: 'CreateTime', title: '最后登录时间', align: 'left', width: 35, formatter: this.formatTime.bind(this) }
]],
striped: true,
singleSelect: false,
@@ -108,11 +109,22 @@
});
};
+ this.formatPassword = function (password) {
+ var len = password.length - 2;
+ var symbol = '';
+ for (var i = 0; i < len; i++) {
+ symbol += '*';
+ }
+ return password.substring(0, 1) + symbol + password.substring(password.length - 1);
+ };
+
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.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');
@@ -147,7 +159,7 @@
this.onDeleteButtonClick = function () {
$('.dialog-delete').show();
- $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗?'.format(this.selectedRow.RealName));
+ $('.dialog-clear h2').text('确定删除名为「{0}」的用户吗?'.format(this.selectedRow.RealName));
};
this.OnSureOfDeleteButtonClick = function () {
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index 0bcd4d4..38bfdb8 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@@ -218,6 +218,10 @@
overflow: visible;
}
+.manage-table .datagrid-header td:last-of-type .datagrid-cell {
+ padding-left: 40px;
+}
+
.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: '';
@@ -638,6 +642,14 @@
color: #3a3a3a;
}
+.manage-dialog .user-dialog .modal-body .row .col .textbox .validatebox-readonly {
+ cursor: pointer;
+}
+
+.manage-dialog .modal-body .row .col .textbox .textbox-prompt {
+ color: #868686;
+}
+
.manage-dialog .modal-body .row .col .textbox-readonly .textbox-text {
width: calc(100% - 30px) !important;
}
@@ -770,4 +782,8 @@
height: 128px;
display: block;
background: url("../images/null-data.png") no-repeat;
+}
+
+.textbox .textbox-prompt {
+ color: #868686;
}
\ No newline at end of file
diff --git a/04.系统编码/App/Content/styles/register.css b/04.系统编码/App/Content/styles/register.css
index 6236432..8b5c18f 100644
--- a/04.系统编码/App/Content/styles/register.css
+++ b/04.系统编码/App/Content/styles/register.css
@@ -34,22 +34,11 @@
position: relative;
}
-.register-block select {
- width: 341px;
- height: 40px;
- padding-left: 37px;
- line-height: 40px;
- border: 1px solid #dddddd;
- border-radius: 3px;
- background: #ffffff;
- color: #868686;
- font-size: 14px;
-}
-
.register-block span.icon {
position: absolute;
top: 12px;
left: 10px;
+ z-index: 10;
}
.register-block input {
@@ -76,3 +65,16 @@
color: #868686;
background: url('../images/login-btn.png') no-repeat center/cover;
}
+
+.org-select .textbox .textbox-text {
+ height: 40px !important;
+ padding-left: 37px;
+ line-height: 44px;
+ border-radius: 3px;
+}
+
+.org-select .combo-arrow {
+ background: url("../images/drop-down.png") no-repeat;
+ background-size: 20px 20px;
+ background-position-y: 12px;
+}
\ No newline at end of file
diff --git a/04.系统编码/App/Views/Register/Index.cshtml b/04.系统编码/App/Views/Register/Index.cshtml
index c63d97d..6ac6119 100644
--- a/04.系统编码/App/Views/Register/Index.cshtml
+++ b/04.系统编码/App/Views/Register/Index.cshtml
@@ -8,17 +8,18 @@