diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 2a97369..69e430b 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 08e5d33..7b805cd 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 211ffff..84abe11 100644
--- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js
@@ -45,7 +45,11 @@
scrollbarSize: 0,
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
+ onBeforeLoad: function () {
+ $('.data-loading').show();
+ },
onLoadSuccess: function (data) {
+ $('.data-loading').hide();
if (data.total === 0) {
var body = $(this).data().datagrid.dc.body2;
body.addClass('null-data-body');
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 bd6ee90..b8f2e64 100644
--- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js
@@ -52,6 +52,7 @@
onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
onLoadSuccess: function (data) {
+ $('.data-loading').hide();
if (data.total === 0) {
var body = $(this).data().datagrid.dc.body2;
body.addClass('null-data-body');
@@ -100,6 +101,7 @@
};
this.OnTableGridBeforeLoad = function () {
+ $('.data-loading').show();
var page = $('#task-grid').datagrid('getPager');
$(page).pagination({
beforePageText: '第',
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 beba716..15b902d 100644
--- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
@@ -108,6 +108,7 @@
onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
onLoadSuccess: function (data) {
+ $('.data-loading').hide();
if (data.total === 0) {
var body = $(this).data().datagrid.dc.body2;
body.addClass('null-data-body');
@@ -189,6 +190,7 @@
};
this.OnTableGridBeforeLoad = function () {
+ $('.data-loading').show();
this.statisticGrid.datagrid('getPager').pagination({
beforePageText: '第',
afterPageText: '页 共{pages}页',
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 1eda81c..5dd2a57 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
@@ -83,11 +83,12 @@
pageNumber: 1,
pageSize: 50,
pageList: [10, 20, 50, 100, 150, 200],
- loadMsg: '正在加载数据，请稍后...',
+ loadMsg: '',
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
onLoadSuccess: function (data) {
+ $('.data-loading').hide();
if (data.total === 0) {
var body = $(this).data().datagrid.dc.body2;
body.addClass('null-data-body');
@@ -163,12 +164,15 @@
};
this.OnTableGridBeforeLoad = function () {
+ $('.data-loading').show();
this.userGrid.datagrid('getPager').pagination({
beforePageText: '第',
afterPageText: '页 共{pages}页',
displayMsg: '当前显示{from}-{to}条记录 共{total}条记录',
layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info']
});
+
+
};
this.OnAddButtonClick = function () {
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index ae7c43d..eae2047 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@@ -830,4 +830,15 @@
.textbox .textbox-prompt {
color: #868686;
+}
+
+.data-loading {
+ margin-top: 40px;
+ margin-left: 50px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ z-index: 1000;
+ color: #3a3a3a;
+ display: none;
}
\ No newline at end of file
diff --git a/04.系统编码/App/Views/ConfigManagement/Index.cshtml b/04.系统编码/App/Views/ConfigManagement/Index.cshtml
index 07f1490..9682300 100644
--- a/04.系统编码/App/Views/ConfigManagement/Index.cshtml
+++ b/04.系统编码/App/Views/ConfigManagement/Index.cshtml
@@ -32,6 +32,8 @@
</div>
</div>
+<div class="data-loading">正在加载数据，请稍后...</div>
+
@{
Html.RenderPartial("/Views/ConfigManagement/EditLineWidth.cshtml");
Html.RenderPartial("/Views/ConfigManagement/EditLineColor.cshtml");
diff --git a/04.系统编码/App/Views/OrgManagement/Index.cshtml b/04.系统编码/App/Views/OrgManagement/Index.cshtml
index 21eec7f..792f2cf 100644
--- a/04.系统编码/App/Views/OrgManagement/Index.cshtml
+++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml
@@ -55,6 +55,8 @@
</div>
</div>
+<div class="data-loading">正在加载数据，请稍后...</div>
+
@{
Html.RenderPartial("/Views/OrgManagement/AddDialog.cshtml");
Html.RenderPartial("/Views/OrgManagement/EditDialog.cshtml");
diff --git a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml
index 17d4012..ffdb400 100644
--- a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml
+++ b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml
@@ -44,6 +44,8 @@
</div>
</div>
+<div class="data-loading">正在加载数据，请稍后...</div>
+
@section scripts {
<script src="~/Content/scripts/system-management/statistic-analysis/index.js"></script>
}
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml
index 15c0b75..0430488 100644
--- a/04.系统编码/App/Views/UserManagement/Index.cshtml
+++ b/04.系统编码/App/Views/UserManagement/Index.cshtml
@@ -60,6 +60,8 @@
</div>
</div>
+<div class="data-loading">正在加载数据，请稍后...</div>
+
@{
Html.RenderPartial("/Views/UserManagement/AddDialog.cshtml");
Html.RenderPartial("/Views/UserManagement/EditDialog.cshtml");