From 44580a243c91f5fdc014f91bc3c9f9177a697fff Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Mon, 6 Nov 2023 14:15:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E6=83=85=20=20=20=20=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E5=A4=A9=E6=95=B0=E9=80=89=E6=8B=A9=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20-=20=E5=BF=83=E7=90=86=E7=9B=91=E6=B5=8B=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=20=20=20=20=20-=20=E5=A2=9E=E5=8A=A0=20=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E5=88=97=E8=A1=A8=E5=92=8C=E5=91=A8=E6=8A=A5=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +- src/assets/img/psychological/down.png | Bin 0 -> 440 bytes src/assets/img/psychological/more.png | Bin 0 -> 661 bytes src/assets/img/psychological/select_down.png | Bin 0 -> 406 bytes .../img/psychological/statistical_form.png | Bin 0 -> 1135 bytes src/assets/img/psychological/up.png | Bin 0 -> 419 bytes src/assets/img/psychological/week_report.png | Bin 0 -> 2706 bytes src/config/models.js | 4 +- src/router/index.js | 6 +- src/store/index.js | 11 + src/views/health/psychological-main/index.vue | 1 + src/views/health/psychological/index.scss | 210 +++- src/views/health/psychological/index.vue | 175 +++- src/views/health/psychological/report.scss | 21 - src/views/health/psychological/report.vue | 53 - .../health/psychological/report/index.scss | 305 ++++++ .../health/psychological/report/index.vue | 918 ++++++++++++++++++ .../psychological/report/report-entry.vue | 230 +++++ 18 files changed, 1783 insertions(+), 163 deletions(-) create mode 100644 src/assets/img/psychological/down.png create mode 100644 src/assets/img/psychological/more.png create mode 100644 src/assets/img/psychological/select_down.png create mode 100644 src/assets/img/psychological/statistical_form.png create mode 100644 src/assets/img/psychological/up.png create mode 100644 src/assets/img/psychological/week_report.png delete mode 100644 src/views/health/psychological/report.scss delete mode 100644 src/views/health/psychological/report.vue create mode 100644 src/views/health/psychological/report/index.scss create mode 100644 src/views/health/psychological/report/index.vue create mode 100644 src/views/health/psychological/report/report-entry.vue diff --git a/README.md b/README.md index 380ba17..dcbd55c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -770,4 +770,12 @@ fix update - 心理监测详情 - 修改 温馨提示语 -- 新增 一个周报/月报页面 \ No newline at end of file +- 新增 一个周报/月报页面 + +## v1.0.97 +`2023.11.6` +update +- 心理监测详情 + - 修改 天数选择方式 +- 心理监测周报 + - 增加 周报列表和周报详情接口 \ No newline at end of file diff --git a/src/assets/img/psychological/down.png b/src/assets/img/psychological/down.png new file mode 100644 index 0000000000000000000000000000000000000000..077e205c5fd09b0f130f553f1bd1e9546ecb9f95 GIT binary patch literal 440 zcmV;p0Z0CcP)Px$a!Eu%R5(xVR6R=rK@fejdv^vTos}Xs2E;;a#4<>}NWg&p0xtnE{sJpYe}b`) zMEnIoFq(^pjcBEXl{Q+4Vq+&_a<@B@Xe1;TuoW`p?7X+kwGBdsKp*W#f@a2qAev!j5Vae3M0f^6{1A*Xp+dQfY#5D3 z9Yl-Zpn&%DTDD?bhQw#8?J&ERoD`Cd$dvQi*8>@ZA;3ysv#+wHWc}sWo;fEm4k0T> zNG|vd)kk2ANcatPrG;2MSgO8$Z`f7q=gVWh@>~*_?IH5?%Tj%Px%Pf0{UR5(wK)Xi%XQ4j#|nc2KeD42tys31LvpeGST51yo874fDBf+9o=NClH- z(+xdzFBbM~;-P|GETU9eiWCp(MQ`Fip!MQGf~bh#LCn{7_q~xAUUD{1_fH z^RUrq9M@XkM8vzTR%_AoycjldFbINgLWu1qH;SSlpU+Phi^XV|HE<%E&E5{fa3go6 z-ELp>Jg+kdBLEm&0ssjB77>9`>IpMnnwpyWnT8EqKS2=OFc=YqZQBrr;Y-W1E|<&Y z&;9UknBda@@R*2lhzMHix6FLOah%nE@n6scecwM!M9%$mMc5==FN@1EJ@6xsj2P86t9-8BA}P`N8PuXdxBO&CTV*FuY~kb|H$Qb)=MP zbUGc^Y*1e)rQC^#W`d5HO6E>$YiosSwR#@_xNkdr-``C{PZ9BuLChQz(fLZHvXVME zzV9C(qD3LZL8X*w`gZ`Ba2#hTbylU6ClK+TWm$Vnl2YnxCX+c^DwSTRZb!XdKgG-o z0I)UL#}7)Wv0AOxOx;J{_s0a>00001b5ch_0Itp) z=>Px$P)S5VR47x0kUdKSK@f&#_Lh@_2$qVKO8$l@+L*$^QY_Raf|j{k6HpEmF4-+E zM6^>2v5i`Ztsh`#?LV*-%#m=nH!CNJBz{geyz{*8%%D;#1b}=LMJvAVzrsJ&Xf%d8 zolYG9Mo~(6n#<)@Tdmfm=Xpy2VE*EjQU{LXY_;3%dkn*HBuSDc=X^Fz(`(mt3%|ii zsT0Q78WBBPmNkdjU>JsDTI)N;*c1`fqbPEH-`D*nQp#;a3;^IoYh5Up%TFJ0R!XS} z0JyPjJ0HjKp6j~10FdcMO1X}R$Htg9t@T2sQhCUjPdICWAeiKw-!jI=(=^@pJa4C3 ztu9-Zbq)Xt5lssr9(#cUaCd_l0B8churcNk5sO(m5fz0HXZ@#qgEO&Kt1U9dE^OOo zL7p=llv0H%g__Kw{729prC`fX7ke8UO$Q07*qoM6N<$f`zB3 AvH$=8 literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/statistical_form.png b/src/assets/img/psychological/statistical_form.png new file mode 100644 index 0000000000000000000000000000000000000000..08f9e30b7b6216c0f6bee2f75c7843a2d6637012 GIT binary patch literal 1135 zcmV-#1d#iQP)Px(DM>^@R7gv`mu+ZUWfaHHd7gW3nyyVY=X^^-r?SED%cc&oR6lIO{Gx+G3x3(s zrmG-0)>KeYT%1sb=0(cH>1?aWil!(7@#VurWKO1ADI$Vnb!Ba`PN*~OmYd$&`#eW( zx@KwKnsn;@dY|+EJ^zz)&pAP;;%SSM)-XQqR_Yq=5S%tMA@7q?{51GN(+~bPC+Pf6{pSTU4J0L4X8IxmoOjC9FF z6hhTCw~fwUzxwS!(DTH;SYoS?@CGv2p{UM!%hbzBQi`+J&Uhak89|YQc7_vSMbmnPwJiPBrMHCBrNBTW zxebuM0|1u<+CLQZ9mzud(aFa+vTuN(zKSoXYNt7HH2Iw7Y<$Pi=YBWT%p>RzP1G@$ z`VnKieWkSK3ZbBS)e26RVmhOV35V0Y(a>jiVAoq$?j>$rtj1ww=wGJ>g1*Pg=>#H| zpLMKp9i7)xLl}r8UsN2Eyr_Lf%9BEyE70I04Qk#`{9>0(Vd4j|H6Lb%zs$_WaI z7>FiTK3E`NLj{S0LqXr6S}vQbiPb`h=!jI z@+QctRB8;uKqQd@hVK6ZjEF!)Gj@7EV_a>mG*xOeQua7kG_Wi)j$P5@Zq?a%!pyAv zo!u&2bGl$Yef>$?)0bGU*3qws?C$*S;8p>J@i$UC2|(L06e2d|N*n}aul?7*D-yi= zLD18eZA=~g(;K*uV?^Znw;kr`O=b+Sb@=6`zjH%85V^7w&^o!eOw`<@D%|yk9%9Qt zkLPr@cjuoDL=$@f=olhbiHavhty!?!C6O>BvAsjRo=m3q&>eD(=-W$tpmNDv7$;Yr`8twO>?qu$YOLS2PG7gL@+1<%9GdASoIj^UGq#aAHl@F`~&0*1!~1&RG|O>002ovPDHLkV1k|D BBrgB} literal 0 HcmV?d00001 diff --git a/src/assets/img/psychological/up.png b/src/assets/img/psychological/up.png new file mode 100644 index 0000000000000000000000000000000000000000..a502063f09453161135cdf717ce3f0fb93de4921 GIT binary patch literal 419 zcmV;U0bKrxP)Px$T}ebiR5(xVQp+wwQ50SKoc2~D9?^3vZrhk>A_ih2{(vx$@CS_47Z@4(1U2Fp z8UqtCWyHXUiC1$Q?QJCt=tIwzLo3yL#RupfoyS^x@3r55=2qtdCqu+7m=Ll0do%AOzr@aUGUoarnM?+nL}8 z`NeTmRW?o}Fs(aK0)PfCBHEfCblpn(>znMQlmj3aB{BQP>{AmZLRIsb4q-KZ=RF$0 zC)ssIQkIa1VL>yE0Af3nMT9!@Il#+yzFZ(rsR2ZBOrSY`J-?l%nr57$h6O4n)wTeZ z0KB$ZF>(_`G-(b-FEd}62Kno1qMw*@!J|sqYkfrfHD*MNR_671-aGhnR0iNB)J8;# zY@1wb>WuA{_j=^kl5`uPxPCB436kh#GNgHeb+<}jq67YJ(h_kJ`nQO&NGYWzRmfc(i!$Wvza~t-ynDBdLrh;u-9Z-m@ ziw<9lexBB_9o!<=nT+v zT(63E1gsopWSI|3Z!U*H!2KIq@taf5yr^JSD%%-&uu-WwoE(B;j z5sfj^7V-iH#+>9w&`;QN&_pmmSW;DrM2hk7Q*H2h6-vVf#50nc9*+~~LYEkAX}56T zu!*$`DmCZ#Jaz~+GtN5MkM0Cxe`^YdqZSOsdx$XOcZ)~7>r&baZ2I#3g*kq;m6S0t zX@n;0}+%4Nm)#9-LKTvep^6z|opYe6{I3q|~TJZVjPvi9U7*qJl#my&w^;IpfFRc zX{o<;7z*+X4Xit1*F$~0<%p}}G0DmeuN}c_fA7-Y$Bho) zmaB>p%5_9p_MGwa11JhYj$Sq2LBKKqK3R}TGYo@Jck3_|W`K#I zWQx(;meRmZD)GW25k15ZkWFo-*0K?$UVRXE^dxLdcY!&7HbJyx#G=Z2nzOXAoCDs+ zKy;Vt}EdEqBC0}^b{>@3{fU68`%n#HJKElJ!WCfN|(ya#*9}jD|Hi9uRJt? z*n9y{1@0~`ut(-r=s0-cy%@ZP()74?v=S+T$6*DQEx$`PI#Q9gT&dx#HBKp$EWY}} zeC@q?YnrvzX)5LP%u)DgGR>|(un?ent$3N?0+ZnXaDNi_Z8(I0S84TjonWSHZ6H$+ z28gRRL(pRClTxHa@0?1Iwi&fmWt!T#ziigw;_j^rKdT>8b$#<62wasNDlV|q^D40K zvlNzYY=z$=g6IH~ja^p6xKuzXcv4H{Qxn0F%b$;_Y2=H0+Ke6jZqBvI0E)RtzsTbZYO3cLlg%01KxU zqb%&j{I$&p2SqL%uLyYC=2oh%I}j(LJ}NmBu&%g;s!0X7?3_G2{>l+d9-pt{Bos8X zHXZ3sC$HuZ*<#>8~6t6UN=}gV0vL-|2 z?D{5@gtM~J4gR6zVzA)9>GDEca#j%Y*R-Ivs#Lc>`#v)N;&KVuh9*fK@ zLrZ%a&%GPN73b#TyfHa=;K^3hUSEor-|xap@AU;H`}}aK6a2S6;s|UOu#CX2JTyUZ z>Ujng_Af~;u;rT^fmH^y4bJW+KweRlp>sGpgn4#D`Deb`x1C(R}Yp} zm*Y==>(nh%w#P(t?zqkg{@YhK>riks(kV&IY6{I+)mUy@-p7gP+ea1H&r(>PQGO9o z>0ZBnW)5zjQjAAm>A+t;=*Af%131{8LQ6*q<3{J;+KWS|Eb*csPvKX8>_Efb1awo8 zkqhyd=vaB7M|-R&|MQZ>z&6|Oo2lEL{rLwME8?Yn+8#w%JztdH#Dh<^BH)u+3EehJ zjl1H!T&#aBsxKxoL^32Zg~q89!n$OA+Gb+w_81Z=8y@k90JB7>fkjh`Q6Vw5vI(W1 zmn0KROGYfNtk+WBzfnx4Y~4+)t*OM$kKk(vnoHvy~+r$Fm| zU#qw?SLXOVO5XvbGZFeFtM8prhEWwhT`Nljm@LX}6dn4Qs_UA6>bBPLgpHhl!m7Cy zx;fnbVYe=&juGeN*=?2>6HiEO)BrO76nt_70c=`McOm6SJ{OD$>bMfQD9H23_kpdo zKyxl5##SOVQG`-VfA5koCVe$m--bRPPJcD9ckSOvX7?)tXG>-H=e{`VwzMNRU<`g4 zk!|$#jj@50ahhe>`eegPq#bq|K>?K28E0GW^IgAGWIEWRcHcS)pxbmaEi%M=06zNl zO?GxKyb83MfFj#=imndsOrPv_34@}_bkoPW4Y*WGmMg;07hY{_kSBs;0r?{Tljp1B zej?~K(EF&O?k7_EQRT}Vqztfao#3NN20{O4C=fXp%>QTT+YDRGc++P4u2Z^3ynkZP zP+7)nBJH8BaJ+^XH-epqyMcGPW1)4jm6_$v*vN$S-ehvkZ|*)dI@GG;^1+R(n#cMq zo=o7&K{OuVkZ!j1Q>PeqwsGFeqzl!OBQIz%Fz+CuZ3#ustzUG~m-Ez_jXDyEs851F zC^O(Y6&^Yt%o9NNSYoQQ33)PCF}j%eAXx1N(c4IKg9UT%i9Qbh519c&M*b=Wga7~l M07*qoM6N<$f`CjM7ytkO literal 0 HcmV?d00001 diff --git a/src/config/models.js b/src/config/models.js index 7f05ebd..d44a7ab 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -1,11 +1,11 @@ /* * @Date: 2021-11-20 10:26:39 * @LastEditors: JinxChen - * @LastEditTime: 2023-11-02 09:12:59 + * @LastEditTime: 2023-11-06 09:15:22 * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.96F'; //版本号 +export const VERSION_MODEL = '1.0.97F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/router/index.js b/src/router/index.js index c31845c..39bf12c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,7 @@ /* * @Date: 2023-09-21 09:54:53 * @LastEditors: JinxChen - * @LastEditTime: 2023-10-30 11:31:37 + * @LastEditTime: 2023-11-03 09:41:28 * @FilePath: \TelpoH5FrontendWeb\src\router\index.js * @description: */ @@ -62,7 +62,9 @@ const routes = [ // 健康-抑郁，压力和疲劳汇总入口 { path: '/psychologicalMain', name: 'psychologicalMain', component: resolve => require(['@/views/health/psychological-main'], resolve) }, // 周报/月报 - { path: '/psychologicalReport', name: 'psychologicalReport', component: resolve => require(['@/views/health/psychological/report'], resolve) }, + { path: '/psychologicalReport', name: 'psychologicalReport', component: resolve => require(['@/views/health/psychological/report/index'], resolve) }, + // 周报/月报-入口 + { path: '/psychiclReportEntry', name: 'psychiclReportEntry', component: resolve => require(['@/views/health/psychological/report/report-entry'], resolve) }, // 告警详情-中间页 { path: '/aiCallAlarm', name: 'aiCallAlarm', component: resolve => require(['@/views/ai-call-alarm'], resolve) }, diff --git a/src/store/index.js b/src/store/index.js index 0681b86..fadbe53 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -23,6 +23,7 @@ export default new Vuex.Store({ ssjlToken: '', fromSsjl: '', active: null, //点击左边树形图下标 + tabClick: '', //心理监测点击tab }, mutations: { imei(state, imei) { @@ -65,6 +66,11 @@ export default new Vuex.Store({ state.active = active; window.localStorage[prefix + 'active'] = active; }, + tabClick(state, tabClick) { + state.tabClick = tabClick; + window.localStorage[prefix + 'tabClick'] = tabClick; + }, + }, getters: { imei: state => { @@ -107,6 +113,11 @@ export default new Vuex.Store({ if (state.active != '') return state.active; return window.localStorage[prefix + 'active'] == null ? '' : window.localStorage[prefix + 'active']; }, + tabClick: state => { + if (state.tabClick != '') return state.tabClick; + return window.localStorage[prefix + 'tabClick'] == null ? '' : window.localStorage[prefix + 'tabClick']; + }, + }, actions: {}, modules: {} diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue index 17a4531..d2b391c 100644 --- a/src/views/health/psychological-main/index.vue +++ b/src/views/health/psychological-main/index.vue @@ -67,6 +67,7 @@ export default { }, mounted() { this.loadParams(); + this.$store.commit('tabClick', 0); window.document.title = '心理监测'; }, methods: { diff --git a/src/views/health/psychological/index.scss b/src/views/health/psychological/index.scss index d265892..1b94ae2 100644 --- a/src/views/health/psychological/index.scss +++ b/src/views/health/psychological/index.scss @@ -4,54 +4,76 @@ $newBlue: #638EE4; width: 100%; overflow: hidden; background-color: #fff; - .main { - height: calc(100vh - 45px); - overflow: scroll; - .top { - flex: 1; - .tab-bar { - padding: 0 13px 5px 13px; - .date-tab-con { - padding: 5px 0; - height: 30px; - display: flex; - justify-content: flex-start; - align-items: center; - .date-tab-list { - display: flex; - justify-content: flex-start; - align-items: center; - flex: 1; - border-radius: 15px; + .tab-bar { + width: 100%; + position: relative; + .date-tab-con { + display: flex; + justify-content: flex-start; + align-items: center; + background: #F6F6F6; + border: 1px solid #E0E0E0; + .date-tab-list { + display: flex; + justify-content: flex-start; + align-items: center; + color: #fff; + flex: 1; + height: 24px; + padding: 10px 0; + .date-tab-item { + position: relative; + padding: 0 20px; + color: #6D6D6D; + font-size: 18px; + @include center(); + img { + height: 25px; + width: 25px; + padding: 0 8px; + } + .more { + width: 10px; + height: 6px; + } + &.active::after { + content: ''; + width: 44px; + position: absolute; + right: 25%; + bottom: -10px; + box-sizing: border-box; + border-bottom: 4px solid #638EE4; + } + &.active { + color: #638EE4; + } + &.notClick { + background-color: $border_color; color: #fff; - .date-tab-item { - height: 30px; - width: 100%; - color: #6D6D6D; - font-size: 18px; - @include center(); - border: 1px solid $newBlue; - &.active { - background-color: $newBlue; - color: #fff; - } - &.notClick { - background-color: $border_color; - color: #fff; - border: 1px solid #fff; - } - } - .date-tab-item:first-child { - border-top-left-radius: 15px; - border-bottom-left-radius: 15px; - } - .date-tab-item:last-child { - border-top-right-radius: 15px; - border-bottom-right-radius: 15px; - } + border: 1px solid #fff; } } + .date-tab-item:nth-child(3) { + border-right: 1px solid #E0E0E0; + } + /* .date-tab-item:first-child { + border-top-left-radius: 15px; + border-bottom-left-radius: 15px; + } + .date-tab-item:last-child { + border-top-right-radius: 15px; + border-bottom-right-radius: 15px; + } */ } + } + } + .main { + position: relative; + height: calc(100vh - 90px); + overflow: scroll; + .top { + flex: 1; .title { display: flex; justify-content: space-between; @@ -310,7 +332,107 @@ $newBlue: #638EE4; } } } + &.report { + position: relative; + height: calc(100vh - 90px); + overflow: scroll; + background-color: #f5f5f5; + .content { + position: relative; + .list { + position: relative; + + .item { + display: flex; + justify-content: space-between; + align-items: flex-end; + padding: 34px 15px; + background-color: #fff; + margin-bottom: 11px; + .left { + display: flex; + justify-content: flex-start; + align-items: flex-start; + img { + height: 25px; + width: 25px; + } + .middle { + .title, + .overall, + .trend { + display: flex; + justify-content: flex-start; + align-items: center; + padding-left: 13px; + span, + p { + font-size: 18px; + font-family: Source Han Sans CN; + font-weight: 400; + color: #8d8d8d; + line-height: 30px; + } + } + .title { + span { + padding-right: 20px; + } + p { + color: #282828; + } + } + .overall { + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; + .left { + p { + padding-left: 20px; + font-weight: bold; + } + } + .right { + img { + height: 15px; + width: 9px; + } + } + } + .trend { + align-items: flex-start; + text-align: left; + } + } + } + .right { + img { + width: 9px; + height: 15px; + } + } + } + &.no-data { + height: calc(100vh - 100px); + width: 100%; + @include center(); + flex-direction: column; + img { + height: 110px; + width: 175px; + } + p { + color: #999; + font-size: 12px; + padding: 20px 0 65px 0; + } + } + } + } + } } + .title { font-size: 16px; } diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index 1c703b8..cd06779 100644 --- a/src/views/health/psychological/index.vue +++ b/src/views/health/psychological/index.vue @@ -5,24 +5,25 @@ -
-
- - -
-
-
-
- {{item.text}} -
-
+
+
+
+
+ + {{item.text}} +
+
+
+
+
+
{{ titleLeft }}
@@ -112,13 +113,9 @@
- -
- -
@@ -188,6 +185,46 @@
+ +
+
+
+
+
+ +
+
+ 周报 +

{{ item.name }}

+
+
+
+ 总评 +

{{ item. summary}}

+
+
+ +
+
+ +
+ +
+
+
+
+ +

暂无数据

+
+
+
@@ -220,7 +257,8 @@ export default { dateList: [ { name: "today", text: "今天", value: 0 }, { name: "week", text: "7天", value: 7 }, - { name: "month", text: "30天", value: 30 } + { name: "month", text: "30天", value: 30 }, + { name: "weekReport", text: "周报", value: 49 } ], current: 0, // 日期选择标签-当前选中的标签 currentDays: 0, //日期选择标签-日期参数 @@ -337,6 +375,12 @@ export default { moderateColor: '#d70d0d', // 7天和30天最大数据列表 weekAndMonData: [], + tabImgUrl: require("@/assets/img/psychological/statistical_form.png"), + selectDownImg: require("@/assets/img/psychological/select_down.png"), + weekImg: require("@/assets/img/psychological/week_report.png"), + moreImg: require("@/assets/img/psychological/more.png"), + noDataImg: require("@/assets/img/no_data_01.png"), + weekList: [], }; }, computed: { @@ -615,7 +659,7 @@ export default { return `${today}${this.emoName}数据图`; }, warmTips() { - return `正常连续佩戴腕表，每半小时计算一个${this.emoName}分值。`; + return `正常连续佩戴腕表，每${ this.emoType == 2 ? '一': '半'}小时计算一个${this.emoName}分值。`; /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */ }, title1() { @@ -663,9 +707,11 @@ export default { this.getPieData(); this.getCalendarData(); this.getPsychologiclData(); + this.getWeekResult(); }, mounted() { this.initEchart(); + this.current = Number(this.$store.getters.tabClick) || 0; window.document.title = '心理监测'; }, methods: { @@ -964,6 +1010,30 @@ export default { x: 0, }, }, + { + name: `轻度${this.emoName}倾向`, + type: 'scatter', + symbolSize: 8, + data: '', + }, + { + name: `中度${this.emoName}倾向`, + type: 'scatter', + symbolSize: 8, + data: '', + }, + { + name: `重度${this.emoName}倾向`, + type: 'scatter', + symbolSize: 8, + data: '', + }, + { + name: `无${this.emoName}倾向`, + type: 'scatter', + symbolSize: 8, + data: '', + }, ]; // 点击提示此时为空 this.defaultOptions.tooltip = { @@ -1084,22 +1154,12 @@ export default { onTabClick(value, index) { this.current = index; this.currentDays = value; + this.$store.commit('tabClick', index); let currentDate = new Date(); let leftText = value === 0 ? '今天' : value === 7 ? '7天' : '30天'; this.surveyTitle = value === 7 ? '7天概览' : '30天概览'; if (value === 7) { - /* this.defaultOptions.xAxis.data = [ - "周一", - "周二", - "周三", - "周四", - "周五", - "周六", - "周日" - ]; */ - //this.defaultOptions.xAxis.data = this.xAxisData; let dateList = this.getPostDate(currentDate, 6, true); - console.log("dateList", dateList); this.getPsychologiclData('', dateList[0], dateList[1]); } else if (value === 0) { // 今天 @@ -1107,14 +1167,16 @@ export default { this.defaultOptions.series = this.defaultSeries; this.defaultOptions.series[0].data = this.emotionData; this.getPsychologiclData(this.selectDate ? this.selectDate : this .$dayjs(currentDate).format("YYYY-MM-DD")); - } else { + } else if(value === 30){ // 30天 this.defaultOptions.xAxis.data = this.xAxisData; this.defaultOptions.series = this.defaultSeries; this.defaultOptions.series[0].data = this.emotionData; let dateList = this.getPostDate(currentDate, 30, true); - console.log("dateList", dateList); this.getPsychologiclData('', dateList[0], dateList[1]); + } else { + // 周报菜单 + this.getWeekResult(); } }, getCurrentMonthStaAndEnd(currentDate) { @@ -1215,19 +1277,19 @@ export default { let color = ""; let className = ""; switch(value) { - case '0': + case '0', 0: color = "#62BD48"; className = 'none'; break; - case '1': + case '1', 1: color = "#ffde00"; className = 'mild'; break; - case '2': + case '2', 2: color = "#ff8a00"; className = 'moderate'; break; - case '3': + case '3', 3: color = "#d70d0d"; className = 'severe'; break; @@ -1241,6 +1303,41 @@ export default { // 关闭poup onClose() { this.isPopup = false; + }, + getWeekResult() { + this.$toast.loading('数据加载中'); + let reqUrl = 'https://dbmq.rzliot.com/heart/api/Data/GetWeekResult'; + let reqParams = { + uid: this.uid/* '2023101521270090082 */, + type: this.emoType + }; + axios.get(reqUrl, { + params: { ...reqParams }, + /* headers: { 'AccessToken': this.$store.getters.ssjlToken } */ + }).then(res => { + console.log("res", res); + const data = res.data.response; + this.weekList = data.map(item => { + return { + name: item.Name.replace('周报', '').replace(/-/g, ".").replace(/~/g, "-"), + recordId: item.RecordId, + summary: item.Summary, + summaryLevel: item.SummaryLevel, + type: this.emoType + } + }); + this.$toast.success('数据加载完成'); + }) + }, + onClickItem(recordId) { + this.$router.push({ + name: 'psychologicalReport', + query: { + recordId: recordId, + name: 'depression', + isShowLeft: true + } + }) } } }; diff --git a/src/views/health/psychological/report.scss b/src/views/health/psychological/report.scss deleted file mode 100644 index 57e1b92..0000000 --- a/src/views/health/psychological/report.scss +++ /dev/null @@ -1,21 +0,0 @@ -.report{ - height: 100vh; - width: 100%; - overflow: hidden; - background-color: #fff; - .main { - height: calc(100vh - 45px); - overflow: scroll; - padding: 5px 15px; - h5 { - font-size: 16px; - } - .overall-rating { - display: flex; - justify-content: flex-start; - align-items: flex-start; - flex-direction: column; - font-size: 14px; - } - } -} \ No newline at end of file diff --git a/src/views/health/psychological/report.vue b/src/views/health/psychological/report.vue deleted file mode 100644 index 5151ffc..0000000 --- a/src/views/health/psychological/report.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - diff --git a/src/views/health/psychological/report/index.scss b/src/views/health/psychological/report/index.scss new file mode 100644 index 0000000..302b71b --- /dev/null +++ b/src/views/health/psychological/report/index.scss @@ -0,0 +1,305 @@ +.report { + height: 100vh; + width: 100%; + overflow: hidden; + background-color: #F5F5F5; + font-family: Source Han Sans CN; + + .main { + height: calc(100vh - 45px); + overflow: scroll; + background-color: #fff; + + .line { + height: 11px; + background-color: $lineGray; + } + + .overall-rating { + padding: 23px 15px; + margin-bottom: 9px; + + .con { + padding: 17px 18px; + display: flex; + justify-content: flex-start; + align-items: flex-start; + flex-direction: column; + font-size: 14px; + background: #FFFFFF; + border: 1px solid #535353; + box-shadow: 4px 5px 0px 0px #638EE4; + border-radius: 5px; + + p { + font-size: 18px; + font-family: Source Han Sans CN; + color: #666666; + + .bold { + color: #282828; + font-weight: bold; + } + } + + .space-between { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .time { + font-size: 12px; + } + } + + .normal { + font-size: 13px; + line-height: 21px; + text-align: left; + color: #666666; + } + + .bold-pro { + color: #282828; + font-size: 24px; + font-weight: bold; + padding: 12px 0; + } + } + } + + .pie-chart-top { + display: flex; + justify-content: space-between; + align-items: flex-start; + padding: 23px 15px 16px 15px; + + p { + font-size: 12px; + font-family: Source Han Sans CN; + line-height: 21px; + } + + .bold { + font-size: 18px; + font-weight: bold; + color: #282828; + line-height: 18px; + } + } + + .count { + padding: 0 15px 5px 15px; + text-align: left; + + p { + font-size: 12px; + font-family: Source Han Sans CN; + font-weight: 400; + color: #8B8B8B; + line-height: 18px; + } + } + + .pie-chart-con { + flex: 1; + padding: 5px 0 10px 0; + display: flex; + justify-content: space-between; + align-items: flex-start; + background-color: #fff; + + .pie-chart-left { + position: relative; + height: 150px; + padding-left: 15px; + width: 35%; + @include center(); + + #pieChart { + height: 106px; + width: 106px; + } + } + + .pie-chart-right { + height: 150px; + width: 65%; + padding-right: 20px; + @include center(); + + .list { + flex-direction: column; + + .item { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 12px; + padding: 9px 0; + + .item-left { + display: flex; + justify-content: flex-start; + align-items: center; + padding-right: 10px; + + .circle { + height: 12px; + width: 12px; + margin: 0 4px; + } + + span { + font-size: 12px; + } + + .text { + color: #000; + font-size: 12px; + } + } + + .item-right { + display: flex; + justify-content: center; + align-items: center; + } + } + } + } + } + + .statistics { + position: relative; + padding: 0px 14px 5px 14px; + + .list { + flex: 1; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + font-size: 16px; + + .item { + @include center(); + width: 58px; + /* height: px2rem(136); */ + flex-direction: column; + + .top { + font-size: 12px; + } + + .middle { + font-size: 24px; + font-weight: bold; + padding: 5px; + } + + .bottom { + font-size: 9px + } + } + } + } + + .bar-chart { + height: 350px; + background-color: #fff; + padding: 0 5px; + + .echart { + height: 350px; + padding: 0 5px; + } + } + + .advice { + padding: 26px 15px 30px 15px; + + .content { + background: #F2F6FF; + border-radius: 10px; + padding: 20px 15px; + text-align: left; + + p { + font-size: 15px; + font-weight: 400; + color: #707070; + line-height: 23px; + } + + .title { + font-size: 18px; + font-weight: bold; + color: #638EE4; + line-height: 18px; + padding-bottom: 13px; + } + } + } + + .overview { + padding: 0 15px 16px 15px; + + .content { + .title { + text-align: left; + + .title-text { + font-size: 18px; + font-weight: bold; + color: #282828; + line-height: 18px; + } + + .mood-list { + display: grid; + grid-template-columns: repeat(2, 1fr); //定义了一个 2x2 的网格布 + grid-template-rows: repeat(2, 1fr); + gap: 21px; + padding: 21px 21px 22px 20px; + + .item { + width: 107px; + height: 94px; + background-color: #F2F6FF; + display: flex; + justify-content: center; + align-items: flex-start; + flex-direction: column; + padding-left: 30px; + + p { + font-size: 14px; + padding: 0; + color: #666666; + + .day { + /* padding: 5px; */ + font-size: 28px; + } + + .day-text { + font-size: 12px + } + } + } + } + } + } + } + &.no-data { + @include center(); + flex-direction: column; + p { + font-size: 16px; + } + } + } +} \ No newline at end of file diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue new file mode 100644 index 0000000..bc08edf --- /dev/null +++ b/src/views/health/psychological/report/index.vue @@ -0,0 +1,918 @@ + + + + + + diff --git a/src/views/health/psychological/report/report-entry.vue b/src/views/health/psychological/report/report-entry.vue new file mode 100644 index 0000000..c383915 --- /dev/null +++ b/src/views/health/psychological/report/report-entry.vue @@ -0,0 +1,230 @@ + + + + + + From 474e91f923147ebba1830cab9c4cce62ac9a3840 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Tue, 7 Nov 2023 09:26:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20-=20=E5=BF=83=E7=90=86=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E6=83=85=20=20=20=20=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E5=9B=BE=E8=A1=A8=E8=BF=9E=E7=BA=BF=E7=82=B9?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20=20-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E9=80=89=E9=A1=B9=E8=8F=9C=E5=8D=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++++++- src/config/models.js | 2 +- src/views/health/psychological/index.scss | 4 ++-- src/views/health/psychological/index.vue | 14 +++++++------- src/views/health/psychological/report/index.vue | 4 ++-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index dcbd55c..d18f0fc 100644 --- a/README.md +++ b/README.md @@ -778,4 +778,12 @@ update - 心理监测详情 - 修改 天数选择方式 - 心理监测周报 - - 增加 周报列表和周报详情接口 \ No newline at end of file + - 增加 周报列表和周报详情接口 + + +## v1.0.98 +`2023.11.7` +fix +- 心理监测详情 + - 修复 图表连线点颜色显示不正确的问题 + - 修复 选项菜单显示异常的问题 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index d44a7ab..a21a90e 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -5,7 +5,7 @@ * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.97F'; //版本号 +export const VERSION_MODEL = '1.0.98F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/health/psychological/index.scss b/src/views/health/psychological/index.scss index 1b94ae2..bf6ce58 100644 --- a/src/views/health/psychological/index.scss +++ b/src/views/health/psychological/index.scss @@ -15,7 +15,7 @@ $newBlue: #638EE4; border: 1px solid #E0E0E0; .date-tab-list { display: flex; - justify-content: flex-start; + justify-content: space-around; align-items: center; color: #fff; flex: 1; @@ -23,7 +23,7 @@ $newBlue: #638EE4; padding: 10px 0; .date-tab-item { position: relative; - padding: 0 20px; + padding: 0 10px; color: #6D6D6D; font-size: 18px; @include center(); diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index cd06779..b99b7ef 100644 --- a/src/views/health/psychological/index.vue +++ b/src/views/health/psychological/index.vue @@ -341,13 +341,13 @@ export default { .format() ), // 路由传过来的情绪参数 - emoName: null, + emoName: '', // 默认折线图 Series 配置 defaultSeries: null, // 非日报折线图 Series 配置 weekAndMonthSeries: null, // 当前情绪类型 - emoType: null, + emoType: '', // 结果解读 result: "", // 需要高亮的日期数组 @@ -1276,20 +1276,20 @@ export default { calcResultColor(value, isCallBackClass) { let color = ""; let className = ""; - switch(value) { - case '0', 0: + switch(Number(value)) { + case 0: color = "#62BD48"; className = 'none'; break; - case '1', 1: + case 1: color = "#ffde00"; className = 'mild'; break; - case '2', 2: + case 2: color = "#ff8a00"; className = 'moderate'; break; - case '3', 3: + case 3: color = "#d70d0d"; className = 'severe'; break; diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue index bc08edf..7ef1b8c 100644 --- a/src/views/health/psychological/report/index.vue +++ b/src/views/health/psychological/report/index.vue @@ -1,7 +1,7 @@ @@ -168,7 +168,7 @@ export default { surveyTitle: '本周概览', echarts: null, // 路由传过来的情绪参数 - emoName: null, + emoName: '', pieData: [], xAxisData: [], pieEcharts: null,