From 6df822afbd39e7b5ee63ec29aaf1c306d12125b9 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Thu, 29 Jun 2023 14:23:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=20=20=20=20=20-?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20=E4=B8=8D=E8=87=AA=E5=8A=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=8F=82=E6=95=B0=EF=BC=8CautoJump=20=3D=3D=3D=201?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E4=B8=8D=E8=B7=B3=E8=BD=AC=20=20=20=20=20-?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20=E8=BF=9B=E5=BA=A6=E6=9D=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=95=B0=E5=80=BC=E6=98=BE=E7=A4=BA=20-=20=E5=BF=83?= =?UTF-8?q?=E7=90=86=E7=9B=91=E6=B5=8B=E9=A6=96=E9=A1=B5=20=20=20=20=20-?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20=E6=8A=91=E9=83=81=EF=BC=8C=E5=8E=8B?= =?UTF-8?q?=E5=8A=9B=E5=92=8C=E7=96=B2=E5=8A=B3=E5=BF=83=E6=83=85=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 心理监测详情 - 修改 图表拐点圆大小 --- README.md | 17 +++++++++++++++-- src/assets/img/psychological/depression_1.png | Bin 0 -> 1054 bytes src/assets/img/psychological/depression_2.png | Bin 0 -> 607 bytes src/assets/img/psychological/depression_3.png | Bin 0 -> 1021 bytes src/assets/img/psychological/depression_4.png | Bin 0 -> 1003 bytes src/assets/img/psychological/stress_1.png | Bin 0 -> 1110 bytes src/assets/img/psychological/stress_2.png | Bin 0 -> 1059 bytes src/assets/img/psychological/stress_3.png | Bin 0 -> 1107 bytes src/assets/img/psychological/stress_4.png | Bin 0 -> 1018 bytes src/assets/img/psychological/tiredness_1.png | Bin 0 -> 1054 bytes src/assets/img/psychological/tiredness_2.png | Bin 0 -> 960 bytes src/assets/img/psychological/tiredness_3.png | Bin 0 -> 1147 bytes src/assets/img/psychological/tiredness_4.png | Bin 0 -> 1174 bytes src/config/models.js | 2 +- src/views/health/psychological-main/index.vue | 18 +++++++++++------- src/views/health/psychological/index.vue | 4 ++-- src/views/psychological-modeling/index.vue | 16 ++++++++++++---- 17 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 src/assets/img/psychological/depression_1.png create mode 100644 src/assets/img/psychological/depression_2.png create mode 100644 src/assets/img/psychological/depression_3.png create mode 100644 src/assets/img/psychological/depression_4.png create mode 100644 src/assets/img/psychological/stress_1.png create mode 100644 src/assets/img/psychological/stress_2.png create mode 100644 src/assets/img/psychological/stress_3.png create mode 100644 src/assets/img/psychological/stress_4.png create mode 100644 src/assets/img/psychological/tiredness_1.png create mode 100644 src/assets/img/psychological/tiredness_2.png create mode 100644 src/assets/img/psychological/tiredness_3.png create mode 100644 src/assets/img/psychological/tiredness_4.png diff --git a/README.md b/README.md index 003d615..bbcf832 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -569,4 +569,17 @@ update `2023.6.28` fix - 心理监测首页 - - 修复 是否显示返回文字判断错误的问题 \ No newline at end of file + - 修复 是否显示返回文字判断错误的问题 + + +## v1.0.72 +`2023.6.29` +update +- 心理建模进度查询 + - 增加 不自动跳转参数，autoJump === 1，则不跳转 + - 增加 进度条详情数值显示 +- 心理监测首页 + - 增加 抑郁，压力和疲劳心情图标 + +- 心理监测详情 + - 修改 图表拐点圆大小 \ No newline at end of file diff --git a/src/assets/img/psychological/depression_1.png b/src/assets/img/psychological/depression_1.png new file mode 100644 index 0000000000000000000000000000000000000000..d056fe84d1a3cd8d6926559a52a82063a58d28e2 GIT binary patch literal 1054 zcmV+(1mXLMP)Px&*hxe|R7gvmRZD1`RTTctz5oBuWICNBm5AapD1!7gO=_h`OIr}J;wFo#n|4u9 zS{EgqN9<?|kPwggz^ED-{;y(x_$1Q(zn?qDKIZ090b;pFo%c{EupZ$V%$5RJj)n z_1a7?O-=|yoC^f4qs$E7RbZvS41fS31f(fIM5tAr1@_hKtK+ZT*o?IW+|I|Y648q! z$YiC_?!8D5Sg}jYAH)yj&UBvc0?!s=Ur5V5;W^&FVQz^VmI2Rk=MvG}iDs|`t}`|R z=IQMKH^KA+Zryz^x$%Prc%~4a0OLatjQ^eT<_io@5}v;p&E6obia@>cnG|%Si(^8g zV7j2_MSY*Ru7R(3p&kgGBzyV7?!b=FO{eO%a7Kj zNLP!Cmv;;uJZ}We*Eip<->vMS%=huM88D{YTDyp$!65$nb9FFv=*^OyPdr87PeBNF zFi?fSGl_lK`P8?sMD80IE>?=QR@e+`?!7By=VOb~kmJf%tzak;M7iSZn%ZNp+J(ud z3Gx%54bF@jlX`Y4I`id~o5|sD$huQ0wZVlH@O@sQOd-Ao!eA$_!EgZ8iu2^KxB6XC z?mENl&jMt2WbT0R(h!fnziRya_&~_|rdF=E!&)YcB4r9OrAyZ(ej+I5G7-LJ#y9~Z zJyi4uGnR;On23fNh3{T|&&&-=!gai_h;djL!c>0mPSxCcHMb-!BjP!J3wlFkYh)K< zi&C~Z7lwfH)IuVfJ!&r}c9Y=G0X(2RrA6I_3>B+ba(`~d&L_@V1M;1wDB7HFQp<){ z{NgF&iA!VY-_y&Jk4hmX3E0b^AutOP_*E%!J$WGWu1+_bkL6^*xY*2I|H!Gic2Aw_ zmzAe}^dw%sv@bia0n&x35erVpt(!z9uO`Pb#f|QMn}D<2(FeLu8anUWq3aAP5MA>f z5t}-gzN0s$r>E(`lfTI|vGX~Cc!NO?b%~*~Lv>)L5TEe-c#Ae8Aqh^^{ehWR1kwEr zJ`@ZG&3eVrcH6BHhDXdV#K&?UwI`+_$VurxUVDb8C1){*uMU8h1* zqvhJ1p-$CV0Mu+E`X6R!^VPR*rNV#LOQV21C4l1$dKf?$K$*a|71pQ!&Ol`4T%YOx Y4;YK&<1j$9bpQYW07*qoM6N<$f?&G?-~a#s literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/depression_2.png b/src/assets/img/psychological/depression_2.png new file mode 100644 index 0000000000000000000000000000000000000000..854cc3451b55683161ff0f02b4b7a6b2209f3663 GIT binary patch literal 607 zcmV-l0-*hgP)Px%8A(JzR7gv;mCa8RQ540`y`3T?HGV9JYfA&Yzoi_5Z z5Ri7*NQ1GT~lW2kNCwYFN`ZgSrFy?gJwbDyBcVvsux=qiZ`Kr#T+ z5UGQ#iQp4PYjZO7=0`V#*o33?T-FiYf>mvIkU)cGa^!C5eJ3knH|6|mh&<|*kyRrX zbf);YRcnKrApa4Rs{@0N4T2q=_M84D+*G_p01y5d{KvSYuKzIljNyFy&Y?5MA1!y1Kpy*JelQoIUI`8;a-5yefu4;hB=pyXxga zUWI<*@bLSXn2NUvU@9R_`znGsW?N=aWN}FeVc;1{Nvp!3@Rj8G6M!Fx2?|Fb)5)~V zWw}?{#HP`-Pjb_W^=yt^4CY^u%Y&@96VOfXw$BZTEd#R<{^W*Y}Vx0E7T)06xoD?S8M<{}+}>^#Puryv+ar002ovPDHLkV1mr5Bb)#L literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/depression_3.png b/src/assets/img/psychological/depression_3.png new file mode 100644 index 0000000000000000000000000000000000000000..48e3857c3a05782cee45793dc5af6668bc09800f GIT binary patch literal 1021 zcmVPx&w@E}nR7gvmRZVDIRTTctz3*oxshJw>!d*eyg-{VPZ>kGvX)B^pQRu>-O}Yu9 zbx|^@Ex0IMw53TJ#OSsy_y;Ya3lT&^4I&{k(~Z@IEd@71D;SeB>AW}Z-h1S}WF~KB zUi`_0$MEL7``vTD^L^(KHd*}6{%xzdrN^aoUI%bc0K1u~kBFBIa0|eU*6PdNuyBVy z`F;@?)dF)Hr(6h`u)iY7M+KJT#ULOrE66h^S zVg&-}6Kk@VMX;PrCwZO)a4B4z#!vn%dPfl%w2{8;r+GuQ&R8Rr~1 zv=!hcnC}RLN?*#a-yi{xMv8}7h%W#*|2yUG4T_9;!=I>KC98_CXZ0&bh<#~}?Wsfr z=Cwj*6)P)lYoLso%{}OSiB^sc?CH(BKSl8d&%P@VDRs=R)TSE6;4~8*w<1X$po#d5 zSE-(kO2wnT<4kt$U#-VaQgl2x<4Jik&9$F%u&}5Lk9;)0yfRXH-VwM4AeSms-4G4t z&(B}~^S!-&{oCbI6sp$Qmiva*XQ^HeDy|fPG8>n-;7jrS{_W>({uRDod;vyGr@;Y) zV179_Uj1(I#GZ!>?n4V{a7PegW2zL528#d{(!BbBVUMDYph$7tzuSt-XC@hx@C^6nf(7rJim@o(C5)x4V(cJ7OrRgVUNK3h<`$Mm1|D@uUh*Uj#_Ni+ zK1p=m=};SJsQ5Mi{Echj$#A6NJ-2m)&vEko{%w@ykMMqFzdp-bVw0^Va!i_5}2}YyAMNi71 zNE>zqk&uK~87quUm(9{D$$~1w>`OrnWiI>Um7%66TAS literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/depression_4.png b/src/assets/img/psychological/depression_4.png new file mode 100644 index 0000000000000000000000000000000000000000..d2d4938b581bb044ac0cd79c815bfee4be0ce3d2 GIT binary patch literal 1003 zcmVPx&rAb6VR7gvmRZVOZWf*>*Z)Wy)w$<9k?&yJp$iW0J1`*3hgBYV#qX`FpF7!f7 zp9khJ!IN+F-LS4RC{aP-Ef&mV&x&yED7n?acR@Z@arpmqnoO zX?JG6=Y78SectCK?h!IM=2q+6>7?v;KzRw^E!67zD#X z4{I-sAEx4md0S0t0X9Ss3m^c@0gHe`LJN{J>fn<$MRuYg-BL_8W(0kK^ zNOQrpTdy@DlFZ&@Xy|np^;o} zHH>sGcUBQitxqzTC|w)$^4@#L$b^js1gKof#D+{N-w)!oC7 z4v!WpNpRbgM&t^E7riP4!%6YwErlkupQ#lu)wAVkA!h(MiL$gH_#odXe%UPC+?#AkT812{-cZRSALFu!bbYt6gh(k`9+3d$Eu={a})_N~U`_>QQ>H>o%c z;%Ne@e%8I34^m5Jv)k8{@MLbWY=&!Kg#P#xM17jJ_Pmc64ss zZbS6lBx-SJo!IQ5EB~Lr$4enaEp2Xms8` zp=N-BSl%8gmCrZ#kM4>j^#c`lB(L77>59bh%kITnztr{@-*Rm=X9j7@g!X%jVIFDB zY06nbK2K2y{c1Vi7OO{umkibK*N&=kS{ znWR}3MoFDzB56ggYdPbV%164Q=n)EhZ$7Pfa67hZ?6w)pg~DR_;9Y*+eGvHGEVi+U z0DRqLd{1!m!t78e9&>GV;C?$ajP!y~W(uVT*rDC5Mnz$rJJH+z>M20GfC>Qp`-5!% Z{{S;&%1<_Zt^EK1002ovPDHLkV1oO}?7RQ~ literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/stress_1.png b/src/assets/img/psychological/stress_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ce423f432db36f986f7a99fa4986712afd15893d GIT binary patch literal 1110 zcmV-c1gZOpP)Px(5J^NqR7gv;Ra1S%aWB=bnsN(=g-iGsG)f>8UVgi;YTuSr`eLQ93(4-pj7WHK}Nb++6|ljboa zLGXOuyU*JDtiATygeE6@H5(J<`F2B>yfkltg;MG}qs8i~m1|>}WZ|`Z$^K9?d?}LO|1&7@HYj+KNPMIjTGVsAu}o)ie|Vt|o-d`l!8iqi7V^m8Kf$;J4xdZ+ zhrBmC3|u4NJ|fyuk7M|f@Zwv^!dVJcVLFxbQqXQz%|V)?ulqrQ5GcOrn9*k_H{HL@ zY>8fJ^z;?(1l5(H{GbXVQ))s4zG|A!i0E(@E88hQn;z0lZP2Uv4TD2&12?$E#KU0m zn?w+0lFv(BywXfbx}}AE8>ZY$YEo))rwTS!5XnnAxM68|B|nH~Att1HUSrk}QA=C`#4 z=bW7^JeQlc<3#)e2#=?RP)$S_O%i zP!tQG;>7#_3#tf(&npWpH{)C8Vvf?DAfn?!%B|}fs=zqMKo=2C)^%>Rwp^)|op~a1 z8L+^xgd|OBqV9xYb5)>j68J9$SV3Z3cv3f$R5LXAuKTH-9O+we#pR2+Qfgc`^gaJ2K?v-5 z-i1t}xMzc(uOygBjS|tzBuL+kOWv90(D1*olZAT4O~Jz-`Kf_!Nb#l-F?QeGp&X8M z-5o=~yF1jq2&fZw^4Qt+)HPhtVbIB|+1P?J-ww!L0qkYaLjYm`$^^cyu(bVK&9)l{ cn{5Ao0L>rc=5c=@`Tzg`07*qoM6N<$g51s(0{{R3 literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/stress_2.png b/src/assets/img/psychological/stress_2.png new file mode 100644 index 0000000000000000000000000000000000000000..70c61569baa3aeb9c022a743baca6223132cd356 GIT binary patch literal 1059 zcmV+;1l;?HP)Px&-AP12R7gvuRa&}xdA3BjT@gv_M2HXt;gEsFiKpwQNk%;Vm(^gzgbJ?R4h%Ex)`1+?FzDnDly7_Rp~+-(gFc_l;{_SD-Zk7?xge2gaIOO6*GMzzXIS!n=uFQ)y0l)iy9m>=)U*{n%yDI*6Nk$5`fJl zTNRQ5_>>-Jx^Rl2D&*A0=&)-sI~qc=znjiN`y!f(y#t83AFCEJ+;~NA15GmU9%W@R zvpv@2&ZxYSxR5MZ?Pq8H*iwM0+=r50qHCy7K@AoY4ytqh-BdCAE)vcGRqCihoMFXH zbNBG|sC?&pZw;#EA&1Pt<5P`(5t5B^FhpC-UZBhS>nS1vlwL8Z!eJ6ijOy|uaeFm> z&=?-5t0aezuW8y+_8N(n1uj;uo27Y~o%zEze$2IPO8EN%tDj=&u?sqz-6CNe!tE=x z9l0zr-1QJVEFME?MXsv^SSGu9N;#$r->Z~;3vG#a@K+g3<*A7sF5K4h0`6PVb(nFW zUjS?am|Vy_=Cq(1jKSbLS-eKWJ8lNBg!-5&jA*KNH#Wt8z~9wTrVAOJ+0&v#Z3@6$ zk$e*l?7V--xUu(aP#GZ1n<4l#pw0C303RH^s>$rba&Q`gVfYhYCvaQ&Ic_~&S^j;M zGLH#737{zgPr9&W|3#-Wf7CB#_8anPs+1W5H~_GVsga91n|oH$Cn0$BD0HH4hYWEH z)oWLP*5-gp8G|EqP5UZBErC%h^nm(kLFdihjOP5`Ap8M?Z3Nnu6C4t&KvxL-DJTK3 zoerB;D{Zm;XmbuGBT;R=V=>n;BWJnAj5PcSt){BKvB${shK=~s3A-mz|9 zi5b|6{lZD-`y;-VU$({UIOAs5e+j^t2?xuBNfmZ2>3(%4VP7ZtBn`aPJ-lAlQH?EX zlD=HbxFL9W5YA9TzQCl@wc!k%4<@a2)J+#ot!W>PYPdN4J${{sOs?ZfAg70Lhr002ovPDHLkV1kTr_I&^V literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/stress_3.png b/src/assets/img/psychological/stress_3.png new file mode 100644 index 0000000000000000000000000000000000000000..20c38a08b6c99771a243226a3f54987300c47dc4 GIT binary patch literal 1107 zcmV-Z1g!gsP)Px(4M{{nR7gvem0f6DMHI*XXXbuo6Ouky>|2Xs-;7{;H!X^hRwzm-eW+MJkVqdY zMyPFa6WfQ7Qb-7!1fiuAT8OEjf~`gLsS<2jM6;Wq6kn>w;A53yqRHld%^aC*Hg2-J zMhEW0&YtnMQz0@%q+%|!gC27UxEp;Y>DW7slF7jG@r z!ceWv;wk?nDd~h`i@jh#X*8IbA>l5E!V-rZvRUVwF{-&oYCp;mIJ@fv*g(*)m3y$5K_fC zcR1f02maTNZS4({bfO_wc&==`244>RG0&16vC>7Y`8cG$4JFUH7QG&;_1>F^Xyy^O zvCu>P&|#3hVGBAe1R+e-`wgovSb;}fyN|FC9|159L2I4|=r<5{ZgkmoCE`$@ahj%v z40yTAf5vmRCyIRO?Bv*m#f@PwslWvBAC@CDm~)18hM^N~hoRa`{u`{kS`Oj3iw#l~lQ0TVQE9 zX{D&gA8@2RT`Os2Z)3$*Q;i$!(l<>5Q}@k2_wH(mw7d_#TA>MR`zP%jxW}na+lVHA7 zs`HF}SEc_bU!|Ak0;RbKV9tmj0}ok(wy(=gDT5ER=6gi6&2_{hOU0!1e|2abaa^~( zu0uC!%YOlEVv}m6UdfEke6psBQQ(g`Qg%eDz6@-3u`31QRFAvE`3_^dPS2OS{Rz*O z`|3%-zrhVSOwz9!MyB_b?W!kH;EyrrRY_!Trjq66QOpT3J}i4&7jFJ2cI`ewL~nbJ zY+sw9%rLr0RO-g^42=>ssWo57j7(qK__CS?43)L(o0 Z{|%@B1sS-Lude_A002ovPDHLkV1g=m7o`9I literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/stress_4.png b/src/assets/img/psychological/stress_4.png new file mode 100644 index 0000000000000000000000000000000000000000..77f46744e978e47f9decd94b63f1a0011b3a0115 GIT binary patch literal 1018 zcmVPx&v`IukR7gv;Rb7ZwWf*>*@0^{PJ?G3?VC~Ea6Ox23tO!JH=D49kHzovHnovp? zK?YuyHwz-TU3Ik=UI?28C9M}lK~N33o@K!zilv)Mu?S}urP_7R8RzGm?~QM4w%K*I z7Nz&{``-8Y-k;}vK4JxvXCCn8YTVG5vG;?r6W~Tb1_0g!dSy4w16Oy;%Kjp;Q>|x2@xKlm0TxDx#_N zDJPtHJr4Xa*WxR2DitrR?&`QMf=4BPENAmjLrYB{uUVQGQ_6{qrCx6K0Cz1SO65R4 zte%Uv`>*E6(;7fS%VGs>@LEvVtD!ysU@HJAFbCi|fsHHm#Q15*48Um;PeL&GcYTS1 zKH!A2=V@3GC7DlcB|~Ot_iAR?iROf7H+M7IHn_>j+S9dvK{m{2Y0)4WHqmdoWLmJ2 zIcCU>R zadR)q*#uIN5yx|n^Rvs1PNs3Nwg_Y{5m?u&0uz^re8XtFKc@t1OyF`y0>4^mvNJbz z{YpGk*enT4I;Y+ns9gI!D*J~)yaV7qvrOHE8j-$b}Va8+>~d%sp{w5!~A2{{cG%7{hJi=rfYMziPwTT#(^KEkTV0} z%;~u7A8~As#vSH}86ft%lhseU!30p_`@k2*%}Ok_sQl0qpj;wknzeFqL=#5@s8Fy6 zq}h+Q8P296SGDkH-p+);FHxiU;QE$jAEanUfZs^Y6O2R0S0H$s6()g1z`D5?Amdpahz-yG*9~2+E%&7LprT_o{07*qoM6N<$f_g6D)&Kwi literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/tiredness_1.png b/src/assets/img/psychological/tiredness_1.png new file mode 100644 index 0000000000000000000000000000000000000000..d056fe84d1a3cd8d6926559a52a82063a58d28e2 GIT binary patch literal 1054 zcmV+(1mXLMP)Px&*hxe|R7gvmRZD1`RTTctz5oBuWICNBm5AapD1!7gO=_h`OIr}J;wFo#n|4u9 zS{EgqN9<?|kPwggz^ED-{;y(x_$1Q(zn?qDKIZ090b;pFo%c{EupZ$V%$5RJj)n z_1a7?O-=|yoC^f4qs$E7RbZvS41fS31f(fIM5tAr1@_hKtK+ZT*o?IW+|I|Y648q! z$YiC_?!8D5Sg}jYAH)yj&UBvc0?!s=Ur5V5;W^&FVQz^VmI2Rk=MvG}iDs|`t}`|R z=IQMKH^KA+Zryz^x$%Prc%~4a0OLatjQ^eT<_io@5}v;p&E6obia@>cnG|%Si(^8g zV7j2_MSY*Ru7R(3p&kgGBzyV7?!b=FO{eO%a7Kj zNLP!Cmv;;uJZ}We*Eip<->vMS%=huM88D{YTDyp$!65$nb9FFv=*^OyPdr87PeBNF zFi?fSGl_lK`P8?sMD80IE>?=QR@e+`?!7By=VOb~kmJf%tzak;M7iSZn%ZNp+J(ud z3Gx%54bF@jlX`Y4I`id~o5|sD$huQ0wZVlH@O@sQOd-Ao!eA$_!EgZ8iu2^KxB6XC z?mENl&jMt2WbT0R(h!fnziRya_&~_|rdF=E!&)YcB4r9OrAyZ(ej+I5G7-LJ#y9~Z zJyi4uGnR;On23fNh3{T|&&&-=!gai_h;djL!c>0mPSxCcHMb-!BjP!J3wlFkYh)K< zi&C~Z7lwfH)IuVfJ!&r}c9Y=G0X(2RrA6I_3>B+ba(`~d&L_@V1M;1wDB7HFQp<){ z{NgF&iA!VY-_y&Jk4hmX3E0b^AutOP_*E%!J$WGWu1+_bkL6^*xY*2I|H!Gic2Aw_ zmzAe}^dw%sv@bia0n&x35erVpt(!z9uO`Pb#f|QMn}D<2(FeLu8anUWq3aAP5MA>f z5t}-gzN0s$r>E(`lfTI|vGX~Cc!NO?b%~*~Lv>)L5TEe-c#Ae8Aqh^^{ehWR1kwEr zJ`@ZG&3eVrcH6BHhDXdV#K&?UwI`+_$VurxUVDb8C1){*uMU8h1* zqvhJ1p-$CV0Mu+E`X6R!^VPR*rNV#LOQV21C4l1$dKf?$K$*a|71pQ!&Ol`4T%YOx Y4;YK&<1j$9bpQYW07*qoM6N<$f?&G?-~a#s literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/tiredness_2.png b/src/assets/img/psychological/tiredness_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f508e3e7a894a363b515cd223073734d322eb6c1 GIT binary patch literal 960 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.finally(() => { this.$toast.clear() }) @@ -125,11 +125,15 @@ export default { } }, // 计算表情 - calcImg(level) { + calcImg(level, name) { let imgUrl = ''; - switch(level) { + /* imgUrl = require(`@/assets/img/psychological/${name}_${level}.png`); */ + let numLevel = Number(level); + console.log(`@/assets/img/psychological/${name}_${numLevel}.png`); + imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`); + /* switch(level) { case '0': - imgUrl = require('@/assets/img/regardless.png'); + imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`); break; case '1': imgUrl = require('@/assets/img/regardless.png'); @@ -140,7 +144,7 @@ export default { case '3': imgUrl = require('@/assets/img/moderate.png'); break; - } + } */ return imgUrl; }, // 计算颜色 diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index aff4231..cf5ce60 100644 --- a/src/views/health/psychological/index.vue +++ b/src/views/health/psychological/index.vue @@ -504,7 +504,7 @@ export default { padding: 10, data: this.emotionData, symbol: "circle", - symbolSize: 15, // 拐点圆的大小 + symbolSize: 8, // 拐点圆的大小 areaStyle: {}, itemStyle: { color: function(params) { @@ -530,7 +530,7 @@ export default { padding: 10, data: "", symbol: "circle", - symbolSize: 15, // 拐点圆的大小 + symbolSize: 8, // 拐点圆的大小 }, { name: `中度${this.emoName}倾向`, diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index af32df5..cff0766 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -27,14 +27,14 @@ > 已完成 -
待完成
+
{{ stateText}}
@@ -83,7 +83,15 @@ export default { isSHowPage: false, fromUrl: '', } - }, + }, + computed: { + stateText() { + return this.info.progress > 0 ? '进行中' : '待完成'; + }, + autoJump() { + return this.$route.query.autoJump === '1'; + } + }, mounted() { //页面标题 window.document.title = '情绪初始化建模' @@ -130,7 +138,7 @@ export default { if (re.success) { if (re.response && re.response.state === -1) { this.$toast('用户不存在或未绑定手表') - } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1) { + } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1 && !this.autoJump) { // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面 this.$router.replace(`/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ''}`); } else {