From 407fd4e09cca3a07bc0191aa6bff9f138d86ba90 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 19 May 2023 19:17:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Log=20Manage=E9=A1=B5=E9=9D=A2=E7=BC=96?= =?UTF-8?q?=E5=86=99=EF=BC=8C=E6=8C=89=E8=AE=BE=E8=AE=A1=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B8=A6=E8=BF=9E=E6=8E=A5=E7=BA=BF=E7=9A=84=E6=A0=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/assets/images/global/switcher-open.png | Bin 0 -> 970 bytes src/assets/images/global/switcher.png | Bin 0 -> 984 bytes src/assets/images/log/download-active.png | Bin 0 -> 1140 bytes src/assets/images/log/download.png | Bin 0 -> 1143 bytes src/assets/images/log/operate-active.png | Bin 0 -> 1526 bytes src/assets/images/log/operate.png | Bin 0 -> 1381 bytes src/components/CustomModal/index.vue | 18 +- src/components/CustomTable/index.vue | 22 +- src/components/TreeWithLine/index.vue | 102 +++++++++ src/style.less | 9 +- src/views/logManage/index.vue | 250 ++++++++++++++++++++- src/views/system/Scheduling.vue | 9 + 13 files changed, 388 insertions(+), 24 deletions(-) create mode 100644 src/assets/images/global/switcher-open.png create mode 100644 src/assets/images/global/switcher.png create mode 100644 src/assets/images/log/download-active.png create mode 100644 src/assets/images/log/download.png create mode 100644 src/assets/images/log/operate-active.png create mode 100644 src/assets/images/log/operate.png create mode 100644 src/components/TreeWithLine/index.vue diff --git a/.env.development b/.env.development index 8a26770..83f4b20 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://182.92.183.230:8080/jeecg-boot +VUE_APP_API_BASE_URL=http://182.92.183.230:9999 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/src/assets/images/global/switcher-open.png b/src/assets/images/global/switcher-open.png new file mode 100644 index 0000000000000000000000000000000000000000..9f618310494f880a8c7b130eec92435b6143977a GIT binary patch literal 970 zcmaJ=J#W)M7&c@Hl`7PYkAah05J<##b`!Tb#grsYXhdCAX{2Vvu`i9A+Gp$wb~7R& z)QuT_10Mq$0|;1{!U9ML5J)UYNYH=4IZaXqf~E6)=y{&^dEa|)e`EdH?97=NK@etZ zt9qT!bIC{_=l`cC-#+BiX;x{nP1opaVuva!!MJLv)T{HW`Dh5^}ANy z7FVu-LX5e9OPC2_ch?JXtcgQi%-6{=6u}U}x|(=ss%dP1G7Sh&C6uucQovGPlGSWh zMVEns6a-NY%1TC7G0I|j35-6GM+@vWuItrNEWXpk4r4xsFp456T9jz84dr}350L^D zCBqS!aL;3Aobkf>v4T!QD{y?~P!A-EW{dWiCUU2TDY*Vb)(b~v;st}T=|fpUNlIg& zVf-KJx)XHB>g34pKZV1_o=;$%gtQk}{Nmd4Nhlwe17b27G$`F2S8=0584Wws2Z}5y z;Nq6!*)$3-4GD&UYhK7q&muKl6S;)sI5u9+Evi|$RIXH!F3S}?pHt-JVnr^gdbXr0 z#W7c>R?j6K8*}X=u0EBU^n&a2$T|s}Tg0vg)CI$wu`}IEajM>kYftx5n#zUT3`}nJ zubUnp@%BlUlfLDfN#_%fw|l_*`rGfFv;0kHHNDt~KeoQl99UrPiEuEudv5>33u!QT zeHEX2mpaj1{`%?to$H^Y$I8$Cz4O&q_b(iz*1jzKIF?4j!fyKI1GBf2yslbhU4K-% Gar+MoqA=b7 literal 0 HcmV?d00001 diff --git a/src/assets/images/global/switcher.png b/src/assets/images/global/switcher.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c4fe08b13880acb78dec916033abc6ee58410f GIT binary patch literal 984 zcmaJ=zi-n(73aO_KCwe}hNLY$0L zqUxW3#LyW80*S2y3@k9TY)D8jv9JK$kXSgUNyaD5COOt{i zOcj@Lna|Vl7(d1Tug-sX#;1!+ud+2-XDu@z!h%g}1QcC!gOrJBx9`0pc|jPRbt+X> zHCB*CUCE3wQsnxaEeQGf$TzJ`!a$8|IG!f{*nceo$JWI4IRhI05@|Tgoq()$Rx4I# z)5_W6{0)$g5EpO>GeP8Tc_E54v8#*tIzE;~(1ox~O*}SLHA-NK1_Y!fn6MyJK_(|D z=~OBWuLBjTP=<4|q9&9yf+?hAK<^WIw7{;TGA{ID@tr0%81s=Vw^}W!m6T|(AuG9D zPKK(istJxrgl&(RQNjyn`wEzZR^a%|p&p18%^GboP2^6GQ*ix(tQYpm#0w@zrY|cJ zj8p0Z4dee%*BzikRwgHY|0x_++CGuXB&5y2;ulw+jYIipDIg}JL50$-eicg%%4pc2 zK2Q}&1y|P{&!(;LT9;rLsOW{v^ej@un#d(2$FWg1g)uIqRlNYQqUbmWvzbCNttS^U zi&;Gd`&>+|rb|55=h`RSd#*zkA8oCdUk)tp4dBWe=kjpKJNJKhX+TaD_^dB8ySa! WdG5lQv28dOzqO*iik~mueeef{bTzdA literal 0 HcmV?d00001 diff --git a/src/assets/images/log/download-active.png b/src/assets/images/log/download-active.png new file mode 100644 index 0000000000000000000000000000000000000000..a73f22264a43569a3eb994ae25bfa8f64189fcd5 GIT binary patch literal 1140 zcmaJ>UuY9|9KSSc)NZX|71#REomX`Zo4fm6(uCX^n>3f$u%?6A&4T1q6h_r`n%dxAIuK!et-CU zKHtyx`}_Xxr`-6l&W?Q@6h(DrMx{I%{p9W5=_B8><)yo1=*6ibK8_}FRkk3NP*Dle z8C@>JJe1Yh@BV^A6y@#L3PoJZj)@A=S=q&~j&2e*MGXx*rmRdsOqXC;Gh)oMKW;I! zrpB0w!7QIOldz(V&ROvI+;~Bmn^K}GGklaDazrAaLoCydK5f{d6Js`YMKX7{IfmYZ z;Hen%&Qvj*qm#&jbeQD>3eO94B+7ztC=})gXn_}ajvwTJ5CCD34~ZZ`Z#@i&W~q~6 zUP^DpBC8lv!Ppczu3D|K)gX(kG6$m3D8~z&AOr{^V9y#@b^?ao-&ByGtyr3gHDu7P zqFh2VIK~jC?^4jsZCS(KDibLf=g1}pSl&&k3Cw2yAFAuyXdCC@d%qtQwhOZ+ z43S_pO%)R$nE;7kIF;rl08-Kj0HIVck{Sf5k#Hmenp_DfGdeVIldHbxMp|;+UeHYv zS%Q{!3aV)f>GWpKqSo3=sHNT(S8eTOuqBrxW;pj`KRD^;7HJ=My4|;AvEBL5Ank6E zz8*L-@GZF$4>MAt;M^-M|9;_4%{O0nj`}xJ-DTf>kv{*!!0PSVuJwBHSI;;8#1|)T zUwpK~Ydl}-@s75Iz<=$1uh3e1yk6;Sw8h`_EpB*MVtwAR+WH}Xunlnj4ds*crQN@* zoE`h}K<&@#?Th;A+LIlPPi5KMv-qmE{?+N8U}fi7AzZCsS=07?_naLn2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09Kp`MX~MtEjk zN`85f518DGfayAl`I-(ePrUMU zaSW-rl{DqnqLU45HH{T^0{>lw)7c(bDa>orIdQ0g^G9RE3`T1KNAZM1i(arZ=Y8mv zVD?}#F?_%(_ci|lt3zW3?-3@4KXM)anK#WUKJcb4gnDjMWpFKN?->kMF!t!x63%!`+~L_2ch5GS8FESXkjsCVLP)S^Vrmx2@mW9W-}Y|3(P;fw4>FbVXl&htj>iA z&smmg8Erb~KY?+%=1Cs~<~)XtIwtZHm>hmSRCQ=zWbm_7|0`|jcNkO@c)I$ztaD0e F0ss=}arXcK literal 0 HcmV?d00001 diff --git a/src/assets/images/log/operate-active.png b/src/assets/images/log/operate-active.png new file mode 100644 index 0000000000000000000000000000000000000000..9af1e99bcde1734c3c2ae8c5a924edf7aadf0e94 GIT binary patch literal 1526 zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0DF6BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFe_(0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)CuGfo`&afsul_rJkXg ziHVtkj)IYak%7K}slK6+uA!Ngfr*u&xdId@0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ*lEl2^R8JRMC7=;{nVBh8F6K@~=9XsWu5Jb{hK8;#j%J2NmL|rQ z2F_;2Zmvd_FugAM$)&lec_lEtDG0q5IQ4?kLT&-jW|!2W%(B!Jx1#)91+bs3GI6`b z6sLJmy(zfeVun+%KF~4xpqNF9X_yc&`GA=4bPMFbQ+{e5Fu4~2)AiIZ9%2j(Oqrf8 zjv*Dd)=WK}EgUFv?EGB!Hj}FyT^E*I2#Q&uP@7ou=GHFJPwYDkuZC!3+}*CVwZ5TM zEXOlh{2gy$_O8&5+6b0dQSZ4+Jj8k@97|D?+;5%cl{Cxb<(bCQJmp1o&!63?-rvtD zzI#RF4)bfa6)^`b`U}~dk9#E7oaN_zKI`cww*rUuk2}0~#?)tKdmELNcXqidP4ABI z=kH`@wyLzb{lizr^;&cj^R3R~Q#Nicc8-o*7?ku@{>y&{!NQy=Pd*kV)z*5RIkVVf zo1)AEJ)<7+sxQ6%(NRv!C02$ioliOqJQrTjPs)*Ey;NGzu$N)K*1kEr1GUI)KG`{~hr9a)=Y%b$xhT~5f zPe1%uWaaDU*82Q;!Ng5BZ_VDi>(+UtiP@&b+}z=<6*d9J=GN7o9x8d)FY@zgnKLZ! z*mLhz|Ej3_i$k>X4UT0!`}Y06M0NGoUq$DhysU9%e%e1jjcfAczOAm2F)9zQowd9- z?fsz(3l5gwoLI2?^Y3;HsYWV&UvN&h-m8LN2Qczka*+ u+lB89b$O>3^cU9WvCMtD<9|FO8^f**|5hH`C)oxni9KEYT-G@yGywqFeMpM{ literal 0 HcmV?d00001 diff --git a/src/assets/images/log/operate.png b/src/assets/images/log/operate.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef026b803c35f01b07cc9ce110d3608fc8a0677 GIT binary patch literal 1381 zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0DF6BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFe_(0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)CuGfo`&afsul_rJkXg ziHVtkj)IYak%7K}slK6+uA!Ngfr*u&xdId@0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ*lEl2^R8JRMC7=;{nVBh8E*1tR<`&M*u5Jb{hK8;{uCuF)nUkrL zql>Alv9l3OuSMv>2~2MaLaz%>y`Z#^TL84#CABECEH%ZgC_h&L>}RV?+-`Bi zX&zK>3U0SJ;nb@Sbc{YIW|3kVCIn1AASOKB0y*%MpPC0u?nS_Kz28o#ih+UghNp{T zNX4x+Q}=s21&SP>Z{M`w(n5t(T~bW9wU$fCFdbLO&}jbG+O(;64@Haur+ULYLPtp0&_m4o>V2J;6DM^qWR3qD5~u+BQjXOS9s^~Hob z1EzZp0yQsW*LXPyb2L=%i(JyM;n-`zZ@XDf%jkDm9~8R5I(tsE@wCMMxqanck4l=8 z1+IB*HaPCT>d}|aw+>7Tn-^H4{rc(Ac83@8D-FB?JHBpu#P@(LaIKM8s%`sJdp(C; zPLDFL6<<~^YW)5uZ2fYRlSk&4yHx4z+R3{_{sHji-+$nx8VX|NeK!tsN`m`5EFn583tc zd&N$a`fDS>_BiH$+L>ej7AH8`8!Xv1m+@_aXhr3t3|6&?)Bjo>Fqyvf;f%>?8Izcc yjkmO3&uo(m@|`_*Ve7Jb=JVl~FaHm3U}RA2$`)ixF**b)_&i - + - + + Save + Cancel + diff --git a/src/components/TreeWithLine/index.vue b/src/components/TreeWithLine/index.vue new file mode 100644 index 0000000..c632ca8 --- /dev/null +++ b/src/components/TreeWithLine/index.vue @@ -0,0 +1,102 @@ + + + diff --git a/src/style.less b/src/style.less index 88a27aa..b6dc193 100644 --- a/src/style.less +++ b/src/style.less @@ -490,6 +490,10 @@ body { color: #0cebc9; } } + + &-title { + user-select: none; + } } // 按钮 @@ -636,11 +640,6 @@ body { } } &-body { - padding-bottom: 0; - } - &-footer { - border-top: none; - text-align: center; padding-bottom: 22px; } } diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 178caf2..432d7f6 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -1,3 +1,249 @@ \ No newline at end of file +
+ + + + + + + + +
+ + + +
+ + + 这里是Log内容 + +
+ + + diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue index 0ee099f..3ce8ad8 100644 --- a/src/views/system/Scheduling.vue +++ b/src/views/system/Scheduling.vue @@ -550,6 +550,13 @@ export default { } } else { this.checkedAccount = selected ? '' : eventKey + // 将所有右侧的穿梭状态重置 + this.accountTreeData.forEach(account => { + // 将所有右侧的穿梭状态重置 + account.children.forEach(child => { + itemSelect(child.key, false) + }) + }) } }, @@ -574,6 +581,7 @@ export default { } } else { const moveKey = moveKeys[0] + console.log('%c [ moveKey ]-577', 'font-size:13px; background:pink; color:#bf2c9f;', moveKey) let parentIndex = -1, childIndex = -1 for (const pIndex in this.accountTreeData) { @@ -587,6 +595,7 @@ export default { } } this.accountTreeData[parentIndex].children.splice(childIndex, 1) + console.log('%c [ childIndex ]-591', 'font-size:13px; background:pink; color:#bf2c9f;', childIndex) } this.targetKeys = targetKeys }