From 2a62ba8b8799fe6ed9672ed08d8f9914b822a071 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 10 Apr 2024 16:18:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/headerImg/icon1.png | Bin 0 -> 892 bytes src/assets/images/headerImg/icon2.png | Bin 0 -> 689 bytes src/assets/images/headerImg/icon3.png | Bin 0 -> 1429 bytes src/assets/images/headerImg/icon4.png | Bin 0 -> 1835 bytes src/assets/images/headerImg/icon5-active.png | Bin 0 -> 445 bytes src/assets/images/headerImg/icon5.png | Bin 0 -> 456 bytes src/assets/images/headerImg/icon6-active.png | Bin 0 -> 799 bytes src/assets/images/headerImg/icon6.png | Bin 0 -> 821 bytes src/components/centerChange.vue | 8 +- src/components/header.vue | 2 +- src/components/userChange.vue | 119 ++++-- src/views/companyAdmin/companyDiagram.vue | 3 + src/views/home/login_v2.vue | 8 +- .../componentsModule/dataFormData.vue | 4 +- src/views/userCenter/userCenter/index.vue | 11 - src/views/workSpace/index.vue | 351 ++++++++++-------- 16 files changed, 315 insertions(+), 191 deletions(-) create mode 100644 src/assets/images/headerImg/icon1.png create mode 100644 src/assets/images/headerImg/icon2.png create mode 100644 src/assets/images/headerImg/icon3.png create mode 100644 src/assets/images/headerImg/icon4.png create mode 100644 src/assets/images/headerImg/icon5-active.png create mode 100644 src/assets/images/headerImg/icon5.png create mode 100644 src/assets/images/headerImg/icon6-active.png create mode 100644 src/assets/images/headerImg/icon6.png diff --git a/src/assets/images/headerImg/icon1.png b/src/assets/images/headerImg/icon1.png new file mode 100644 index 0000000000000000000000000000000000000000..c148dc8c769eb89c16de555ce4ebfe8a66e8e0a7 GIT binary patch literal 892 zcmV-?1B3jDP)!r1a|nLs!B_J>JtB;!Qd8!SzOt zf))QP>2jVqdcIRg%sJ8Zz7Z_P)}xOhVOG+3UML{WVa9xBS+HFCKrK1Uo+%*n)O@S_ zpHuS$lr)l?88beZ!|YO^@+6twWi|1UC8pC41p;m&LQM=|oYB2v z;%^hYY3m-{58lj&GwWLG1On~Tea#sk3r({po+up2nd>h;oJoxTzbG7ESiZ8z3gFm! zhlen$Hoa4t5U7bj#!#-u(PB={Zk5@YTV-~}1Zu^a>zQRi6M|DFE9eiY}JQO=Jk?>I+=46WMQ@2QA&vTrryz2snmN zPdl>eWNw^H2k7g|Ep`Z-)2uCfadjcJy308q>2XF#C;(_?wV8P_LUZ?{&^>0$qosId zl#%OuOGiu|X>p`!qvfV9a;seRHPoiZn3r+WQO8Bs%~G-L8K=%>l41bO)b@c!02KkY z&b4b{X@#UkoLae~73Fx){s2xN^O+o+9q|R)H|{E@GTqvXmNKiJ2q`e}l8LMeZs0Z^ z&mpt!B;UcEb12r8DKLzKE*HDlnLJH~dj5!1uPtKZa;Zh$p2^0Ad~b6kNB#mWZ6r?G Scsk+$0000DVIUs-mt_1 z5*D`%$}lYv=__IRC36OzFo_$V3~HdW?Yt=CMZ_djz{`=$IS6A8GX*kOnXQi=kuEbx z=FW#m0`kN@L_R>C(1*wi$g}YwQeW)#gNn+PxQMP=Hy|r>uXC)tj3YXc0vVZwiS2J> z7m)dqIDj%mW8%t;JVhg+T*0}^_!KI@{xYg8@Tp9!$|VYcX{wuIe-t#NgG^=Y;^IRD zc{y8RS(i)(M$h6hDIYtD2dq-AaRBVE=(J)$OXPSIvLn7W<7`DZ0ig6Ffy8=m$2?MBWw6 zS1im&Y!aHe?Xf@4Sbh7(1bJlMvE=RwyRP(vxlr3idq-7Cm>hPdxa=rI-+9EJJ)!vo X-oc=L7F4(R00000NkvXXu0mjf4qheq literal 0 HcmV?d00001 diff --git a/src/assets/images/headerImg/icon3.png b/src/assets/images/headerImg/icon3.png new file mode 100644 index 0000000000000000000000000000000000000000..e09f5321e36aa3d4e76379cc799a53e482fd489c GIT binary patch literal 1429 zcmV;G1#0?&Z)hdba3yr6JK~F*k2j?4>~Fky&t@}LFE z9HdpGqfwO1TU2$hs8m9`K2}78^Pp%B5Npa6m;9Vs2TMu~wCh6!BQb}H<`L2KFazt~ zCF#Rg`AA%8dg@ECpc94GJ<2P%9#8_T6T%IQ4;I?j@~rs-uOZ5Lx za8U`h?7OsT@~MvteBDCwv+TO(3%jDya?~Z2gH0GvV}XuAVMY+lbDxz>qresJ(N!gA z)qq0O-yb8Gb|YD7=AtDSP$PwQcf~nLbiMI zmo+GoC^=2w&<1SfVG&M1BZY1i)J6T;1{K6(8K7cLl7M^z&MAqX`QG56I*3LF-36sC z=)UR{AC+Z9pX3|jUFCw+Tzr(QLW=;(PROoHoOAbs@_5$9#jd^38RO8o;*9X=GJl)5 zUx)&5H?RFxnb4pqvNz3i=tlJBX-ZXR)8VLF*P>|w=&bNVs>s^N?NRtMF_5yLU zbFde-2lH(gRNo}!3_h8#t)ap@%F%@wv{%N&0^mgh%*KlbSZ_LX0a7AsMwWDIj`Qi{ zqJgpy-uvY?#jI3tEk43NcgRjoRw^d~sdU&mZElL^*^naHo}7?zaDm_Pw&72qqn6{< zPzJ+WA%h`Y>49u>wqH{e@>ZbZHSnH`Q;a9LzUBHfOA4nsms7J44ZZlcB|G8Gy(vOC z<0_u0D0~HpX1KMiyBE!AwF)Vc9rtb}-CHZ&_C0F%ro>NbWYfL(z-Ut!4zzo7hi`_w zTpXsJH451=GD)il>P_WJ2IiF2;fGX4x}B6IxhJKjQyur#Vsk6!NKErv@?EtIDUlWE zz4XL$ZhVHJ%S`<|DJpkMyqwNl$QHED$6TZSIN64nUI!n?u4TIBpkUFxdCpzq&aE>c zPf77l(}?gFPsTPCVm(dlR-l_6ErAD#GA{MJFgT=1_VP3xOitRp%|Ag=99Ma_A6YUo zSrMUn4*~W{yS*h|iX7l*bAoESP#xowyP>3s;Hng-f) z^8dmlNI!)rPTe=qH{Zvaj&;bg7&wUJ_P3XDr)y+X+JG#JL;LU6FL(9Z4z#`lfe%}d zMR707Fx>dD`jUy}o|JX#qvBT9z;$MlQMmEVhmUo9>p-5?;H8~AYe6Wxj-I;O$06GH jJvGDK+V4Lnfwlez2sA3V_L^dS00000NkvXXu0mjfH+rQB literal 0 HcmV?d00001 diff --git a/src/assets/images/headerImg/icon4.png b/src/assets/images/headerImg/icon4.png new file mode 100644 index 0000000000000000000000000000000000000000..b158f4b9cfab89410ec0967c45acc9035a4333dd GIT binary patch literal 1835 zcmV+`2h{k9P)%8*!hE`Xgy=t?nx#2BT~9k5{6HrAD3B5Y`h zkeFciwsoaRi&0UaT3jfd(wTWb_jt}LEz@ad-kUdX8Zz^x&HTJG_ucQF|9c-m2Lh7_ zy*&Jrv+MpY?e20lJm%OByH|#X(bSWvNqYbAy)Jjx6Wu`OX$DS8Il0FDidlOJ>~R(`jE^m}7u-zpSdRHPheBUoe=^V9Bc zmoH-|pH=0>b|fqaFvzdGUV35e^E&B)^UKe+BjGiKVc7N7xuwWuBl8xs{&VTUOVH+^ zkiwm_U2~D9fB$b~H*^3{qyFc$!c!4x$5uJ$1Q0;Z54$4LV(-uiU}rYA&MD|HV1T;w zNGsG9Y%`ElHwLELBJ7F2P+0IaED)LkY!g~eT1eU@7*J&T5wMrP>Zz)UAS&!p%^RS3 zQfk_FXsVTq&@$4>haNk?AvAOV5xc92ZURBCl0^w=K&?Q56i)dzjTj3SAnUn7#t_ZA zMRm&c)pbQUuu8bWF%Y`tx2~tIyG0y=jFBm6(XLyBON!tyWCSLEJh!5*sQ`K)BVQzirsRxsh`U~(-`$!|5OUS(j216@s0 zYs5V;gU$MR)0&O~R;bU%5jF@HOL_B-mp2z}pRJ;(4$HsR8a$UKJ(~szXr|s6S!uj! zO*=koIL4$6(r7tPBaubO0#(X;Tn__Gc@CWMY&_uvFpeC_YmK!^96u{rGzcltl%{hf zbv%wR*Z2!Ucr}G>y+8=+fN0RNfIQ2bfEchF^f_fc04b50w2OkB|bXNlW38M9yfK(Shns64g1F9pV=SO z)TEKHFNs`0s-O)e(+FFF3auVi`(KIVLplH{kcu=1lDP4z6=`Ku;uW?+(`$(RlqiP2gpIgEq>8PMVAW_4lw`GrvgV++^X(F&;h6&=Pf1bN<(F7?NfoKU@ zi`Huz;Ri2|9~v;rY`&agxYyFaKydnBDp1=5j5 zoQ@OWwZB`o&1u%$9`@&PiQ;j;;mI79#S!AZj&D4o`zV};29b(1AM(cD$Y>npx_e=j zaPkx+iz6Bj9lZI_$LoQ3apRhkO-MyLu+3Dx>(WkoZaC?bd1Ele_7P9&5L?Leo`$bu zh23o;9oPP`hNgr$`|1%$2ed=QZKf&IZ8H%jycGN6sZ$mcuW5SBcUlE}lF>lrRt+vv z_D4f0HCO9495cos1yYmt9Ga=A1w{pmC^cchdeMRA=GFo*k#>Wysp6!Tw%M%tqyn2F zExol9s(oajzxt9CJ888nXsS37ZRZS*RM*QG!l?`%JVWilH(NaQMPMNx_fYC>;HJya zsCxpq0owyIino$o6Cc&LA`X3(7#c7{Kc{ha*2>7JqYAX)pMGY+j=|*gCW`n6Mw}v3ySo)+TW4{pu*fqoRxTYkEf5vt}X9PTXr@k=FP Z!T)I9&3?_2a;N|R002ovPDHLkV1mcMVj=(l literal 0 HcmV?d00001 diff --git a/src/assets/images/headerImg/icon5-active.png b/src/assets/images/headerImg/icon5-active.png new file mode 100644 index 0000000000000000000000000000000000000000..f83fc7562dd0a0ac83eba6b88e8280587518c815 GIT binary patch literal 445 zcmV;u0Yd(XP)sfWffLxFOGU*gB9utbQGmon($LW0@UatwcbFK3 z!i+z`2#F+5@@lp7W}c;aJBv^Nj`!psnrAsQzw0jTW)Vy%1Xbt7hLTY5hggXH3JMxT z`$Vb_GY`jm-alvsH!vm2^vs4SF}rTWv_OG*X!F-k3-X*?Po8C1U)71g2Z&C-g~-@J z1uju^Eaf3$SE`tI&-|XZa+^G4H}Yzv#6p|@Ml3d$vr%)u#yyjOJigM+krqpJV_6)z z4BmE@~6<6M1X2o z<24pzp-qW`@IILABg0%pO=7LZOa1@EVuNU+k-{I`f=LP`jxa;)tx>&PzJIhNLZ{vM na+(>0=a7S8t#Zw^?xffU{C8x9DXXH-00000NkvXXu0mjfDkQyE literal 0 HcmV?d00001 diff --git a/src/assets/images/headerImg/icon5.png b/src/assets/images/headerImg/icon5.png new file mode 100644 index 0000000000000000000000000000000000000000..80fe7531f4091983793c7f666ee25f21992b267c GIT binary patch literal 456 zcmV;(0XP1MP)0MsY+2MsDGqy{1$08iiv{2(M193qtxe!vgPkz3Ux2k12Qc8?D4OcWa$00lXM!O%$JmRgNs2)~F{ z?C*&+a$}Z)XWP&-axz%JPrwi7jz66bVM~1JHzEiJfrhXp{;xq;T_Fr-Cvrsf^rvtn z*EI-w(3UN+(9OwOH!{Ryp>_ew&6*I-x#QR!7E|SxU z^Q2$RVbOf7$YLJWNLNz>Q?>x%w-q;ITH@0G*pm3vw yv96f$Bq?J`XeAw~<-uF}T!si~L{_Jx>-7#YFLuS)E@>YC0000QLNCD5H?wf&#Opri8W=!HytAR z8uP(-J=g%Q9+i1Nld2=4@mcyDE+M)jGPfLyCS-uCA6>+~j#8@m<4d6%udDP%OGMqQ zL;_#G_gO|&LSS7S$xd#nUyfQ5@av0W4PF6mYuH2uoLtX`9K*rHGI1Ykqm99H*b=V( zQ(3g`d&M?C0)Twzr3o3rzUFND?(0GTTY}@$vR;`7CyK{%8(|40P8=Bn9%O`gWf5VN zkz6`CCnpP$8-lb|^~>Q6r+*37qmm$m>x;sS(qzmn8{=Bb2pz7C{=Bvu5ea(nPdbgQ zw*=4xQt&zZ0cB&%@3e%QR5U?sNhB)+$bh(&i4lpe|I%hc zH`%3U2@8iATUmzy^}H6`rP<`4cGlP((!Run@%PMqCS4klGgIZi!j3q;8l7;`okk&; zCleU+e8%o{q%X>~0~ugv7t^*0H+B8efrn$)4rdAWx8Isx?W+*aE?_ganvOB9KKyjb zgyFRj2ARh9=@~JaC3)tMOeRON8lc!-G=;658?C@cF3LSuIycw?59~h_CQ>-+A^1Rr d?jn*H{{VM)XJN8Wu*m=b002ovPDHLkV1nTu=3UA=7Y8i>fdt);01}(Ll4lIHLL{*O76kV# z>~qqro%&SL{NSN4wOan3)$2xsGz(zFe1WX4=^e(bzFIatt^-6#uE~%q*-dLEldMnl z2YdUaII$N*Rm;-ORy55WRKEhJNxG)qet0iQjBRBEVEfw zD?|wH?pyQ@!?q2IHM4E1K>Cs?7z&se!_DPIMsr1FJyOQtJi%?0`!O12QqMe(1cY)$ zxr>XMb*~Er$kkg2lfKfoZP!Yz6`z9JQLc?M9n-@`?QEs7{V?iEhT^EKlx02qSJwU~ zh-6@(B5O=COo>EH$5he)bOGOe335U8msNUSD`q8N3)F{7w~H#hHxSeWkC*eUUjWO{ zJ*a=Q4`7y21P=JvrJMsRO)X3U>pb*D6y8OpX)ixu$p~~GHtT2I;+WbL9V0pbJFHB% zR{P;^17Yb&{7$f@-Dr4&R`dC(yoBazZ>Ql2c)N6PGSE55>{nQHvJB500000NkvXXu0mjf8
@@ -20,7 +21,8 @@
- + + 工作台
@@ -85,6 +87,10 @@ export default { .click-content{ cursor: pointer; .flexStyle(); + img{ + width: 20px; + height: 20px; + } >span{ margin: 0px 10px; } diff --git a/src/components/header.vue b/src/components/header.vue index 26f3ae80..3bbc3356 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -618,7 +618,7 @@ p { /deep/.header-btn { display: inline-flex; align-items: center; - margin: 0px 0px 0 30px; + // margin: 0px 0px 0 30px; font-size: 14px; cursor: pointer; min-width: 100px; diff --git a/src/components/userChange.vue b/src/components/userChange.vue index 162091e0..80d9a3bb 100644 --- a/src/components/userChange.vue +++ b/src/components/userChange.vue @@ -3,14 +3,34 @@
- {{ isUserList ? "切换用户" : "用户组织" }} - {{ isUserList ? "切换用户" : "所选组织架构" }} + + + + +
- + + {{ item.companyName }}
+
+ + + {{ $store.state.userInfo.account }} +
个人租户
+ +
@@ -60,8 +88,18 @@
- - {{$store.state.currentProDetail.name}} + + + {{ $store.state.currentProDetail.name }} + {{ + $store.state.userInfo.account + }}
@@ -80,7 +118,7 @@ export default { }, groupListData: [], selectedGroupData: [], - selectedProjectSn: "" + selectedProjectSn: "", }; }, created() { @@ -90,13 +128,15 @@ export default { methods: { // 选中组织中的项目级 selectProject(obj) { - if(!obj.list) return; + console.log(obj, "111222333"); + if (!obj || !obj.list) return; if (obj.list && obj.list.length > 0) { obj.list.map((item) => { this.selectProject(item); }); } else { - if(!this.selectedProjectSn){ // 加判断是为了在循环中只选中第一个 + if (!this.selectedProjectSn) { + // 加判断是为了在循环中只选中第一个 this.selectedProjectSn = obj.sn; // 修改全局projectSn this.$store.commit("setProjectSn", obj.sn); @@ -106,7 +146,13 @@ export default { }, // 选中组织 selectGroup(item) { - this.selectedGroupData = [item]; + if (item) { + this.selectedGroupData = [item]; + } else { + this.selectedGroupData = []; + this.$store.commit("setProjectSn", ""); + this.$store.commit("setProDetail", null); + } this.isUserList = false; this.$nextTick(() => { this.selectProject(item); @@ -115,24 +161,26 @@ export default { // 获取组织树数据 getGroupTreeData() { this.groupListData = this.$store.state.groupTreeList; - if(!this.groupListData) return; + if (!this.groupListData) return; this.isUserList = false; - let findItem = this.groupListData.find( - (item) => item.sn == this.$store.state.selectedGroupSn - ); - this.selectedGroupData = [findItem]; - this.$nextTick(() => { - this.selectProject(findItem); + let findItem = this.groupListData.find((item) => { + return item.sn == this.$store.state.selectedGroupSn; }); + if (findItem) { + this.selectedGroupData = [findItem]; + this.$nextTick(() => { + this.selectProject(findItem); + }); + } }, // 树形控件点击 treeClick(data) { console.log(data); - if(data.projectSn){ + if (data.projectSn) { this.selectedProjectSn = data.projectSn; // 修改全局projectSn this.$store.commit("setProjectSn", data.projectSn); - this.$store.commit("setProDetail", data); + this.$store.commit("setProDetail", data); // 收起popover this.visible = false; } @@ -165,6 +213,12 @@ export default { color: #000000; margin-right: auto; } + img { + width: 15px; + height: 15px; + cursor: pointer; + margin-left: 5px; + } } .content-list { margin-top: 15px; @@ -174,15 +228,27 @@ export default { border: 1px solid #dadbdb; border-radius: 5px; cursor: pointer; + img { + width: 30px; + height: 30px; + } + // >div{ + // border: 1px solid #7299F8; + // border-radius: 5px; + // background-color: #E3F6FF; + // padding: 5px 15px; + // color: #5A88F7; + // } > span:nth-child(2) { margin: 2px 10px 0px 10px; } - > span:nth-child(3) { + > div { padding: 3px 10px; color: #79acfa; background-color: #e4f5ff; border: 1px solid #99c3fb; border-radius: 5px; + margin-top: 2px; font-size: 10px; } /deep/.el-icon-arrow-right { @@ -208,9 +274,13 @@ export default { .click-content { cursor: pointer; .flexStyle(); + img { + width: 20px; + height: 20px; + } > span { display: inline-block; - width: 77px; + max-width: 77px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -219,7 +289,8 @@ export default { } diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 995b3391..e92bad44 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -3094,6 +3094,9 @@ export default { relativeGroupFn(item) { this.selectRowObj = item; this.relativeGroupDialog = true; + this.$nextTick(() => { + this.$refs.relativeTree.setCheckedKeys([]); + }) }, transformGroup(){ let item = this.selectRowObj; diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index df21f90c..237c84b8 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -487,7 +487,7 @@ export default { pw: [ { required: true, - message: "请输入正确的密码格式", + message: "密码至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, @@ -930,7 +930,11 @@ export default { headquartersSn: this.headquartersSnData, accountType: this.registerType, }).then((res) => { - this.$message.success("注册成功"); + if(this.registerType == 1){ + this.$message.success("注册成功，等待审核"); + } else { + this.$message.success("注册成功"); + } this.goLogin(); }); } else { diff --git a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue index a754b452..f0247c1c 100644 --- a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue +++ b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue @@ -72,7 +72,7 @@ export default { newPassword: [ { required: true, - message: "请输入正确的密码格式", + message: "必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, @@ -80,7 +80,7 @@ export default { confirmParssword: [ { required: true, - message: "请输入正确的密码格式", + message: "必须包含至少一个字母、一个数字、一个特殊字符以及长度至少为8位数", trigger: "blur", pattern: /(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[^0-9a-zA-Z]).{8,30}/, }, diff --git a/src/views/userCenter/userCenter/index.vue b/src/views/userCenter/userCenter/index.vue index cfed0aaf..8763d0f0 100644 --- a/src/views/userCenter/userCenter/index.vue +++ b/src/views/userCenter/userCenter/index.vue @@ -1,7 +1,6 @@ - - - \ No newline at end of file +} +/deep/.el-dialog { + width: 25%; + .el-dialog__body { + padding-top: 10px; + padding-bottom: 15px; + } +} +