commit

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 () {

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),

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();

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'));

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 '<span>{0}</span>'.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 () {

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;
 }

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;
+}

04.系统编码/App/Views/Register/Index.cshtml

@@ -8,17 +8,18 @@
             <img src="~/Content/images/login-logo.png" class="register-logo" />
             <div class="register-block register-username">
                 <span class="icon"><img src="~/Content/images/login-username.png" /></span>
-                <input type="text" id="register-name" placeholder="请输入用户名" />
+                <input type="text" id="username" placeholder="请输入用户名" />
             </div>
-            <div class="register-block register-password">
+            <div class="register-block org-select">
                 <span class="icon"><img src="~/Content/images/org.png" /></span>
-                <select id="select">
+                @*<select id="select">
                     <option disabled selected>请选择</option>
                     <option value="org1">机构</option>
                     <option value="org2">机构</option>
                     <option value="org3">机构</option>
                     <option value="org4">机构</option>
-                </select>
+                </select>*@
+                <input id="org-list" class="easyui-combobox" prompt="请选择机构" data-options="editable: false">
             </div>
             <div class="register-block register-username">
                 <span class="icon"><img src="~/Content/images/login-username.png" /></span>
@@ -26,7 +27,7 @@
             </div>
             <div class="register-block register-password">
                 <span class="icon"><img src="~/Content/images/login-password.png" /></span>
-                <input type="password" id="register-password" placeholder="请输入密码" />
+                <input type="password" id="password" placeholder="请输入密码" />
             </div>
 
             <button class="register-btn" id="register-button">注册</button>

04.系统编码/App/Views/UserManagement/AddDialog.cshtml

@@ -24,7 +24,7 @@
                         </div>
                         <div class="col">
                             <label>所属机构&nbsp;<span class="star">*</span></label>
-                            <input id="add-dialog-org-list" class="easyui-combobox" prompt="请选择机构">
+                            <input id="add-dialog-org-list" class="easyui-combobox" prompt="请选择机构" data-options="editable: false">
                         </div>
                     </div>
                     <div class="row">
@@ -34,7 +34,7 @@
                         </div>
                         <div class="col">
                             <label>登录密码&nbsp;<span class="star">*</span></label>
-                            <input id="loginPassword" class="easyui-passwordbox" prompt="请输入登录密码" />
+                            <input id="loginPassword" class="easyui-passwordbox" prompt="密码长度至少为6位" />
                         </div>
                     </div>
                 </div>

04.系统编码/App/Views/UserManagement/EditDialog.cshtml

@@ -24,7 +24,7 @@
                         </div>
                         <div class="col">
                             <label>所属机构&nbsp;<span class="star">*</span></label>
-                            <input id="edit-dialog-org-list" class="easyui-combobox" prompt="请选择机构">
+                            <input id="edit-dialog-org-list" class="easyui-combobox" prompt="请选择机构" data-options="editable: false">
                         </div>
                     </div>
                     <div class="row">
@@ -34,7 +34,7 @@
                         </div>
                         <div class="col">
                             <label>登录密码&nbsp;<span class="star">*</span></label>
-                            <input id="password" class="easyui-passwordbox" prompt="请输入登录密码" />
+                            <input id="password" class="easyui-passwordbox" prompt="密码长度至少为6位" />
                         </div>
                     </div>
                 </div>

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

@@ -33,7 +33,7 @@
             </div>*@
             <div class="params-select">
                 <span class="tip">机构名称</span>
-                <input id="org-list" class="easyui-combobox org-list">
+                <input id="org-list" class="easyui-combobox org-list" data-options="editable: false">
                 <button type="button" class="btn query-btn" id="query-btn">查询</button>
             </div>
         </div>