diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index ab1dac2..3bc11c7 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 2676806..0b21d35 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 03c3788..fb1863c 100644 --- a/04.系统编码/App/Content/scripts/register/register.js +++ b/04.系统编码/App/Content/scripts/register/register.js @@ -1,7 +1,10 @@ var Register = function () { + this.passwordVisible = false; + this.Startup = function () { this.InitOrgList(); - //$('#select').on('click', this.OnSelectChange.bind(this)); + $(".sex-select span").on("click", this.OnSexButtonClick.bind(this)); + $(".password-toggle").on("click", this.OnPasswordToggle.bind(this)); $('#register-button').on('click', this.OnRegisterButtonClick.bind(this)); }; @@ -26,6 +29,24 @@ }); }; + this.OnPasswordToggle = function () { + this.passwordVisible = !this.passwordVisible; + + if (this.passwordVisible) { + $('#password').attr('type', 'text'); + $('.password-toggle').addClass('password-open'); + } + else { + $('#password').attr('type', 'password'); + $('.password-toggle').removeClass('password-open'); + } + }; + + this.OnSexButtonClick = function (event) { + $('.sex-select span').removeClass("active"); + $(event.target).addClass("active"); + } + this.OnRegisterButtonClick = function () { this.validation(); }; @@ -58,7 +79,7 @@ url: '/UserManagement/Add', data: { OrgId: $('#org-list').combobox('getValue'), - //Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')), + Gender: parseInt($('.sex-select span.active').attr('gender')), RealName: $("#username").val().trim(), LoginName: $("#login-account").val().trim(), LoginPassword: $("#password").val().trim() 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 71a648c..448103d 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -36,7 +36,7 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Name', title: '名称', align: 'left', width: 120 }, + { field: 'Name', title: '名称', align: 'left', width: 180 }, { field: 'CreateTime', title: '创建时间', align: 'left', width: 160, formatter: this.formatTime.bind(this) }, { field: 'Null', title: '', align: 'left' } ]], @@ -68,8 +68,8 @@ 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'); + headerTd.css('width', (width - 241) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 241) + 'px'); }; this.ReLoadTableData = 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 c628b92..15b5ead 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -83,7 +83,7 @@ this.statisticGrid.datagrid({ columns: [[ { field: 'UserName', title: '姓名', align: 'center', width: 120 }, - { field: 'OrgName', title: '所属机构', align: 'center', width: 120 }, + { field: 'OrgName', title: '所属机构', align: 'left', width: 180 }, { field: 'ComputeCount', title: '计算次数', align: 'center', width: 100 }, { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) }, { field: 'Null', title: '', align: 'left' } @@ -116,8 +116,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 502) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 502) + 'px'); + headerTd.css('width', (width - 562) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 562) + '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 49c66a6..a8da437 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -65,8 +65,8 @@ this.userGrid.datagrid({ columns: [[ { field: 'RealName', title: '姓名', align: 'center', width: 120 }, - { field: 'OrgName', title: '所属机构', align: 'left', width: 120 }, - { field: 'LoginName', title: '登录账户', align: 'left', width: 120 }, + { field: 'OrgName', title: '所属机构', align: 'left', width: 180 }, + { field: 'LoginName', title: '登录账户', align: 'left', width: 150 }, { 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: 160, formatter: this.formatLastTime.bind(this)}, @@ -101,8 +101,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 901) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 901) + 'px'); + headerTd.css('width', (width - 991) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 991) + 'px'); }; this.onQueryButtonClick = function () { diff --git a/04.系统编码/App/Content/scripts/user/login.js b/04.系统编码/App/Content/scripts/user/login.js index b4af8bb..a583e90 100644 --- a/04.系统编码/App/Content/scripts/user/login.js +++ b/04.系统编码/App/Content/scripts/user/login.js @@ -1,7 +1,6 @@ var Login = function () { this.Startup = function () { $('#login-button').on('click', this.OnLoginButtonClick.bind(this)); - $('#login-button').trigger('click'); } this.OnLoginButtonClick = function () { diff --git a/04.系统编码/App/Content/styles/register.css b/04.系统编码/App/Content/styles/register.css index 8b5c18f..ed29f48 100644 --- a/04.系统编码/App/Content/styles/register.css +++ b/04.系统编码/App/Content/styles/register.css @@ -25,8 +25,15 @@ background: #ffffff; } +.register-content .label { + margin-bottom: 40px; + text-align: center; + font-size: 24px; + color: #474747; +} + .register-logo { - margin: 75px 0 20px 40px; + margin: 30px 0 20px 40px; } .register-block { @@ -55,6 +62,59 @@ font-size: 16px; } +.register-block .sex-select { + border-radius: 3px; + overflow: hidden; + display: flex; + position: absolute; + right: 44px; + top: 0; +} + +.register-block .sex-select span { + width: 40px; + cursor: pointer; + line-height: 39px; + text-align: center; + border-style: solid; + border-color: #d2d2d2; + border-width: 1px 0 1px 0; + background: linear-gradient(to bottom, #fefefe, #dcdcdc); +} + +.register-block .sex-select span:first-of-type { + border-left: 1px solid #d2d2d2; +} + +.register-block .sex-select span:last-of-type { + border-right: 1px solid #d2d2d2; +} + +.register-block .sex-select span.active { + background: #fdb846; + border-color: #fdb846; + color: #ffffff; +} + +.register-block .sex-select span:first-of-type.active, +.register-block .sex-select span:last-of-type.active { + border-color: #fdb846; +} + +.register-block .password-toggle { + width: 16px; + height: 16px; + position: absolute; + top: 12px; + right: 55px; + cursor: pointer; + background: url("../images/password-close.png") no-repeat center/cover; +} + +.register-block .password-open { + background: url("../images/password-open.png") no-repeat center/cover; +} + .register-btn { width: 345px; margin: 12px 0 0 38px; diff --git a/04.系统编码/App/Views/Register/Index.cshtml b/04.系统编码/App/Views/Register/Index.cshtml index 6ac6119..965d817 100644 --- a/04.系统编码/App/Views/Register/Index.cshtml +++ b/04.系统编码/App/Views/Register/Index.cshtml @@ -6,19 +6,17 @@
+

用户注册

+
+ + +
- @**@
@@ -28,6 +26,7 @@
+