From e79a8bbc59d327c073299cc815eed34ea7e36aa1 Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Sat, 15 Jan 2022 11:35:39 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 227840 -> 215040 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4157112 -> 4157112 bytes .../config-management/index.js | 4 +- .../system-management/org-management/index.js | 6 +-- .../statistic-analysis/index.js | 4 +- .../user-management/index.js | 22 +++++--- 04.系统编码/App/Content/styles/common.css | 48 +++++++++++++----- 04.系统编码/App/Content/styles/login.css | 6 +-- .../App/Views/Beijing/Index.cshtml | 4 +- .../App/Views/OrgManagement/Index.cshtml | 2 +- .../App/Views/StatisticAnalysis/Index.cshtml | 2 +- 04.系统编码/App/Views/User/Login.cshtml | 2 +- .../App/Views/UserManagement/Index.cshtml | 2 +- 13 files changed, 65 insertions(+), 37 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 957cc2c49970fc574366b113f457aa9169abb740..9ceb9ec3c65e40475bdd2c5754fd734a9e02a540 100644 GIT binary patch delta 5425 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 De?}d& diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 3e5e0e98f1795e89d134bb80849fe4f3b020dcbf..d5f9eee7fd19a5978490710a218e3311b83ba61c 100644 GIT binary patch delta 19332 zcmeHP30xFMv!9;bot@of4`5ktSP&2eK?Fs`Gb%l%)hI< zXZ_&ReewYy$3P6ML1YjcBnHkPHSh+RL2ghO91Kc>%AhuA42}jTgR?4Fj8?7Mi!yk zCM{N`Dn1c6;R1z-8N87QeUG>-VuhvcbP^(#A7C!fEmX@^_zbVceW^|-w zokP-Svpxzfbtnk;qKRKP9T!U6wTp-_q^|A^$2$#OTUze?`3<3ds$!g&%--U4)2OJM z&oCrEv@mVz`J_W*H|&3_d#ZEX+e&CeDhaVMh6|Jkg|2~p!tcl+oZ%>JW=$dCmeldZ*sV#8m;64pJ-eX!o}En!lw1GLyDUoV69G) z+u9J+Ea~mx12TramNjTlhxEMeMrW%3vOyYc`B`l(%{kfhv@rJ#=STi{XI%2(A^YxT zTKqA`obaiv>gS7^9YMlKc0gJ`EZy z6aA(!X6M|k9_l0?yW>-IPL!M!)7_kV*P>Q4#PpujJwlisEQ=w;#$_|-^J7Ko<;Ufd z)+TOrR5A=Bk`5O7RmtzE>9{f%rT&9){VH6JWCo(?Jk$CK)0x(^(2LX&P02FSr6V01 z(N=qW^|WG=n_3&Kyx1^m0&~Era)q`mBe9R6V|9I@dV1hkvH16P37)qj91YpYEBXD~ z^~diOFvn)Gn{WJiHp!`l3LEvJIfqYymRL4 zk)6HICJ3#zb9pQ`H`iO7*SyH@W-`s(z{+W22ez(I7RwGK#C+4}!enTw&5g*lX%(9; z2xZBbVr;IaSXj~lx099orlXVJQ#8x`{=2-O4lBQo0OtX!!ZztULV{PLC{^c`_n z$T%z{`Rp9LrvdEyO|?Vh;(}D8j$ZrTz28%PLi^|QzBDI`m(mZvA%3*!#lT29;&Y;< z>It>=w9_4(6Fv2Vdl>aQMFMEr$E+r>5N{K}6VTBj`@!)Oi|h}_8hYXs2`6J{>wUzP zHmMitmc0P7IRF;xY>~0pL5qyV9$4fcI3@wq0K8@ZKxL6j;b^T#Ow2M~za4;Pc>u0k zWX#V5NExP)siM7Rg~7(o1F#~Lj{+Pm@>)1z!!p1$dgU~6^(X*Q0^k9wEHd^(PN?r0 zqHEq3WULB{>;yo2COHR=n2+V=SY#}B+ad?S@e*}(;B|E4ZiP%28hxZq%ZiFhB`1Tv zL^7g&WC9Z@#P8GGm58CrTc#T++*_|+CKBSm*49X9j2ApKwTky192o2S#xvhL`k1QX z^~$j#-5K@LE0y02-i6N&tEdOhj-sB;vvZdh=M6Qw((0!AH0{K#sggIB#&_3+T`n&d ze<-gWHSlxlsL)@xKVRUz|K;ba-5+|s%=R%dI-<V;kYF2&MGAr17_PYsw5iJ zKgg&h+k%&}@&hz;MdaY84Omt}Jr%K}Z&m!e%aBlOk(|Qh7&D=&8-H@^{h#}P#7IP1zqW)XwF->=BO+u{K(A*=500RC*v!S zAS3f|==pC}^zE1W+4Bt*80OhZwPue z_7D?hG=>aog{U_J9Swkk>HI4;=ffc{7IbS5QSbD``GhC*q$l(q1pIGxAy$wA7hr>! zP)`FL?=dFShkIgLe%P0XXGq({xRDw;^qi4(6 z+H__kzKn#?meIVc9&1Ev(DzuPJ^*XOTI>U!**8Jpi~rn!s>?K~uk_59sTUI3%%BNj z+5nRGc!Zg8?q;{WBl@5m*RhTMF*u=W#ON7f#&TFJn zAWAa6Acdw(mqm(ljc&9u%gswDjZ{?-KJ=aN(E)uQq;Dy`R+}XYigwp@qB&c5l~nYM zfPcPFnOy%Jg{x`0nw&Cq1vjfzRN8@II?!d^R4s$@!LPGLDUC zaQUF({FJR_DV}`SJ{{CvN5Ac}vKvj`?4}#^D%`JAQN7ctY^CK){$m7@~(GBrz??4gEHf({;;COC2>RF5~qf=^fGsXJide9W^8)o#TSL zjU1F!hi7>yQq*?fH=VhpKzpbnrL1a(P?@6Yg^?^7DLCeaW)ZJpc!hNs^<3lMc1SIRx>z)+_$*-H2YlDCKdCg!5uB08w^VjN-h6 z?HgorPPnmK(TND>JMs&O(EDq7M}lq*7W!||1Q4P59>sJq)r(lp=dpXkf7w^~Mn=Re z6Ge(r8Ci%ZRq%RG(@i9s7Hjm7i7>Mqob97tv5O$U2^2 zr4)eIV8cHHaE!+Wlu#CBtbdtBMnnGv!2CuSu|!x-U;~#y#vu(okztWBe=^8;|4?oL zu=eI1i;N9Vgln+(cui-J(OW2Yw<(K_V?G*PfHFobSlAsP0l>A48vda5Xmy!I#)24; zV1R+WKL#>hkA_BCWNhpN$mm7P$M*o`=73HBG!Dzg0EE{@7k z9X!6uY234Ccy#$s|R)6TY?jO;45uq$%w zGuTzx-IiUyMY?6z(DDh=96_;(4`PvRrGAeVp;un7Qt5rxZpW8Z#0Vy`Wdt^p*1soR zEuIu)^fZ;#b`5%XIjv>S(X$HE5BCh5yYnmV`$*yJuG&tlos=!ph(K_mos^LgkO}Oh zY~{Uw3Mn_^_#rvHzMGq}XcwI|n|MlKEFk%`Y&L00UJi^g7spJp2D3nvWxKJo1Jz~-hHj&#W-})lPkw18B@00 z_w?AJgjHkKw4TMfu=e#VJ-nVd0OWjpRrP=w01RbN_X89ItYHpD2PFXO^{B74oX6{H z0k#6{>sj{ote0EQg6A&XzJbFqLGTv+=dNcx-XN@woO!+Q`n^LY#*mC5FUl5gm-s_OlSX6s*Qxp0Z;qYf7* z+osnKPJY1bOuHqN-sd$MZA?L%o&gI^oRq_i(T!=#svJctXl7$gsBl#&le4U7k+80* zrYFIni0{EROQO3|+1#gexgD_I}hi~EihjvC}qEX~Z4Zq<=-woZx( z^0_#kRdkg!a&z+1t-MQmOmnfx!87T>3I4@Niv^Y^7 z$FvCAcbQUWuzuukCRzrs_=^D$I#-`JNTpzNrCQf0Q~dA%QuzR%X2| z%5Au~U$9aZ0*gTcBT9uo_NgMc2-k4z>vtF~+Sl*?+3R<(6nO0Suiv>CwTMFAI5S?j? z_GoDD+vKXoHLJxbQ}CoT&B&ogdEjrhuz&QUdAaI?wEym6`H#Qw%Ve?VUPc#d!SD%0nDvr+LgZ_LicdnRRiG4e*z z>0E2^3ej@1o9Ts-R2y+#n$eGzDivv~$Mw;Z=X<&H-}h+RS6m-&3e|>Nih&^RyF3Kg zx53a81pxat*x$Sj7X6ajV07tjg{xbqn6ig=oKud&ox}udXe6H${++`jZ5=JTMIT;L zz%M0A0$nUK^T4~I8~Y|*%YLC*;4-1oLp)7U`_ZV{zQV&h@XGNC7KSEPhDLsd+22bs zbUZNhc%wf}OpCfN`b%R6J3-qC+CI-=nE&JR9QfJ=Lx4_=r5DtOHl1wWp87&d$zRb4OpzL_NZ*pQ@X1=Ghwl3ZR|-T-4Q+9lL4jh1z5 zprwv|{VqN~nzeJK{hKa$74Y+fWe{qxaBK*$f76AZDquwY|NWb;7v{>=9lbovdp8#< z$Gs8d5Lfy_5#ov`BgC2wKh`xY|E287IXwF@Nw&`6bF+;Bbp6c8hvJtaL73A2wQEfF zIME&_+T+B3a-0~K^j^0QTi4J(KTcfv+i~LSJ!Bc>#tsk7RGIW>xf7_eoJlfm9E@qXf%H! z9}B^vJ!r(;?gQix1dWx6&U@!MtT^&QLF1|?gT`6m9pr}=`?WALVOLuw?9OyWCTu2# z|3f3l=D!7bJ}>rs{&d<-h;~A>6QZ3E8Rpl&jCvVD^fk_N^8|PSya7G{%+mw>0RDhl zfB--sAP7(!5DcgTs0#=IgaYaT!T{lb`hW;P13)Ao3eXVH2oMcu3}^yq3WxzT12hM; L5azkH)OY_kCvlO2 delta 14087 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 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 532b73d..4bed56f 100644 --- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js @@ -62,8 +62,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 571) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 571) + 'px'); + headerTd.css('width', (width - 572) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 572) + 'px'); }; this.ReLoadTableData = function () { 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 448103d..bd6ee90 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -37,7 +37,7 @@ $('#task-grid').datagrid({ columns: [[ { 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' } ]], striped: true, @@ -68,8 +68,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 241) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 241) + 'px'); + headerTd.css('width', (width - 261) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 261) + 'px'); }; this.ReLoadTableData = function () { 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 15b5ead..32e8931 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -44,7 +44,7 @@ panelAlign: 'right', panelWidth: 200, panelHeight: 230, - showSeconds: true, + showSeconds: false, currentText: '现在', onSelect: function (date) { var startTime = date.getTime(); @@ -62,7 +62,7 @@ panelWidth: 190, panelHeight: 230, panelAlign: 'right', - showSeconds: true, + showSeconds: false, currentText: '现在', onSelect: function (date) { var endTime = date.getTime(); 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 a8da437..1eda81c 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -68,9 +68,11 @@ { field: 'OrgName', title: '所属机构', align: 'left', width: 180 }, { field: 'LoginName', title: '登录账户', align: 'left', width: 150 }, { field: 'LoginPassWord', title: '登录密码', align: 'left', width: 120, formatter: this.formatPassword.bind(this) }, - { field: 'ComputeCount', title: '登录次数', align: 'center', width: 100 }, - { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastTime.bind(this)}, - { field: 'CreateTime', title: '最后登录时间', align: 'center', width: 160, formatter: this.formatTime.bind(this) }, + { field: 'ComputeCount', title: '计算次数', align: 'center', width: 80 }, + { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastComputeTime.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' } ]], striped: true, @@ -101,8 +103,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 991) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 991) + 'px'); + headerTd.css('width', (width - 1213) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 1213) + 'px'); }; this.onQueryButtonClick = function () { @@ -133,12 +135,18 @@ return '{0}'.format(moment(time).format('YYYY/MM/DD HH:mm:ss')); }; - this.formatLastTime = function (time) { - var value = time === null ? '-' : format(moment(time).format('YYYY/MM/DD HH:mm:ss')); + this.formatLastComputeTime = function (time) { + var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss'); return '{0}'.format(value); }; + this.formatLastLoginTime = function (time) { + var value = time === null ? '-' : moment(time).format('YYYY/MM/DD HH:mm:ss'); + return '{0}'.format(value); + } + this.OnTaskSelected = function (index, row) { + console.log(row) this.selectedRow = row; $('.datagrid-btable tr').removeClass('datagrid-row-selected'); $('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected'); diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index c9ac115..62e6fd4 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -200,6 +200,7 @@ } .manage-table .datagrid-header td { + position: relative; background: linear-gradient(to bottom, #ffffff, #f5f5f5, #eaeaea); } @@ -218,8 +219,29 @@ overflow: visible; } -.manage-table .datagrid-header td:last-of-type .datagrid-cell { - /*padding-left: 40px;*/ +.user-table .datagrid-header td:nth-of-type(9):after, +.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, @@ -237,16 +259,6 @@ 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 { border-bottom: 1px solid #dddddd; } @@ -451,11 +463,19 @@ } .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, -.user-toolbar .query-btn{ +.user-toolbar .query-btn { height: 28px; margin-left: 10px; padding: 0 16px; diff --git a/04.系统编码/App/Content/styles/login.css b/04.系统编码/App/Content/styles/login.css index b2d07d5..d70312d 100644 --- a/04.系统编码/App/Content/styles/login.css +++ b/04.系统编码/App/Content/styles/login.css @@ -26,7 +26,7 @@ } .login-logo{ - margin: 75px 0 0 40px; + margin: 70px 0 0 40px; } .login-block { @@ -55,7 +55,7 @@ } .login-tip { - margin-top: 20px; + margin-top: 15px; display: block; text-align: right; padding-right: 43px; @@ -69,7 +69,7 @@ .login-btn { width: 345px; - margin: 12px 0 0 38px; + margin: 40px 0 0 38px; line-height: 46px; text-align: center; cursor: pointer; diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml index 3ee51f9..24dbac5 100644 --- a/04.系统编码/App/Views/Beijing/Index.cshtml +++ b/04.系统编码/App/Views/Beijing/Index.cshtml @@ -10,9 +10,9 @@
-
+ @*
风场粒子 -
+
*@
时间标签
diff --git a/04.系统编码/App/Views/OrgManagement/Index.cshtml b/04.系统编码/App/Views/OrgManagement/Index.cshtml index 25b37b0..13950f4 100644 --- a/04.系统编码/App/Views/OrgManagement/Index.cshtml +++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml @@ -32,7 +32,7 @@
*@ -
+
diff --git a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml index 1b553ef..0dec61c 100644 --- a/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml +++ b/04.系统编码/App/Views/StatisticAnalysis/Index.cshtml @@ -22,7 +22,7 @@
- 起止日期 + 起止时间
diff --git a/04.系统编码/App/Views/User/Login.cshtml b/04.系统编码/App/Views/User/Login.cshtml index 7605a38..1ee384f 100644 --- a/04.系统编码/App/Views/User/Login.cshtml +++ b/04.系统编码/App/Views/User/Login.cshtml @@ -15,8 +15,8 @@
- +
diff --git a/04.系统编码/App/Views/UserManagement/Index.cshtml b/04.系统编码/App/Views/UserManagement/Index.cshtml index 2a3d7c0..470df00 100644 --- a/04.系统编码/App/Views/UserManagement/Index.cshtml +++ b/04.系统编码/App/Views/UserManagement/Index.cshtml @@ -37,7 +37,7 @@ -
+