From 0879d620b9855a33ee9d818e69cc237a6e908341 Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Sat, 7 Oct 2023 10:33:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=99=A4=E6=BB=A1=E6=84=8F=E5=BA=A6?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=A4=96=E5=88=87=E6=8D=A2=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=B8=8D=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/organizational/dangTree/index.vue | 2 +- src/views/dataBoard/organizational/gridTree/index.vue | 2 +- src/views/dataBoard/organizational/jwTree/index.vue | 2 +- src/views/dataBoard/overview/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index ff6b5273c..b6f9400aa 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -36,7 +36,7 @@ export default { if (n.orgId) { this.levelArr = []; this.nodeConfig = {}; - this.getTreeData(); + // this.getTreeData(); } }, }, diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue index 293507e8e..308f99f5e 100644 --- a/src/views/dataBoard/organizational/gridTree/index.vue +++ b/src/views/dataBoard/organizational/gridTree/index.vue @@ -36,7 +36,7 @@ export default { if (n.orgId) { this.levelArr = []; this.nodeConfig = {}; - this.getTreeData(); + // this.getTreeData(); } }, }, diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index 000096e11..a9882e9f5 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -36,7 +36,7 @@ export default { if (n.orgId) { this.levelArr = []; this.nodeConfig = {}; - this.getTreeData(); + // this.getTreeData(); } }, }, diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 5f10ab95b..a9d721cbc 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -305,7 +305,7 @@ export default { ...val, orgLevel: val.level, }; - this.getMapData(); + // this.getMapData(); } }, }, From 1463064bc3f78e0dcc4bd45b1de31d4876c62dbd Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Sat, 7 Oct 2023 13:28:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=88=B0=E8=89=87orangid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizational/dangTree/index.vue | 11 +- .../organizational/gridTree/index.vue | 11 +- .../dataBoard/organizational/jwTree/index.vue | 11 +- src/views/dataBoard/overview/index.vue | 221 ++++++------------ 4 files changed, 90 insertions(+), 164 deletions(-) diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index b6f9400aa..2aa4e6b41 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -42,10 +42,11 @@ export default { }, computed: {}, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -76,7 +77,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue index 308f99f5e..e13f766d4 100644 --- a/src/views/dataBoard/organizational/gridTree/index.vue +++ b/src/views/dataBoard/organizational/gridTree/index.vue @@ -41,10 +41,11 @@ export default { }, }, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -84,7 +85,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index a9882e9f5..6cc88bcc0 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -41,10 +41,11 @@ export default { }, }, mounted() { - const orgId = this.$store.state.chooseArea.chooseName.orgId; - if (orgId) { - this.getTreeData(); - } + // const orgId = this.$store.state.chooseArea.chooseName.orgId; + // if (orgId) { + // this.getTreeData(); + // } + this.getTreeData(); }, methods: { getLevelArrNum(myArray) { @@ -86,7 +87,7 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=`).then((res) => { const { data: { code, msg, data }, } = res; diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index a9d721cbc..16fe87fc0 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -8,167 +8,91 @@
*(mP4JSB!SSThvs9nQui%@0E%9IS7{SL4dtr zKBy!%o0H;|q-)FxVQIVCQ!#{i+Lk3=>eakUT6cT^i`IkaR=CCYru}jC_@9D#FUWcZ z%wF2>hN+6hYl$jlIAr2FpFx3Z&D s5X#_LkLt`= zSqPY^k(yO>%#+$pD_vgfh8IvoYvEb9AgX Y3){IFjrbno9cP@0D0~m1 q;k)HjV5GfEbn# zkhs?1Jxbefb{sA9p ?0!by0(tCp7n5Im%WLfyJ$DM`{+ ztbgb@BdN*LiFY}K=dMP`uS3N55^vaWItuO|fs!vF!6aOGYLVOwXCcO;$Ir5MjWDhM z&h!>xQF|ABz#)pxY6Qt^& 7c1H8c+RfsN zvH{(OSL89?%Z|V_2C`la+xrOd`8!U-V)YNv4F4B=dlF%!7hiO@td_5odQ;VhI$o(e zXnQWH5; HgYC*%=HG}_pN8h*9awHWfPz1@g0SfbvU?MrpHAqM z6^pUynMLOwg%Hl-lOzP$WAMEj;Fmr|eEN>l5HH+@DEQxK(iHNxv!Y#^_35GqEC+xu z#EP x9^s;9eA PwXqqdvUod+z{v>Q{O_UEdmr&Br<{T$ zd?T8TuYsc@unR6o4xXqjTB+0YjECr7>RXLCv~dYT*}N* 9S3l-9 &oAz5u^D`dTbhzlq+`F)YV=!qiN;SIr3oU#q;TnvUL@(0Pnz)IOxKt`58tg>Yqy z&$|MfhQ26sr;T`a<~3Ma{w8|M(+Hz GC|` zD1pW=M-g&74BLAd*u6g`oYZdsCEo&*NbII7?OHrD Q2>y zOD@$&H@q$VF%QC{OTf;TiPx{+07Taz3cdq)GjQYd$c+@F3X$2OEU489l-C5b0hxSt z?NrQaPdEHx5F>97!0|2t+y6*>&N&+}bNE_R8{dN`hm3r?HRm K2L-qkc6v zZZKF*s%mDkbLK3**%ZQq@N+N0;OIlLvNw*2{nwxtJd8L#4llEDo!3Mf`bb(XpB^AG zg)2$*Az($ 0HdwJobjSuVyJ-GqI$%|2_e4Y5Dlh&bGzY y8NqS(#$jALi{0re1zCnEQ$!pQ5UV%9J5h80Ao;uH^ zB{C}0OHcBd5=zrWA`{GXRcWXT-mzjdlRl7h0Se`Bri7dI%TaIs3y9{`iShz5Y8~BQ zp^%=(R9gkqK8I;EtHveTzjwp;*pViDKJuk+5ubkg8q6KP6mj!WMD=+jdArj_lu*Km z1S!;5wbZX7Rs$$=FRH`F6s|!DlB5qgcP9phzfJtom#)VCUtfaS;*Vh$=8%i!m~&g5 zsIl7Zl4ElswF&YqVW1%DPgP&ks_%xc*AwKeUihVRaLVTI%7)h%e(}UhFuU**^t$ti zbLruIb52@GtIypI7a7O&MyFD_X}d+ay(Nsb&9M_Nw+4Ex3Q#-;n@{^5@#gKLm_2wA z=4T# }^M}_ -khoYJ zK{0neDEc{S3kxWeRvu+vhQ8yXiDm1+L}ja{^C-K)*J?2eRt1)SCJrC_k?3?)JUnoo zP0 ;?W2uJmug;gaz7?g`RUGNUYh^!vi&Ka0G{wQ&& zG>oEiE(rgo2+J{NT4Jc17gBAU-iPQR#-eW9#)Ks8h$74wDG`=UQ|p2k<0=F_;QTgl z@EGx#XAa@;#Mx*zeu2c3D=8M#?F>a&U!0UHDO%DVuv~*N_MATD>X~LV{XP-DY{dwI zGAg;#FgpH|l%ivv6$oY4rA1Q4+#(-f|J(ayptQGhtF+tgBQQ3k&9cOnTW)2nl2I zUeSa46Y(+f`7+A+Em*tZapJMDK}5@Eq8dC6-(ObEK?qf|8`YYSFeEpAjKqtJjGi7+ z5o$2s(`K|2Zy`YwMHDKV;TL}{> 7&1(>3(MQs<;4jQ0X_OjuZG zyGpsiB^l&7F)x>}(saoy-#WPqUM^J^&{uu|=BiJngv;g4NUHm>j2im-EOl{CF2tD& za`G-gzWe0joTPU=jk&erJMcCV%qYSeF<1R1@%VTzYKxmuoBbV@)b)zgxcb!{f;9B^ z1HDZ6_c_I9J3;5mE*-Zp9e6oPIWv<-fB(to>G`FMxq7kx$xWDVPGD&%tz*-S+BEb9 zNX5p=ljMWCM@sq$v$Lj3(mYxGDkL~6b= Zzr{;Pjx4PGu9!Q>R z*08$Lo! DeHc z<|jZH2g}`cb&tIx3tDkq5>3<~T!fWj+<4<*xfGknBaf^?d}IdGYCcbpp9|1G4ImHo z>jAO>JE5CSCcVX9Hm(~!)sBae-a%Y=+0m5ncfK=-+1cY}t5O%H45dXF;QavUpD^e& zqV9&Z5-+Ou(BI#WOD>ra2a>Bj_E_I+tv0_V-A+k8m#)930otO!)%%t$z|&8+eRtcT ztaKhH;*-OGS1A;FkDYVQEdA3JSNIn`@c?gd zuU_qsPEE-{`Se$Ao;$3N{QUsky^?|F(}s0;Y|I~>oNNkV`F*^!CIA2cPDw;TRB;&x zPd^=+-{^TRwE0aRlivCLd{mWC8#j9R?QhjOFX7^gZ9M$2+?>ibljkevKb6i>&&)|m qc+Vc{{1v1BRH^>~5R36L^Zx}NG!E%j)vb^K0000 PyA07*naRCr#!e0i81M|JNxRn^^hoqaTmBx_^~FR~4>#bP@o7zhwM4j7p+VKF#{ zm^}%BKnNt3lR#bq2`?lpP9Tu*;PI?L!s@WZlEF5cmEd5FjU-#6Wo9&*{qEgeRp))D zy8F(Z(Iw$~f4utUo2okJ{OVMlI<<6l^+h5=*nhLYoA(>|{}AZzNePp8TO`^iU H+YJ)kE#dTOAGW *$BEJN^!WLw~DQ;E6*2p2-FhJ>;$Z_@7EMkA11Wd-75P zFv%JdJ;RqGEF2~#xp0v4yOaFEsf5Qe*B&Nd$Yd(m74IsqDpOGE*?mKm``E7@`hHJ2 zf3gC*FST$G;81xM_f(G%z_p1&jt-{E({v&;PH^ok!ol&xBIPlJ>Kt{&!(oDBqpE8C za{0n%RFICoB>)V1;Z&&t02<1(nOC{84gr8u!1Od`S{C-~;Yy|aF22{sbIrG1E
<#+cJz&K7#9R}u2K@u|`^5fVU zZ^j>jL$GJ$eAS?l{(>1=MtbnA`4!&|N1nGd^5jYc#{vP-83KP4AsVD(Czf#6lQuOa z8YJ+S9G~N3M-%?8>&~z_u`8a-9L#yGrTk!St+;@6>aF=!jYe{|ZxP^d#0sZRSDm>h zwv~y~9D^D}&`TTh6H7FGkYy*F;)!ibuCKe|nGqRpO^e~)0q+db?7l)+ua5-=&w^}5 zpsF}MowPs&{iwqgnwS8Xp60?6MndnUiCt?reQbrCS{6$A-SD8xv}o#nIWBGq1_$Sm z9)5c<^qX6QE#eGRsu8IEwsW061+Xo(^6510%x~Kc;AF;Ds1uiUOeg->u(ktB5EOg8 z(I65tNQWm&wbt jh2uL+1!t;qv9;~|9RlWo|6CXu0hphkhmkZh zpD`Sl=_85knS?R&6b5v`4-8qbK`yE{w))G{CwLt9)I->5uyLxVr>6;?6kNDiZlE0~ zkWdY@x=N6!PAih}*XfB|fs%@ziys*nvXx3DpI5!xJrN&Adi<{5M)>Fjrn-EhEOSjb zPl<&E0F)&hGBsM1B_vZz=jyEY5`HIrIAaY1bi?bWwk6Zb%ksdELU76BNXvKiR%WLz z6j5cmE_K6e_DS29r=dZB#id0Uf+1L3Tm+$t$aF~41ATc~ghddmMa iy=p_&lz{$z z=(i18SxXAW;Sga3fD1+uA}s{OO529-2Vg$5<8$$5PFq%7js0CKi(`-CsR#EB6pKrj z>acoL+Hyk#QuOr%w6d}SC<{oYL0Qa-Hq$uI^h}P^-SE0zF?rt><6QB=T5b3dtUUUz zLDbdDQP{`As%#95NU^%w=|my+mIGoM) {PMi9)~}ax zUg1Jg `U_b1wkXk{0K%r_`dgG~e3`kfl3i zH{ j}1h VIwZ{K1?{b@Fi9sw+` zNz+hJ^eE8;0QDH53;?Shfy^NkTM3VYOnKHL5HTh)F?Pe7MnMC`y~4AX30wRj&VTQ> zMr6>sN<#RsXv&HhwvxD@DgcTA$%cfz0n%DXoQHA^Xw9QKr)xDRmAIvxkFf+LaQrTK z)6|*_^@6}BuQcQD b1U$wX?U5>bcy{1LA)OPpoB%SuYppDp3O{md=gAq>3|s zR@pS}#1{snX)ZQ xE8rkge+gLgQL3` zia ^(;r`-29` zRT;B$DMFz)?5|x#QX8=1V#&ukMTAX%gIqGK&c)|EVTeqh26}pb&fbfQKYIOEN%ogy zj=tN762 2 z(7*h=V$MFOW3h^!mCcrq`5YJ2fC87!tzB#Y6u{-1%Ni*c5ena#olQ{~VyVO~-SD;5 zmdQ)o7kl0{%PYO##AElpd;4JT(({bb-?heHkv3A4Q-r9I>S^IQ lNA}snybwyaz z$TZi7+* ZGLysD=?a8gsV2)b`tqn?>O#nyFw*W(~OoG9J!ESgPwTvjkpftg=dU|@kglE40 z=ABYCZ&ax6HLd2N%y|kR2dpTWF#udk(8E@%1*{;S2WX+e93{%ymCIzi;H^YsLOmo= zTpQcM7jgQ&H}5PK8+%n={+q4Rq6l<{;v7J$mDGb3q;=tzvSOy?T1gdiSzVoMM<&Hv zp|lAbLnw03sn-ktj3<8hhVu&|yosd#mXvZ)TB%qzu$r)-u+<77mkWRzn!?Cnt}lRQ zLlZ^{A(!x+ysrs`a+T?ZH_(htT@Fj%d+ySz{{>t 0o9i1R@&K$z~goLt_+Fyx^ph}#(oi{0>wD7FTMNz(J1Vg7EUleb^6v=F_N zwD^XU`fLp70ma093J?I0CP0G$NeVgU!b1QE0@q5mLedfIvfc1rK8Q_CZy_)*@MZ8h zq{DCAwcKpI%nG t7!BZS-9m`=ras5!S z_*q>0kJmj(>-ZH>j9&w+pOt=beF8~q5Cj2)NizY0OnV3ry7s5alC;ZYp#$HD>Ke%3 zqC9cEuY%9u>F>Pi!XSWG8be YstJ>08Vbywz)2?&o-kk21?@--NriQRW>zwaz2}Amo zYK1 A$V z>iQpX_MuxZRs^?FtiOZ+XVC+Rs8W+=ChQhxZDJEA{G=;1b;Dbf8mt+SLcA~n@hJ>v zZ@suOYhM$$;EPJwGs0gtbrb>kJVSZe+`aDBQEbrnBsm!$Aj@}JyAy9wYqHUZ!rYCe zaq$TZkKA%erGl@Gjr|v8U``-<4CXd)aD}Fsw)^-1act4^1Z8m>km5Gu4H_M2F^Yk> zv8R_lj@3iAToMw!F0%FuMJ;BvAfG)qM(ZX9S9pCr?aY}f-0Vvp3CcWwGv1)ozHdhW z#Z7rhcj4T(CwHTld%Yz1JjiHHc&Vu)fJi9xQ|F4bLSJceqlS4}A@~vaR**}xbuxZx zvQ9krvGVk29OFw&7<~*++ ejqVxc&_FUTLhjg*yLU^X=MJJ z)*+QitpNTyzYAUh#bE5XMZ7s| !%tLR!T$t706ox(rU}ub2pZh!|DAq}#T)49Y z+apfgY6BfSAZym;ShNGr!^tNc*C<{F-oRgB?bMquZ=G5D?J(4z6H3gu;Y5ZYmPyUq zA%?{C5*@!CXI&z(-349nmcm#Nj-&EkRv7L7pSb+k8=kBymAC39{O?%WnY@o)6bka4 zSq&jdjN%x4ZjmyHnSFL9i9`vX<5(w({USg&yd)J1ey^bL<*KjugE;@4+nxem>vzDI z&$LL-NDQ2F`Oc&<4`j#`CuWWz0 x$)ARhCnA}r_x~#~FOp0%jjg_TssJvUW3H}^s9(>Ie zQq 9vk$)J z3L~n&4~9OajXfo?L$PL$HOYGH?BD@7T55iFwya|8TphBm;vIP7*;pBGI{@5jvG_im zdFa=#6mjF-R@0{l@MPelm--ZFO>TYl(q7N#93v7cLP`t}yD5_h$r&Z_$qjhRTh9o# zTZz9;n13(M{^!g0Kvlm-SonJ_=#(41S&Op$6+2hQUaQmhT)LB=r8m)xf=Gq9-AcF( zO6pH=_R!1sh?e;SAp7?M;bdrSpjZj-ytMm+^{qiie{a_A1Oc?M*bQ&N#?pG*L73ZY z;QcW!+<(hcHMQ=rf<6vNC#?Zr$z)MLV=?n3rlFBY(ojP8z*DL7=@>`~Vx^4hh8Ged z1i1r&UZbqM6Xy=T;%TI!eIV@Ld0L$`sJ*PUfP_Fu8Wk$iq|<%{UIIC|rwoM}Vo(wZ zj6z3Ct<{P5g$}irJ5bVZKrHs*+`*SVjg @hdm=ri|L-3tVT_2_s z#byug9B%2Ruq~4H$tFBIm$5Vfh_8<${CzxqXzx{`DgM*~eN<{XZY}ue6Ou*ZZbXx$ zQAkV{dP0&&8QpomkjV*sl+1G7@Rm=|QSShPH$f4956^sW?^PzoKbJ@!jtQqFS`UB= z;{M_ze|8xp&=CT!RF21;8v`hwri`m#LQkjHE_f3~vGQ>Tp?Fgu;hng2|K6)YqW6=A z50i(}0=2KTN+u2VY9mo=?OZw=CCShsbVAINNZPPsos!PQ3qg^RIANuHV?g*0oPXfO zS8IzOFvk9kA#+>`&(8*rl7=)ZV7;s(Rn2oW51)jh+)#5BaI;6ddeDhy#fWkz2z-;W z@Vhv3-%G9mVg3RU|2opqacRA_bGhNfid{>TE1S!W(=CtFlj=+wpL$m6oSk?SDk8Ky zg%EF1Qoar6AAHF*ajZY+N&6vf@VK?;ws`0XB;sMU$)(cJ1mkZ76RW4)_Ysh$HsoZYWrcd zbez&YPWp7+l)Rl~r_xO2G*6A~`f)d8niG?3#v3VOU%~`gc$2c??YQ*4y;rqj`+j50 zM|=gxqY! B-E>Ha;-58Sj^`Y_3tm`?j1&`q;*GMX-igQW-+Ps3^!vbsACn5EiTl{i z!MtOO0W^ Qb-}y2TF41) V%bQ=F|{?I|=}&AQ=zgfO;p!jO7hqp9AFr@lS;bhOR) zN-}o=(g_|;yo1Pg6WMc;+f{JmxHY`f$QBAINb$PNGZ)M7)~5@eClC<0!+?ApLH^xt zJ+`|3Cn)t@0Olka-*+CHKAiJ3?DkPPL7JZ&l_2CeJ9bF(ZlC3LmZ`^Y!Xqn|VuvAl zyHe%%xE+Xv+8?1bf9oka5j7|$18bdUlJ7PEytF5ay>g2_V&ptH$!l_(2E}jJV=$o* z-S9%n$iz4yg#TIrg+IjEf4}9awz|AeQ1l5;m=nebelT>~h|ZDeywwn@oZsPGo1Zc| z9;P O8A*uL;V1`|!k}$vv`Bze7><2|;ku3X#lQ48+K7+MVadNk6j5-R{IK zk(>6^olk6=@P?YPY5M1hAh^wxi+AFqU;mXoJ%N3XMEyzO(J7;OJ grx1o-~m)ngEZmUP~kMZc2UT|fu2j1 W GG;~y-a2v%vzGB9p;I$-dUU4`b{vqThcBD)(qfEKZf!-mR~j9B03W;O zg- MMBf?x6>Vr>zCS44`L=314exhLDabMb{@5Z7C+@fgZCdAY%l;?mK{-K|rLuNP4J zys|haa^$sNez57>(LZlXw0jSgv{bv-0lrFj&N>;b^W{kgUU^ZhV}H!b(%#(o&|SEA z `2VQou2lKD>arKJY2XP0!tTe4b7Z%aKY+@PEAk9hj~&%Dr9;1*w1zKV*@3J@we^C0Bcx4wrI@dE21 z 8cr7jL3;7bfnIlnp2(&yrh*NQ#zN1D`gUC%`RGkEsU3wDJowU_5% z^&VOD7UEW_xcv&AXE3Bl5W2VUX$w0Wn)Sp6#hdU1Mw^`25{7-(dA+62;?b`?=YqhC zeyxBj-;jBG7F$wv-XC$-F?=LG F7ONC&4ohc8zr<0l@Psv3&>2$3OVnr*@6%QWPTVC2HD<=`ROoo z^e*@St*%98xMBLA7sdJgc;qY3JwNX?ZYt&0z7>F2j0Aenh$xgk243V^;L>bnzO9yB zr%U57_AxLKCD(F-WW0C5dpWC3Xop(5@43ym@Ohm6`tx@RT-#grmj5jPS`2eaW%rBR zDPB4$v|G|;Xm!eU-Y@E;+bA}|4+g7o-*a10{-5#8eb3*iqsomwEgdL%v=~}Xwm0S- zvr|hDx<+wDI%h9GO!_~&iL{xYVyuXb0UT=S!Dst^&%fZ@cW<1~l`}8&<;p>cv?PJ= zfh2(f9=N>vWY?PbwiDAsLJZI;v|-1VHoXSb1s_1HTV8Rn9t~crid(*fQ(xV?qa 1~b?72CENP6)%gXQtfe@0kh%6E#a1C<2s|W z!Z2N(vf-Cih|A!clrlCJsDHUW_RLB+dXH1wm!ErnUd%s823CdjWWKLO%`iKsW|IQs z13}PiKvU!}Z#%BE=L^7e4$R}ab;AdsbxTlxtub; $qfeXzC4dUzE zuJ27Fu>uqU9S^C&m$9=iN4ns1g-}~keaqF+J
Qs+Bca%`3{U-^=6EQ!bN?Aa{~# zHu7rx#X!DJD2tAVO^e;|RyB+b2YM>ez~!dp{Q#@q{)OSy*6P!Wg{4QtYP~9QC6Ro9 z!mpCb>o< ?ysg)b4T|N8-g4RCNco3O@k&^^Qrc5f z1>aWtf|97DAHSd~Bk3w(e;H||N}MkjkgAPDq2np8Tm_PMya~S>-ptmGEfmUiF}%C4 zzyA>a qOqYvZ1e*Efz3&(1g?HsNiSzfF(MBa*a z>-zctXDm`&A?V{TfB^a?k}tUW`ubpXbrn$cAn6K0CeYE-{JB?#=N1Pf3(Io&NvBWu z9>xbhe)YhX;mReW#f4+dx@`; 1_JcV@a&gZg4?UI=d>ai+8s8_F>JCIA2f?ny*JR0|p! zT!h6XfHp7HZF>X_@y8jf78mDvj4!UsbmAu#ZEXe$3+5?1`%62I;POM0z17NNyS)1J z3E@|pvNa@zdXN??>z+(KNW-uIi JsVQg#`nBEN!Rp1}M$W2vu zZ(X5XC-KbJZz(of4{z%$oI10nR>Fw@@bqZ_nIFforl7gJ#j!zln&e~exutO&8=NH< zHxoK@wryMIb;S>#wy*@jk%i00d(V5pDWr#PFPvR_aBR!gN6sGm21L6qZ~rU?@JH(I zn{@y<9RO|%Cuka`VZwbyCNt`b4Hvesi8>OO+w7>5XpLzU7)Z_c{NWV+Teg{Ah7u z0V2NyxGOc@u{3u1`~*UCI&mQWU4f$j8~9HGX#bu-H~fy>v~YOJH|2|mMlZW=9#1_u znHSYZhcJ3%X{-tQSf-e7Y@7h(!kyw8P&Xd49DlR?=KL10^HboPk;?{b`I1FEe&E&| zE+6QZ=EUl@VTfU2w*Z&|I6wJilc^`z^t)mA`BTK{-LM y>MdS0;)OA6fyi=RzPT141>44;=z%(|~`K z;t)6<2bN<>Ds$)vU{`!USQrNHk;-Mg2TnYD6(4%&E^l=8gFRcL$7)ameQ+4?+65pO zUU#x=!2DM+E3D1|!LtCm;yCGl#yiHP~~*Yzq<6U%B}y&AJm1 z?no;G0C(OAct=P6zcU6m>d?w~u;=y}J|rbEwf| i{_k+K4+Pvn^nU?1e)+!R&jq{y0000 -+{{ item.organizationName }}@@ -116,6 +116,18 @@ export default { justify-content: space-around; } +@mixin lastLevel { + @include spanLevel; + @include normalLevel; + height: 118px; + width: 30px; + margin-top: -12px; + background-size: 100%; + cursor: pointer; + writing-mode: tb-rl; + text-orientation: upright; +} + .name_more { span { &:hover { @@ -163,15 +175,20 @@ export default { background-size: 100%; } .dyzxh { - @include spanLevel; - @include normalLevel; - height: 118px; - width: 30px; - writing-mode: tb-rl; - margin-top: -12px; + @include lastLevel; background-image: url(~@/assets/images/home/dyzxhTree.png); - background-size: 100%; - cursor: pointer; + } + .dyzxhGreen { + @include lastLevel; + background-image: url(~@/assets/images/home/gridGreen.png); + } + .dyzxhRed { + @include lastLevel; + background-image: url(~@/assets/images/home/gridRed.png); + } + .dyzxhYellow { + @include lastLevel; + background-image: url(~@/assets/images/home/gridYellow.png); } .lxjt { @include spanLevel; diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 424869801..ac36790f5 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -27,8 +27,8 @@-diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index 8c261a1db..5b76a6a46 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -17,12 +17,12 @@- {{ spliceNameFun(item.name, 3) }} ++ {{ spliceNameFun(item.organizationName, 3) }}-+ -+@@ -62,7 +62,16 @@ export default { mounted() {}, computed: {}, watch: {}, - methods: {}, + methods: { + getChildrenData(item) { + // if (item.children) { + // item._children = item.children; + // item.children = null; + // } else { + // item.children = item._children; + // } + }, + }, };