From 1a1bf31b6850eacdf7f147948ef66a1740b86578 Mon Sep 17 00:00:00 2001
From: hhx <1284857778@qq.com>
Date: Sun, 16 Jan 2022 15:57:58 +0800
Subject: [PATCH] commit
---
04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 187392 -> 187392 bytes
.../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes
.../config-management/index.js | 4 ++++
.../system-management/org-management/index.js | 2 ++
.../statistic-analysis/index.js | 2 ++
.../user-management/index.js | 6 +++++-
04.系统编码/App/Content/styles/common.css | 11 +++++++++++
.../App/Views/ConfigManagement/Index.cshtml | 2 ++
.../App/Views/OrgManagement/Index.cshtml | 2 ++
.../App/Views/StatisticAnalysis/Index.cshtml | 2 ++
.../App/Views/UserManagement/Index.cshtml | 2 ++
11 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 2a9736964c4978f79153920aa1e759fa43c510cb..69e430ba8bdb6f88913368889d9ea975daf75ea0 100644
GIT binary patch
delta 1468
zcma)+e{54#6vy8=`vL3P*;huzGPbv_gSidjO05h_*&Hqt2V=9$1rh<XEJEtCg+`}A
z*AOMdOoQ(&JcEYJi@^mGjJ>E+_Qw+N2Z<W_gSlv2h*AD9CjLl+nuzmz*EQ(~AvXEs
zocr#%=bZaJH%(3yCnt)JMOIa5nwAg#otvA3(el7%uobjh`&QPyH*kndju#|nCf`3J
z2l-tZuECxIxIiuNgXO>j?ge*|rj@{!D<71BVsJM=nYm@KO`s4g1*^bz-~@R%yBgLF
zRsa=046FJJz<Nm=o?ql6(7*>5tO^RlFMwYGTL<od-wCVs*1`I~b07j5!GoXy6oC!E
zy^!Yy;#XpQAE*Xu{SfR9pmJ^0)?}Q@g%2GIL25Gy-wQ&(X${79zd8_e9>roU(1B8N
z?2q0r-;slbw^35%Qa`0+#)FUJStVQH*MqE*YJ#~+X3yj*sU~wvB~`G2O{L^|*sPM<
z;O8nC#rpp$sYZFTlB!Nt$u{iIE7=T3DXD_9N~$+-D<zAvO5Q1N6jd!fW!%H3j8foX
zX>7boVl|60HY@$oADAVvf<+q(gGD!+@fMf1A7%Q1>chUgoB~!N-eFy+X^`o-lk8wG
z`|YpZ;4*7!lV9$w9V63&Ok0s@1E-7@vMz9gm8cv^1r4^0p@8!Ml0CgR;SdrcDm~QU
zB30+f#oNz}h;=M>vE6loO?!G5yQK&}M#nwerXSSGUwm`)iwPt8PxYoh#~qqQzGX7L
zeUwC$#c{ThrD*4YSxVKr$zAcm#lW{M;m8xOSDifA=^e0)wO2(e<I<)I^P=l^7F*c%
zq$y;Ff1`Gp+>y*P`(D%E{=V<?AJ*ufly455|7L3aqnSdJeOo9~A~Z|(kLO6Y&1SBX
zk)sz0l3M<NaK><(J&SIX4t(uY_w363TJRKBXXW3!m#|2(*qbl>EM8!<yTwI4*m@*4
z*h+NIYbMj(7{cXVl&m{&g+vpl`U~@P3c7n=?!PqSnLNL9|8&>mnPzJTrwc_5i|1J!
zVl#@oJCRfUhp1-ehbt4&5u*Dg`6}=_4&!w^%l7Xvu9nqDz9XIR#vWdXFM{7J_1Lc@
zUSjbI-(IBDF$aI>I7`<_O)+c_d`fQFI{Gn{-kekQB1>bxkmzA6==VzZiJu9RwDnGI
zl#M4pBQxT4&(!|Zb1iY@jK1fiOC@7})nk%A*%X-~tHkG!4)Z#Rx77R(j~^MQ)8ica
E4;$*gNB{r;
delta 1332
zcmb`FUr1D09LMkP=O{Xjb*D8`oAP=cb<$ck8!c@xD|6G_)RKtp55~F+D^^-YZR_F`
zVMAExoM0+qspB%t(^j5+Fz7+(p=Du%s3sy1p?&Bfs33M9!oB-F?zFH)J$0E6-{1M2
z`}>{W{hkR=%n47-83`?(YZ!(L{Ovdn#7F}kuoSe2y~iuA_YP2$d(tNxAJ!&RA77=x
zZ0zB6XAoMLiv20|Lg$fTltXPW1PVYg&@};Q6|g`ls08^y@6Cs<1Vz9N@<2X%`Jj5f
zEl|jyqZj&Fg2W225LAO1<eH%yz#`y6aRziPSOb0lb)W_`0u$7ORXWDItD))8Wzcp|
z0<y7gg6iIzptVMsVFVE@0BP9NgXm5DtV8bK$Z<TPFS2vAx5E=baygg>w3F9H9%&~t
zQch+ft)0|$x{r2JyZW}1S;)O{Qs3D7oYWt#oy-MA;C)W!5{}hQ>O-}Yi@_Twk#aU;
zt)0}dc2euda8mbq$4Q;kZhpwgtpA);Gg-x%V^%JYSvjn%=4p}^(<h3;g;@G#m(tI&
zi{%m);R0LP1ydxCa;&n8?bw}5>=Tn$Y}HwQnZ_GTGRc}MPW<Ja^dH`PCDF7yTUZ;X
zWi^k_w{S!ydTyVl*w%|2jU~TiQ_0#rBtK=D$D%TnYc{uyoOy8Yx6cops{XnEyOl>!
zU7+eOPm-)-*@FRcFu-~Yuq8E2BVwDQ`A9EA*uv4!Ci7Qc*;vhu<oD0MdOa~z^vh<^
zTb`qOLgz@fxx55#DpHq`g*c?Vk>?~!S)OOPn&mEhz9{;7p-carlrQ`T$xhdYhl`#)
zZ#KPXef*@O`-^+0#kHurZ(#P!n;i{=kB{B$;tEyK{eVO`U<+Ajd%i{U{i!L$-EDr+
zA7~Y~c!hcu@X+}Fj5IUZTIbw9T$R@Jdva>qp(n$$4a@tI8PQ;aXCF$B{I5LNnoixw
zh|UX^_>4W`RdBYU=&u@<Cs_`#JjQYl$KAy88;-r~;1X3b^q55by3EnuOl9tPfs2`;
zJe7C)DZOix@J7~%mV`&`h$Ki3^Z1CHm0SKv@*K;0{Zn+&A#&n2am?G!HLB*v+Z6Yc
SOa8?10P%^$P=ewK4*mnE?vKj=
diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
index 08e5d33a583d167b3907bffe7c711db6e3d5719e..7b805cda8932f6db2ab349a9efb33948372b40f5 100644
GIT binary patch
delta 833
zcmaixTS!xJ0LFKAJlmPNd1;lNGwtRzr<*oY&ru<w$cJzX1L>heqy#C=3S<bm_0i^q
zO3MC}B>Esh$b?M)S`B*0hXtZUMGq-H6v(v8Lpo>$O}406<iq#;`+nayIsb#145b4M
zlwc794l1a@LxWhvAs$-jkbp!aAsJhs$5w2^cBCK`0z?>)hIH(}PVB;N>_G-Hk%esJ
zAQyX)2P5)P029n8L=pDEf@17P2})50>5*JCMIL<0)$xy;EEg)pvwbx2Lunw6$-6m}
z)kPA<)p|N`P_nap?OoMV@#y?2?QltRER#oU-BJTt@d<ijeW&?IPkZE<SQ4aymcQ2S
zJyNAu8ll#cmTV;*Eh(!}GR85(nk$aTXC$pq-`sZ5bgVo_%cm(gc1EGOq<YB}vom}v
zEzD4Qm9)A`Vwk@f6Frh&$s8v(Pnk{Qxa>A^j$&smVW{y0vHOKVI^81mtN2%K&uP*k
zV~D8aZ%`4QEw?mRtj-z2cwYq1x3a!4o_wy7zQs5j-T7p6NoXLQZb8o+CcRf#kt_to
z*L2e!t2fqrc&D!fI!CJ2Q9Bg;-XUehIpN|1Lz&S<LNyi}<tg@m4OHjka#kIhz|rn5
zAT8a(_lWzQHSW#Z!IeW1chd%U{!7O7zW2*x-ic1x$0n>hat>#`+r&8zAeq?G<4+M!
zP}JXkAuQ8>K*D0Wfu?)C{r>2K&0(=8jj}Ga=vI$3?w<>L&Hnm#mOuZ;z?;Cs8`rFV
gZH;j%+~)fWyvWeuhjPElRc9{`rGnPkD{H_01dn+^%m4rY
delta 874
zcmYk4Ye*DP6vyY@nVsF8o!RlVYOaq>E#JE4t8}*rODzmtu&_jmus*4*`6cY(YDdlO
zp)tfQLo9+44KfVIK7>LM<%cvg${<oID)LbjNtW8(Eu#bHez=G8Kfn7wci`0`8ldR{
z1Q=N0Km$BzK?iyezyKmhU<4U_z!&_$9|FJxfe-}2unI!J451JP;Sd29SPhX71<|ku
z)<O)#LL9_H0wh8bBtr^VAr;m^8l*!8WI`6KhYgT@J7?XUKn5{163<n%9*93Vw0wW!
z&F+Cufn;*n7RjS}T0&}jo$Z6H8+m-Obk}-kv)Vpw|0%Kc&1UuZ1sjLS!puga?(6mO
zJqb(hS=D;OeuP7@{h{Am3?#u|m*l?M4*5r1Pmm;qFggya`3Ae*Ct$I2E|~o!x;@kX
z1ahgV(YRW}oyW~)GCP4QNXSiFfLh%tOM=NoNn9(KmZ@&{7%!)*&NpJR9>tQbX>l*f
z?zIJxTQxXb9T}AEd@z+|J<=;(U+(R*U%nXS-|us7S*|}tE5iR}zn!yTbDDzN0yD@Y
zFqI6~%@wgT?0Gg*z9#1yr;N=;t28RLN|{V0*5ff;CB8(ecub5iJU~XnA%h9+7gV8C
zzob8^ThJZWWoYNLJ=(q6Fn*Xn$#3Pc#>Fk6%~YNS?>QKTbZtRtO7S~^ICr2xj@}dz
zM;@{&LvD^t&g+B7=WVEjE8!aANNNGvKvH5X!HVy*ET!)(Pdei)CNffpDu^-O@<=T%
zMh_8j<fC-5FH#s)pXVZf4cW8}-BNtVJslQuX*;^hm2nMOUNyzi7KTyLUx-9by}JV`
zID%Sz@PE6z%D3#cwm<tNQM^1>QI=h2JgZv9tmA}1ah$S|r0vMm{~Dr2$@`72$c@ey
z^3YYU)8VISo1W&sMKq<BZK`dZ=LGbg86=%WLX)!aq(mtm>&Da(`U*42aR_-Bm3S!A
z6jzOSwc{xwPP5?K-#b1k26(4@v=_du%5+D1u=3ePiq+=9n#Srv6KWM(%Ia)1?P^)w
I#`15!0UcZ=%m4rY
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");