Browse Source

commit

master
hehongxing 3 years ago
parent
commit
d97fceace1
  1. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/.suo
  2. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
  3. 3
      04.系统编码/App/App.csproj
  4. BIN
      04.系统编码/App/Content/images/calendar_arrows.png
  5. 2
      04.系统编码/App/Content/scripts/beijing/history-panel.js
  6. 1
      04.系统编码/App/Content/scripts/beijing/realtime-panel.js
  7. 2
      04.系统编码/App/Content/scripts/menggu/history-panel.js
  8. 1
      04.系统编码/App/Content/scripts/menggu/realtime-panel.js
  9. 169
      04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
  10. 56
      04.系统编码/App/Content/styles/common.css
  11. 17
      04.系统编码/App/Controllers/StatisticAnalysisController.cs
  12. 3
      04.系统编码/App/Views/ConfigManagement/Index.cshtml
  13. 3
      04.系统编码/App/Views/OrgManagement/Index.cshtml
  14. 2
      04.系统编码/App/Views/Shared/_Layout.cshtml
  15. 43
      04.系统编码/App/Views/StatisticAnalysis/Index.cshtml
  16. 3
      04.系统编码/App/Views/UserManagement/Index.cshtml
  17. BIN
      04.系统编码/App/bin/Pingchuan.BeijingSafeguard.App.dll
  18. BIN
      04.系统编码/App/bin/Pingchuan.BeijingSafeguard.App.pdb
  19. 2
      04.系统编码/App/obj/Debug/App.csproj.CoreCompileInputs.cache
  20. BIN
      04.系统编码/App/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  21. BIN
      04.系统编码/App/obj/Debug/Pingchuan.BeijingSafeguard.App.dll
  22. BIN
      04.系统编码/App/obj/Debug/Pingchuan.BeijingSafeguard.App.pdb

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

Binary file not shown.

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

Binary file not shown.

3
04.系统编码/App/App.csproj

@ -130,6 +130,7 @@
<Compile Include="Controllers\ConfigManagementController.cs" />
<Compile Include="Controllers\OrgManagementController.cs" />
<Compile Include="Controllers\RegisterController.cs" />
<Compile Include="Controllers\StatisticAnalysisController.cs" />
<Compile Include="Controllers\TiananmenController.cs" />
<Compile Include="Controllers\BeijingController.cs" />
<Compile Include="Controllers\MengguController.cs" />
@ -212,6 +213,7 @@
<Content Include="Content\scripts\system-management\org-management\add.js" />
<Content Include="Content\scripts\system-management\org-management\edit.js" />
<Content Include="Content\scripts\system-management\org-management\index.js" />
<Content Include="Content\scripts\system-management\statistic-analysis\index.js" />
<Content Include="Content\scripts\system-management\user-management\add.js" />
<Content Include="Content\scripts\system-management\user-management\edit.js" />
<Content Include="Content\scripts\system-management\user-management\index.js" />
@ -344,6 +346,7 @@
<Content Include="Views\ConfigManagement\EditLineColor.cshtml" />
<Content Include="Views\ConfigManagement\EditLocateIcon.cshtml" />
<Content Include="Views\Register\Index.cshtml" />
<Content Include="Views\StatisticAnalysis\Index.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">

BIN
04.系统编码/App/Content/images/calendar_arrows.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

2
04.系统编码/App/Content/scripts/beijing/history-panel.js

@ -41,6 +41,7 @@
$('#start-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});
@ -48,6 +49,7 @@
$('#end-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});

1
04.系统编码/App/Content/scripts/beijing/realtime-panel.js

@ -28,6 +28,7 @@
$('#release-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});

2
04.系统编码/App/Content/scripts/menggu/history-panel.js

@ -41,6 +41,7 @@
$('#start-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});
@ -48,6 +49,7 @@
$('#end-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});

1
04.系统编码/App/Content/scripts/menggu/realtime-panel.js

@ -18,6 +18,7 @@
$('#release-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: false,
currentText: '现在'
});

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

@ -0,0 +1,169 @@
var App = function () {
this.data = {
"total": 20,
"rows": [{ Id: 1, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 2, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 3, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 4, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 5, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 6, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 7, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 8, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 9, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 10, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 11, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 12, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 13, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 14, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 15, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 16, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 17, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 18, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 19, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 20, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 21, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 22, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 23, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 24, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 25, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 26, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 27, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 28, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 29, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 30, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 31, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 32, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 33, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 34, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 35, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 36, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 37, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 38, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' },
{ Id: 39, Name: "张三", CalcNumber: 11, CalcTime: '2021/12/15 10:00:00' }]
};
this.selectedRow = [];
this.Startup = function () {
this.ReLayout();
this.InitDate();
this.InitDataGrid();
$('#manage').addClass('active');
window.onresize = this.ReLayout.bind(this);
};
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);
};
this.InitDate = function () {
$('#from-date').datetimebox({
panelWidth: 190,
panelAlign: 'right',
panelHeight: 230,
showSeconds: true,
currentText: '现在',
onSelect: function (date) {
var startTime = date.getTime();
var endDate = $('#to-date').val();
if (endDate) {
var endTime = new Date(endDate).getTime();
if (startTime > endTime)
alert('开始日期不能大于结束日期,请重新选择。');
}
}
});
$('#to-date').datetimebox({
panelWidth: 190,
panelHeight: 230,
panelAlign: 'right',
showSeconds: true,
currentText: '现在',
onSelect: function (date) {
var endTime = date.getTime();
var startDate = $('#from-date').val();
if (startDate) {
var startTime = new Date(startDate).getTime();
if (startTime > endTime)
alert('结束日期不能小于开始日期,请重新选择。');
}
}
});
$("#from-date").datetimebox('setValue', moment().add(-30, 'days').format('YYYY/MM/DD HH:mm'));
};
this.InitDataGrid = function () {
$('#task-grid').datagrid({
columns: [[
{ field: 'Name', title: '姓名', align: 'center', width: 10 },
{ field: 'CalcNumber', title: '计算次数', align: 'center', width: 10 },
{ field: 'CalcTime', title: '最后计算时间', align: 'left', width: 70 }
]],
striped: true,
singleSelect: false,
fitColumns: true,
fit: true,
scrollbarSize: 0,
pagination: true,
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this)
});
$('#task-grid').datagrid('loadData', this.data);
};
this.formatText = function (value) {
return value === 1 ? '<span style="color: #00c541">已启用</span>' : '<span style="color: #f40000">已禁用</span>';
};
this.OnTaskSelected = function (index, row) {
this.selectedRow = row;
$('.datagrid-btable tr').removeClass('datagrid-row-selected');
$('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected');
//set buttons disabled state
$('#edit-btn').prop('disabled', row === null);
$('#delete-btn').prop('disabled', row === null);
$('#enable-btn').prop('disabled', row.isEnable !== 1 ? null : true);
$('#disable-btn').prop('disabled', row.isEnable === 1 ? null : true);
};
this.OnTaskUnselected = function (index, row) {
$('#edit-btn').prop('disabled', true);
$('#delete-btn').prop('disabled', true);
$('#enable-btn').prop('disabled', true);
$('#disable-btn').prop('disabled', true);
};
this.OnAddButtonClick = function () {
this.AddDialog.Show();
};
this.onEditButtonClick = function () {
this.EditDialog.Show(this.selectedRow);
};
this.onDeleteButtonClick = function () {
$('.dialog-delete').show();
$('.dialog-clear h2').text('确定删除名为「{0}」的账户吗?'.format(this.selectedRow.Name));
};
this.CloseDeleteDialog = function () {
$('.dialog-delete').hide();
};
};
$(document).ready(function () {
var app = new App();
app.Startup();
});

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

@ -229,6 +229,11 @@
background-color: #dddddd
}
.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;
}
.manage-table .datagrid-body .datagrid-row:last-of-type td {
border-bottom: 1px solid #dddddd;
}
@ -310,17 +315,6 @@
border-bottom: 1px solid #e7e7e7;
}
.combo-p{
left: auto!important;
right: 12px;
}
.combo-p:nth-last-of-type(2),
.combo-p:last-child,
.combo-p:nth-of-type(3){
right: 18px;
}
.system-management {
height: calc(100vh - 58px)
}
@ -432,6 +426,30 @@
background-position-x: 7px;
}
.statistic-toolbar {
padding-right: 10px;
align-items: center;
justify-content: flex-end;
}
.statistic-toolbar .query-btn {
height: 28px;
margin-left: 10px;
padding: 0 16px;
line-height: 28px;
border-radius: 3px;
color: #ffffff;
background: linear-gradient(to bottom, #febd52, #faa71c);
}
.statistic-toolbar .tip {
margin: 0 6px;
}
.statistic-toolbar .query-btn:hover {
color: #ffffff
}
.delete-user-dialog .dialog-title h2 {
background: none !important;
padding-left: 14px;
@ -658,4 +676,20 @@
.manage-dialog .modal-footer .cancel-btn:hover {
color: #3a3a3a;
}
.calendar-prevmonth {
background: url(../images/calendar_arrows.png) no-repeat -18px -2px;
}
.calendar-prevyear {
background: url(../images/calendar_arrows.png) no-repeat -1px -2px;
}
.calendar-nextmonth {
background: url("../images/calendar_arrows.png") no-repeat -34px -2px;
}
.calendar-nextyear {
background: url(../images/calendar_arrows.png) no-repeat -49px -2px;
}

17
04.系统编码/App/Controllers/StatisticAnalysisController.cs

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
namespace Pingchuan.BeijingSafeguard.App.Controllers
{
public class StatisticAnalysisController : Controller
{
// GET: StatisticAnalysis
public ActionResult Index()
{
return View();
}
}
}

3
04.系统编码/App/Views/ConfigManagement/Index.cshtml

@ -6,6 +6,9 @@
<div class="system-management clearfix">
<div class="aside">
<ul class="clearfix">
<li>
<a href="/StatisticAnalysis/Index" class="">统计分析</a>
</li>
<li>
<a href="/UserManagement/Index" class="">用户管理</a>
</li>

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

@ -6,6 +6,9 @@
<div class="system-management clearfix">
<div class="aside">
<ul class="clearfix">
<li>
<a href="/StatisticAnalysis/Index" class="">统计分析</a>
</li>
<li>
<a href="/UserManagement/Index" class="">用户管理</a>
</li>

2
04.系统编码/App/Views/Shared/_Layout.cshtml

@ -38,7 +38,7 @@
</div>
<div class="admin fl">
<span id="user-info" userid="@(ViewBag.LoginUser != null ? ViewBag.LoginUser.Id : 0)">欢迎,@(ViewBag.LoginUser != null ? ViewBag.LoginUser.RealName : "未登录")</span>
<a class="manage" id="manage" href="/UserManagement/Index" @((ViewBag.Title == "用户管理" || ViewBag.Title == "机构管理" || ViewBag.Title == "系统设置") ? "class=action" : string.Empty)>系统管理</a>
<a class="manage" id="manage" href="/StatisticAnalysis/Index" @((ViewBag.Title == "用户管理" || ViewBag.Title == "机构管理" || ViewBag.Title == "系统设置") ? "class=action" : string.Empty)>系统管理</a>
<a class="exit" href="/User/Login">退出</a>
</div>
</div>

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

@ -0,0 +1,43 @@

@{
ViewBag.Title = "系统分析";
}
<div class="system-management clearfix">
<div class="aside">
<ul class="clearfix">
<li class="active">
<a href="/StatisticAnalysis/Index" class="">统计分析</a>
</li>
<li>
<a href="/UserManagement/Index" class="">用户管理</a>
</li>
<li>
<a href="/OrgManagement/Index" class="">机构管理</a>
</li>
<li>
<a href="/ConfigManagement/Index">系统设置</a>
</li>
</ul>
</div>
<div class="container">
<div class="toolbar statistic-toolbar">
<span class="tip">起止日期</span>
<div class="date-input">
<input class="easyui-datetimebox" id="from-date" data-options="editable:false" value=" ">
</div>
<span class="tip">至</span>
<div class="date-input">
<input class="easyui-datetimebox" id="to-date" data-options="editable:false" value=" ">
</div>
<button type="button" class="btn query-btn" id="query-btn">查询</button>
</div>
<div class="table manage-table statistic-table">
<table id="task-grid"></table>
</div>
</div>
</div>
@section scripts {
<script src="~/Content/scripts/system-management/statistic-analysis/index.js"></script>
}

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

@ -6,6 +6,9 @@
<div class="system-management clearfix">
<div class="aside">
<ul class="clearfix">
<li>
<a href="/StatisticAnalysis/Index" class="">统计分析</a>
</li>
<li class="active">
<a href="/UserManagement/Index" class="">用户管理</a>
</li>

BIN
04.系统编码/App/bin/Pingchuan.BeijingSafeguard.App.dll

Binary file not shown.

BIN
04.系统编码/App/bin/Pingchuan.BeijingSafeguard.App.pdb

Binary file not shown.

2
04.系统编码/App/obj/Debug/App.csproj.CoreCompileInputs.cache

@ -1 +1 @@
bdde16ab3ba11b51894227e99d7630dc755cd8b3
5be2802cb302f48c6e7c74de77d206b583824ff2

BIN
04.系统编码/App/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary file not shown.

BIN
04.系统编码/App/obj/Debug/Pingchuan.BeijingSafeguard.App.dll

Binary file not shown.

BIN
04.系统编码/App/obj/Debug/Pingchuan.BeijingSafeguard.App.pdb

Binary file not shown.
Loading…
Cancel
Save