fanwensheng 3 years ago
parent
commit
740d8d426f
  1. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/.suo
  2. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
  3. 4
      04.系统编码/App/Content/scripts/system-management/config-management/index.js
  4. 6
      04.系统编码/App/Content/scripts/system-management/org-management/index.js
  5. 4
      04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
  6. 22
      04.系统编码/App/Content/scripts/system-management/user-management/index.js
  7. 46
      04.系统编码/App/Content/styles/common.css
  8. 6
      04.系统编码/App/Content/styles/login.css
  9. 4
      04.系统编码/App/Views/Beijing/Index.cshtml
  10. 2
      04.系统编码/App/Views/OrgManagement/Index.cshtml
  11. 2
      04.系统编码/App/Views/StatisticAnalysis/Index.cshtml
  12. 2
      04.系统编码/App/Views/User/Login.cshtml
  13. 2
      04.系统编码/App/Views/UserManagement/Index.cshtml

BIN
04.系统编码/.vs/BeijingSafeguard/v15/.suo

Binary file not shown.

BIN
04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal

Binary file not shown.

4
04.系统编码/App/Content/scripts/system-management/config-management/index.js

@ -62,8 +62,8 @@
var headerTable = $('.datagrid-header'); var headerTable = $('.datagrid-header');
var bodyTable = $('.datagrid-body'); var bodyTable = $('.datagrid-body');
var headerTd = headerTable.find('td:last'); var headerTd = headerTable.find('td:last');
headerTd.css('width', (width - 571) + 'px'); headerTd.css('width', (width - 572) + 'px');
bodyTable.find('tr').find('td:last').css('width', (width - 571) + 'px'); bodyTable.find('tr').find('td:last').css('width', (width - 572) + 'px');
}; };
this.ReLoadTableData = function () { this.ReLoadTableData = function () {

6
04.系统编码/App/Content/scripts/system-management/org-management/index.js

@ -37,7 +37,7 @@
$('#task-grid').datagrid({ $('#task-grid').datagrid({
columns: [[ columns: [[
{ field: 'Name', title: '名称', align: 'left', width: 180 }, { 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' } { field: 'Null', title: '', align: 'left' }
]], ]],
striped: true, striped: true,
@ -68,8 +68,8 @@
var headerTable = $('.datagrid-header'); var headerTable = $('.datagrid-header');
var bodyTable = $('.datagrid-body'); var bodyTable = $('.datagrid-body');
var headerTd = headerTable.find('td:last'); var headerTd = headerTable.find('td:last');
headerTd.css('width', (width - 241) + 'px'); headerTd.css('width', (width - 261) + 'px');
bodyTable.find('tr').find('td:last').css('width', (width - 241) + 'px'); bodyTable.find('tr').find('td:last').css('width', (width - 261) + 'px');
}; };
this.ReLoadTableData = function () { this.ReLoadTableData = function () {

4
04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js

@ -44,7 +44,7 @@
panelAlign: 'right', panelAlign: 'right',
panelWidth: 200, panelWidth: 200,
panelHeight: 230, panelHeight: 230,
showSeconds: true, showSeconds: false,
currentText: '现在', currentText: '现在',
onSelect: function (date) { onSelect: function (date) {
var startTime = date.getTime(); var startTime = date.getTime();
@ -62,7 +62,7 @@
panelWidth: 190, panelWidth: 190,
panelHeight: 230, panelHeight: 230,
panelAlign: 'right', panelAlign: 'right',
showSeconds: true, showSeconds: false,
currentText: '现在', currentText: '现在',
onSelect: function (date) { onSelect: function (date) {
var endTime = date.getTime(); var endTime = date.getTime();

22
04.系统编码/App/Content/scripts/system-management/user-management/index.js

@ -68,9 +68,11 @@
{ field: 'OrgName', title: '所属机构', align: 'left', width: 180 }, { field: 'OrgName', title: '所属机构', align: 'left', width: 180 },
{ field: 'LoginName', title: '登录账户', align: 'left', width: 150 }, { field: 'LoginName', title: '登录账户', align: 'left', width: 150 },
{ field: 'LoginPassWord', title: '登录密码', align: 'left', width: 120, formatter: this.formatPassword.bind(this) }, { field: 'LoginPassWord', title: '登录密码', align: 'left', width: 120, formatter: this.formatPassword.bind(this) },
{ field: 'ComputeCount', title: '登录次数', align: 'center', width: 100 }, { field: 'ComputeCount', title: '计算次数', align: 'center', width: 80 },
{ field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastTime.bind(this)}, { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastComputeTime.bind(this) },
{ field: 'CreateTime', title: '最后登录时间', align: 'center', width: 160, formatter: this.formatTime.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' } { field: 'Null', title: '', align: 'left' }
]], ]],
striped: true, striped: true,
@ -101,8 +103,8 @@
var headerTable = $('.datagrid-header'); var headerTable = $('.datagrid-header');
var bodyTable = $('.datagrid-body'); var bodyTable = $('.datagrid-body');
var headerTd = headerTable.find('td:last'); var headerTd = headerTable.find('td:last');
headerTd.css('width', (width - 991) + 'px'); headerTd.css('width', (width - 1213) + 'px');
bodyTable.find('tr').find('td:last').css('width', (width - 991) + 'px'); bodyTable.find('tr').find('td:last').css('width', (width - 1213) + 'px');
}; };
this.onQueryButtonClick = function () { this.onQueryButtonClick = function () {
@ -133,12 +135,18 @@
return '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); return '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss'));
}; };
this.formatLastTime = function (time) { this.formatLastComputeTime = function (time) {
var value = time === null ? '-' : format(moment(time).format('YYYY/MM/DD HH:mm:ss')); var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss');
return '<span>{0}</span>'.format(value); return '<span>{0}</span>'.format(value);
}; };
this.formatLastLoginTime = function (time) {
var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss');
return '<span>{0}</span>'.format(value);
}
this.OnTaskSelected = function (index, row) { this.OnTaskSelected = function (index, row) {
console.log(row)
this.selectedRow = row; this.selectedRow = row;
$('.datagrid-btable tr').removeClass('datagrid-row-selected'); $('.datagrid-btable tr').removeClass('datagrid-row-selected');
$('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected'); $('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected');

46
04.系统编码/App/Content/styles/common.css

@ -200,6 +200,7 @@
} }
.manage-table .datagrid-header td { .manage-table .datagrid-header td {
position: relative;
background: linear-gradient(to bottom, #ffffff, #f5f5f5, #eaeaea); background: linear-gradient(to bottom, #ffffff, #f5f5f5, #eaeaea);
} }
@ -218,8 +219,29 @@
overflow: visible; overflow: visible;
} }
.manage-table .datagrid-header td:last-of-type .datagrid-cell { .user-table .datagrid-header td:nth-of-type(9):after,
/*padding-left: 40px;*/ .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, /*.manage-table .datagrid-header td:last-of-type .datagrid-cell:after,
@ -237,16 +259,6 @@
padding: 0 8px; 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 { .manage-table .datagrid-body .datagrid-row:last-of-type td {
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
} }
@ -451,7 +463,15 @@
} }
.statistic-toolbar .easyui-datetimebox { .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, .statistic-toolbar .query-btn,

6
04.系统编码/App/Content/styles/login.css

@ -26,7 +26,7 @@
} }
.login-logo{ .login-logo{
margin: 75px 0 0 40px; margin: 70px 0 0 40px;
} }
.login-block { .login-block {
@ -55,7 +55,7 @@
} }
.login-tip { .login-tip {
margin-top: 20px; margin-top: 15px;
display: block; display: block;
text-align: right; text-align: right;
padding-right: 43px; padding-right: 43px;
@ -69,7 +69,7 @@
.login-btn { .login-btn {
width: 345px; width: 345px;
margin: 12px 0 0 38px; margin: 40px 0 0 38px;
line-height: 46px; line-height: 46px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;

4
04.系统编码/App/Views/Beijing/Index.cshtml

@ -10,9 +10,9 @@
<div class="main"> <div class="main">
<div class="map" id="map"></div> <div class="map" id="map"></div>
<div class="switch particle-switch" id="particle-switch"> @*<div class="switch particle-switch" id="particle-switch">
风场粒子<a href="javascript:;"></a> 风场粒子<a href="javascript:;"></a>
</div> </div>*@
<div class="switch switch-on label-switch" id="label-switch"> <div class="switch switch-on label-switch" id="label-switch">
时间标签<a href="javascript:;"></a> 时间标签<a href="javascript:;"></a>
</div> </div>

2
04.系统编码/App/Views/OrgManagement/Index.cshtml

@ -32,7 +32,7 @@
<button type="button" class="btn disable-btn" id="disable-btn" disabled>禁用</button> <button type="button" class="btn disable-btn" id="disable-btn" disabled>禁用</button>
</div>*@ </div>*@
</div> </div>
<div class="table manage-table"> <div class="table manage-table org-table">
<table id="task-grid"></table> <table id="task-grid"></table>
</div> </div>
</div> </div>

2
04.系统编码/App/Views/StatisticAnalysis/Index.cshtml

@ -22,7 +22,7 @@
</div> </div>
<div class="container"> <div class="container">
<div class="toolbar statistic-toolbar"> <div class="toolbar statistic-toolbar">
<span class="tip">起止日期</span> <span class="tip">起止时间</span>
<div class="date-input"> <div class="date-input">
<input class="easyui-datetimebox" id="from-date" data-options="editable:false" value=" "> <input class="easyui-datetimebox" id="from-date" data-options="editable:false" value=" ">
</div> </div>

2
04.系统编码/App/Views/User/Login.cshtml

@ -15,8 +15,8 @@
<input type="password" id="login-password" placeholder="请输入密码" value="123456" /> <input type="password" id="login-password" placeholder="请输入密码" value="123456" />
</div> </div>
<span class="login-tip">还没有账号?<a href="/Register/Index">去注册</a></span>
<button class="login-btn" id="login-button">登录</button> <button class="login-btn" id="login-button">登录</button>
<span class="login-tip">还没有账号?<a href="/Register/Index">去注册</a></span>
</div> </div>
</div> </div>
</div> </div>

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

@ -37,7 +37,7 @@
<button type="button" class="btn query-btn" id="query-btn">查询</button> <button type="button" class="btn query-btn" id="query-btn">查询</button>
</div> </div>
</div> </div>
<div class="table manage-table"> <div class="table manage-table user-table">
<table id="task-grid" class="easyui-datagrid"></table> <table id="task-grid" class="easyui-datagrid"></table>
</div> </div>
</div> </div>

Loading…
Cancel
Save