diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 957cc2c..9ceb9ec 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 3e5e0e9..d5f9eee 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 532b73d..4bed56f 100644 --- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js @@ -62,8 +62,8 @@ 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'); + headerTd.css('width', (width - 572) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 572) + 'px'); }; this.ReLoadTableData = function () { 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 448103d..bd6ee90 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -37,7 +37,7 @@ $('#task-grid').datagrid({ columns: [[ { field: 'Name', title: '名称', align: 'left', width: 180 }, - { field: 'CreateTime', title: '创建时间', align: 'left', width: 160, formatter: this.formatTime.bind(this) }, + { field: 'CreateTime', title: '创建时间', align: 'center', width: 180, formatter: this.formatTime.bind(this) }, { field: 'Null', title: '', align: 'left' } ]], striped: true, @@ -68,8 +68,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 241) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 241) + 'px'); + headerTd.css('width', (width - 261) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 261) + '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 15b5ead..32e8931 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -44,7 +44,7 @@ panelAlign: 'right', panelWidth: 200, panelHeight: 230, - showSeconds: true, + showSeconds: false, currentText: '现在', onSelect: function (date) { var startTime = date.getTime(); @@ -62,7 +62,7 @@ panelWidth: 190, panelHeight: 230, panelAlign: 'right', - showSeconds: true, + showSeconds: false, currentText: '现在', onSelect: function (date) { var endTime = date.getTime(); 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 a8da437..1eda81c 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -68,9 +68,11 @@ { 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)}, - { field: 'CreateTime', title: '最后登录时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) }, + { field: 'ComputeCount', title: '计算次数', align: 'center', width: 80 }, + { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastComputeTime.bind(this) }, + { field: 'LoginCount', title: '登录次数', align: 'center', width: 80 }, + { field: 'LastLoginTime', title: '最后登录时间', align: 'center', width: 160, formatter: this.formatLastLoginTime.bind(this) }, + { field: 'CreateTime', title: '创建时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) }, { field: 'Null', title: '', align: 'left' } ]], striped: true, @@ -101,8 +103,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 991) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 991) + 'px'); + headerTd.css('width', (width - 1213) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 1213) + 'px'); }; this.onQueryButtonClick = function () { @@ -133,12 +135,18 @@ return '{0}'.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')); + this.formatLastComputeTime = function (time) { + var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss'); return '{0}'.format(value); }; + this.formatLastLoginTime = function (time) { + var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss'); + return '{0}'.format(value); + } + 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'); diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index c9ac115..62e6fd4 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -200,6 +200,7 @@ } .manage-table .datagrid-header td { + position: relative; background: linear-gradient(to bottom, #ffffff, #f5f5f5, #eaeaea); } @@ -218,8 +219,29 @@ overflow: visible; } -.manage-table .datagrid-header td:last-of-type .datagrid-cell { - /*padding-left: 40px;*/ +.user-table .datagrid-header td:nth-of-type(9):after, +.statistic-table .datagrid-header td:nth-of-type(4):after, +.org-table .datagrid-header td:nth-of-type(2):after, +.config-table .datagrid-header td:nth-of-type(4):after { + content: ''; + width: 10000px; + height: 28px; + position: absolute; + top: 0px; + left: 160px; + background: linear-gradient(to bottom, #ffffff, #f5f5f5, #eaeaea); +} + +.statistic-table .datagrid-header td:nth-of-type(4):after { + left: 161px; +} + +.org-table .datagrid-header td:nth-of-type(2):after { + left: 180px; +} + +.config-table .datagrid-header td:nth-of-type(4):after { + left: 201px; } /*.manage-table .datagrid-header td:last-of-type .datagrid-cell:after, @@ -237,16 +259,6 @@ 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; -} - -.config-table .datagrid-header td:last-of-type .datagrid-cell:after, -.config-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after { - left: 200px; -} - .manage-table .datagrid-body .datagrid-row:last-of-type td { border-bottom: 1px solid #dddddd; } @@ -451,11 +463,19 @@ } .statistic-toolbar .easyui-datetimebox { - width: 170px; + width: 150px; +} + +.textbox { + border-top-color: #dddddd; +} + +.statistic-toolbar .textbox .textbox-text { + padding-top: 2px !important; } .statistic-toolbar .query-btn, -.user-toolbar .query-btn{ +.user-toolbar .query-btn { height: 28px; margin-left: 10px; padding: 0 16px; diff --git a/04.系统编码/App/Content/styles/login.css b/04.系统编码/App/Content/styles/login.css index b2d07d5..d70312d 100644 --- a/04.系统编码/App/Content/styles/login.css +++ b/04.系统编码/App/Content/styles/login.css @@ -26,7 +26,7 @@ } .login-logo{ - margin: 75px 0 0 40px; + margin: 70px 0 0 40px; } .login-block { @@ -55,7 +55,7 @@ } .login-tip { - margin-top: 20px; + margin-top: 15px; display: block; text-align: right; padding-right: 43px; @@ -69,7 +69,7 @@ .login-btn { width: 345px; - margin: 12px 0 0 38px; + margin: 40px 0 0 38px; line-height: 46px; text-align: center; cursor: pointer; diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml index 3ee51f9..24dbac5 100644 --- a/04.系统编码/App/Views/Beijing/Index.cshtml +++ b/04.系统编码/App/Views/Beijing/Index.cshtml @@ -10,9 +10,9 @@
-
+ @*
风场粒子 -
+
*@
时间标签
diff --git a/04.系统编码/App/Views/OrgManagement/Index.cshtml b/04.系统编码/App/Views/OrgManagement/Index.cshtml index 25b37b0..13950f4 100644 --- a/04.系统编码/App/Views/OrgManagement/Index.cshtml +++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml @@ -32,7 +32,7 @@
*@ -
+
diff --git a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml index 1b553ef..0dec61c 100644 --- a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml +++ b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml @@ -22,7 +22,7 @@
- 起止日期 + 起止时间
diff --git a/04.系统编码/App/Views/User/Login.cshtml b/04.系统编码/App/Views/User/Login.cshtml index 7605a38..1ee384f 100644 --- a/04.系统编码/App/Views/User/Login.cshtml +++ b/04.系统编码/App/Views/User/Login.cshtml @@ -15,8 +15,8 @@
- 还没有账号?去注册 + 还没有账号?去注册
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 2a3d7c0..470df00 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -37,7 +37,7 @@ -
+