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$1rhE+_Qw+N2Zj?ge*|rj@{!D<71BVsJM=nYm@KO`s4g1*^bz-~@R%yBgLF zRsa=046FJJz5tO^RlFMwYGTLroU(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~$+-D7boVl|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(ey*P`(D%E{=V<(J&SIX4t(uY_w363TJRKBXXW3!m#|2(*qbl>EM8!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&Fg2W225LAO1w3F9H9%&~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}^(=Tn$Y}HwQnZ_GTGRc}MPW! zU7+eOPm-)-*@FRcFu-~Yuq8E2BVwDQ`A9EA*uv4!Ci7Qc*;vhu?~!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@heqy#C=3SEsh$b?M)S`B*0hXtZUMGq-H6v(v8Lpo>$O}406)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@dA^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&Shat>#`+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${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_8jQI=h2JgZv9tmA}1ah$S|r0vMm{~Dr2$@`72$c@ey z^3YYU)8VISo1W&sMKq&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 @@ +
正在加载数据,请稍后...
+ @{ 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 @@ +
正在加载数据,请稍后...
+ @{ 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 @@ +
正在加载数据,请稍后...
+ @section scripts { } 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 @@ +
正在加载数据,请稍后...
+ @{ Html.RenderPartial("/Views/UserManagement/AddDialog.cshtml"); Html.RenderPartial("/Views/UserManagement/EditDialog.cshtml");