From 8365120d79e482cea3a1f050730f099aabda5466 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 15 Apr 2022 18:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 6148 -> 8196 bytes
 public/.DS_Store                              | Bin 8196 -> 10244 bytes
 public/components/property/.DS_Store          | Bin 0 -> 6148 bytes
 .../property/roomTree/roomTree.html           |   2 +-
 .../components/property/roomTree/roomTree.js  |  10 ++++++----
 public/img/.DS_Store                          | Bin 6148 -> 8196 bytes
 public/img/room.png                           | Bin 0 -> 515 bytes
 7 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 public/components/property/.DS_Store
 create mode 100644 public/img/room.png

diff --git a/.DS_Store b/.DS_Store
index ccf5bffaefe80d86a35946178949d8ce103b29da..36691b53a8fe6f622d4fa3725279d3fb8862d4fa 100755
GIT binary patch
delta 568
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA$hR?IH}hr%jz7$c**Q2SHn1@A
zZRTOAW~$FjE-OgN$xi}m-<(vClUZD1U~peRfRTxrg_Vt+gOiJ!hnJ6EKu}0nP()Bv
zR8UM@R6<BfI$l6HDKR-ay(qslFU2`OC%?!kr!+NQfWJ5+zuYr9KQEvtwJbBWJfbAE
zq9i!83MeInrXeUbB`&ERZb(RF0Z@?$nj-h2)YQD_^rFlZ|FpE?)RG7!b|lEU<f8nX
zoPhk|%#zIfyvP`^^(Cpfo_T5cKr2B`@Gk&K6^Er36$5EBJ@xr{5s`^SMTvRosZN!#
zIf+TBIsSQ0`6VU!xe=K_e}LQ$wllaOF*!3YUD^HvFkFFvQ`tcS!V+LmhA@EPF2ER)
zm!Fpklnj7~DLZ&WB{>+h85|jc8Dba;85$U-Gc0CU&v4L*;T*$bhOZ3&8F?AS7?l{c
z8Fd&<8O<3T7#$g%89f+18G|6&nHZtQ$Utc*#TY%goNejmFCqfW6B~F0nIXaw+(6nD
g6#ttAIlePb<`?mt?9ao&0W<`ZG#EC=^UPre0OppGga7~l

delta 107
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG}fU^g=(?`9r>YNp9yB2y=p
tyk5-C!6C>DR0IS9+(5z=q<&-Jcjn3bGM*sa3``J{K!!7Hj^~-f3;_3Y5(5AL

diff --git a/public/.DS_Store b/public/.DS_Store
index 5b64798098cd5c2726798ddc88d3f4ccb5f78ced..c0c1d989d3afca3d12ee84e91528058a012b96a5 100755
GIT binary patch
delta 545
zcmZp1XbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~50$f&Y0U^hRb%48ma^NMT?Nel%H
zxeR#>Sq#OVIr+&+Ir&K-#S9Eg=|E%nHeV1}!|2P(kOqW$SQK3aDf$lvKy3^R>`;~E
z42cZI47sRAGB^TN*G(=I%H`w)s>^36V#u9rAR=MJupT6VWDFZj8q-QfS+F6Og^qI=
znHlIP7@L?+ekdxtdB5;RCSHD!r9i85fG}XPy_lkNH=4;H6(tO*Kp!VFWCB$c1KA}I
zuK^vDhw5O)pJ2OE#hlqedVo5C&Xr^Zg-qS#*<zX8TnuGEQ&NC(`5+l?P;fx~v9ZvF
zU62_ZC=3eRK-v`)2OA5&Gf(E12^3+1#Eb?=0V4y00f?SlAk({9UL=rq{%`~U_sE2Y

delta 149
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7`UYH$S8FWFCR@ldT0sH_Hh2
zFisLqntVWb54*Xkj)I}7<>Y6APMeR4^fFC8CvGv>LLz4K2?=IKL1v&aKp?>lBwRrz
iZY=!HJegl5kb@Co55wemo~fJfixxA&G%h|N!3Y55CnOsH

diff --git a/public/components/property/.DS_Store b/public/components/property/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..90aff3158b975328106f521cb778aa371c57f723
GIT binary patch
literal 6148
zcmeHK%}xR_5N-jrV2m70<k*Wh4xo_e!DO@I!JEkvJ*a`*u#rt*OJI>GV)ixkjeG)M
z$C<Ve33~Bh44EO*Z#qA1`jxa>#u#_UohoBR#+U#_%;cf@Mlg=LA{pyJ<a&%I8?umv
z!DKX8$tK5tWB~V0z^*Cy_1TyG3wkPm*n2SOMWdur`QVvsZew#xh=M5W6z;sPns|wy
zj7P3Nyuse3pL7FjH<juwY(Kb)!bz*Rcc$XRkK%Bsi=$2mDYw^A+))!(jpNQpkK>tu
z5P6Yr6-(3UVf~~mYsZyYSx#%UdRZP-YO`5h>>pH5FWUXbr|I+T<<+pu;g6_g*Ww)B
zz*t%6gEx$OD!zx<yl$RPNDL4I#K0OeV2?bpy~b;#r4a+f!0#Bq^Fe|lIu=ud`sjcL
zKOZrkLqq`^-x7$@qGK^N2oVr&N&!tNw@(ai%E2#fo?|gJXv!JaGs8G`W^P|7T+a@E
zsnZ#E3{p!B5Ch8$WKFk-_y76N@Bif@>JbCPz*;fDa}BTI!jkOWy0SRDYb9tK6b18A
mgNqU{^i>SGcommGwSZru0q9sv4T1-RJ_Ixk)DQ!I%D^WWRZ|`S

literal 0
HcmV?d00001

diff --git a/public/components/property/roomTree/roomTree.html b/public/components/property/roomTree/roomTree.html
index aad4b00c5..a4bc396a2 100755
--- a/public/components/property/roomTree/roomTree.html
+++ b/public/components/property/roomTree/roomTree.html
@@ -2,7 +2,7 @@
 <div>
     <div class="modal right fade" id="roomTreeModal" tabindex="-1" role="dialog" aria-labelledby="roomTreeLabel"
         aria-hidden="true">
-        <div class="modal-dialog">
+        <div class="modal-dialog" style="width: 280px;">
             <div class="modal-content">
                 <div class="modal-header">
                     <h4 class="modal-title">请选择房屋</h4>
diff --git a/public/components/property/roomTree/roomTree.js b/public/components/property/roomTree/roomTree.js
index 8f6ddcc5b..c891aefd5 100755
--- a/public/components/property/roomTree/roomTree.js
+++ b/public/components/property/roomTree/roomTree.js
@@ -116,16 +116,18 @@
                             return ;
                         }
                         listRoomData.rooms.forEach(_room =>{
+                            let _text = _room.roomNum;
+                            if(_room.ownerName){
+                                _text +=('('+_room.ownerName+")") 
+                            }
                             let _data = {
                                 id: 'r_' + _room.roomId,
                                 roomId: _room.roomId,
                                 roomName:_room.floorNum+"-"+_room.unitNum+"-"+_room.roomNum,
-                                text: _room.roomNum,
-                                icon: "/img/unit.png",
+                                text: _text,
+                                icon: "/img/room.png",
                             };
-
                             $('#jstree_floorUnitRoom').jstree('create_node', $('#u_'+_unitId), _data, "last", false, false);	
-
                         })
                         $('#jstree_floorUnitRoom').jstree('open_node', $('#u_'+_unitId));
                     },
diff --git a/public/img/.DS_Store b/public/img/.DS_Store
index 2b6a63ab48898070877d8cdbe2a7d3c9f722cc80..41a74ca56ebb80a578385b33526923dfb37e2c3d 100755
GIT binary patch
literal 8196
zcmeHM!EO^V5PeRISenuT7s>%?k6eP(GeX)%MW{C<J|HA5T|nC`Bn{9D+6yOsfD?C4
zd<|d1i4(jTTZ!ZKUJ+Go$)3&bd$#9!ysL2lnBn4NAJ_wsv5LLbXA>#%TxzTI+?{*0
zhJ4^5-eQXKsH%@!=yW3~kQ7J?Bn6TJNrC@C0e-WkWF6mq`!uylfuz8dR6yPjIjh*h
z*~VIZb+FMCfOeC&weXsGfO2wY3uhZ^mC8PC_Fx><xD>-!I-lnPr!AaqthIC)ONVhI
z8<(LN9i6;f;V^}@sZ9zb1=<Qo?w(<Yrx@VC&)+9iJ>fHMr{0+M!5=N!!PXK#!pAtr
zd?E6i$Jxd)#+c!V=L0nsI4AE7PYd*{U^SNc9q?}B1TS$)?gABA2YAoxbM4DJZCLft
zD}x@ckzEmAVlL+rD<mEf>HBp<ku~Qxi+k1k8T6ew#)mkbvxV95RJhJrj5(W%KFx3u
z%;$SBpDnziY9o3+CqC*eegq@z;x#!nRUTl%>yq`1ZIo^92keaKDQnm2a8(0;MA<3V
zNO<8|-VOZe)9;#ihvuAQcBktqn9l)gTUmm%K6UuA@i^e!Z1MKvDrg*h^;T&&!t9K6
ziMKUPc3SLCu0;D9H*?&&W2O=z{!Fc+B~=}1tVCB?qIPYRK9#KTjEtHqEn~&j;a8w%
zn-$r=8u6bzE$`qRBV8g=_VIw%vYVxybNuLhHKzSOGU8=dp2hL<t}*NQ1wFJ;ygZLw
z?R$;-5HCBdW7ivrV_$XtOeHCB=@r<p9_&f}|D^l;|I+)J97qZz1-cb5n}^R2hkWjG
z>lRXS?VR-ms}#XC)+&XKrsK4lj?*sxFywVksBj8r8*6!o<=-C!r0>59pPDPJz+Vxz
BfujHb

delta 140
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50$jG%ZU^gQp*JK_6<H>IYv?f;y
z>P_|(x;A;Hu+e055rN5qA}X8tMSn1DY_MTm%+A3f$PCmC1OnVZ!WCrD#=`H+llf&F
XK{hckGBB`!XeNkNV6n~dJad=<tdJQ|

diff --git a/public/img/room.png b/public/img/room.png
new file mode 100644
index 0000000000000000000000000000000000000000..644b4351a1fff5622d7b95f49cfdbcc678c8b3e3
GIT binary patch
literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$y-7qtR5(w?lR;|}VGxF&`L;a@&9;9)?OO37y(xG||9}^f-U0;`vO!N$X)DAW
z6h%SAX46s+;z6W;!9y#E_!p8D#G4@9^ekqld`rJ&6E`XK;&&Q$-g#ztXI41j`B8iY
z6_YgPzf6+Kq@>^J-9Y6fU=*|356{0JrymQN-R#{{Bd<{X4B{bN71%fkgC}LMQqXJ^
zKUH{u>Ra>s&wA=jdra{HSVq`M>cO2+*bwN<c6V-iU?SkAh&()~&p$2}_)+gU$bFQL
z9#genjk7;pJ_pTgbuXLLdk1<^(UpF9q0|q*^X)e1Cdv<>mW07q3(G)rQG8utSB38=
zD=s<C*h;&5O+?-R=Tx-TuP=O%O1rlzBF_}|ZDBtQmi%`2k%J_Sg)AQZR*B-h<4LNj
ztckxBUt+*56&4-HiUg`?+8P3hY1)RiSq{?l6Q0@4J#vX5k+7fCgH|?CCvK`zEjDv;
z?vV|Opp&k>OkX;Y70$eltK!itLUlmv@NSTKIofz4$aw6zC0NhW0Zac3vc+}+3;jPJ
z>x1*fO;MaE|0Rz7vs?aaYuW9b;<=j|0@*E{f{{y|`A0(o@w@pu4j%vj002ovPDHLk
FV1id@>5%{c

literal 0
HcmV?d00001