From c1935ed419a9e640abc3b2966e96093149428821 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Thu, 1 Jun 2023 14:52:11 +0800 Subject: [PATCH] =?UTF-8?q?feature=20-=20=E5=A2=9E=E5=8A=A0=20=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=BF=83=E7=90=86=E8=AF=A6=E6=83=85=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +- src/assets/img/moderate.png | Bin 0 -> 1904 bytes src/assets/img/regardless.png | Bin 0 -> 1383 bytes src/config/models.js | 2 +- src/router/index.js | 9 ++ .../health/psychological-main/index.scss | 92 ++++++++++++ src/views/health/psychological-main/index.vue | 140 ++++++++++++++++++ 7 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 src/assets/img/moderate.png create mode 100644 src/assets/img/regardless.png create mode 100644 src/views/health/psychological-main/index.scss create mode 100644 src/views/health/psychological-main/index.vue diff --git a/README.md b/README.md index b7ab751..6defcdc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -455,4 +455,9 @@ update - 心理监测详情页面 - 增加 动态填充uid - 问卷调查页面 - - 修复 toast无限加载的问题 \ No newline at end of file + - 修复 toast无限加载的问题 + +## v1.0.56 +`2023.6.1` +feature +- 增加 一个心理详情汇总页面 \ No newline at end of file diff --git a/src/assets/img/moderate.png b/src/assets/img/moderate.png new file mode 100644 index 0000000000000000000000000000000000000000..d106db9ad7fb49c193ddc84a9ab138a79004df52 GIT binary patch literal 1904 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 literal 0 HcmV?d00001 diff --git a/src/config/models.js b/src/config/models.js index 424451a..59f0f71 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.55F'; //版本号 +export const VERSION_MODEL = '1.0.56F'; //版本号 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 cf7fb38..83e6896 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,3 +1,10 @@ +/* + * @Date: 2023-05-30 15:37:06 + * @LastEditors: JinxChen + * @LastEditTime: 2023-06-01 09:48:23 + * @FilePath: \TelpoH5FrontendWeb\src\router\index.js + * @description: + */ /* * @Date: 2023-02-25 16:34:35 * @LastEditors: JinxChen @@ -38,6 +45,8 @@ const routes = [ // 健康-心理监测详情，抑郁，压力和疲劳 { path: '/psychological', name: 'psychological', component: resolve => require(['@/views/health/psychological'], resolve) }, + // 健康-抑郁，压力和疲劳汇总入口 + { path: '/psychologicalMain', name: 'psychologicalMain', component: resolve => require(['@/views/health/psychological-main'], resolve) }, ]; const router = new VueRouter({ diff --git a/src/views/health/psychological-main/index.scss b/src/views/health/psychological-main/index.scss new file mode 100644 index 0000000..1d9511c --- /dev/null +++ b/src/views/health/psychological-main/index.scss @@ -0,0 +1,92 @@ +.psychological-main-container { + height: 100vh; + width: 100%; + overflow: hidden; + background-color: #F4F8FB; + .main { + height: calc(100vh - 45px); + background-color: #F4F8FB; + padding: 15px; + .list { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #FFFFFF; + border-radius: 15px; + padding: 10px; + .item { + display: flex; + justify-content: center; + align-items: flex-start; + flex-direction: column; + height: 103px; + width: 93px; + /* margin: 0 5px; + padding: 5px; */ + padding: 5px; + border-radius: 10px; + &.depression { + background: linear-gradient(-29deg, #F2F9FE, #D7E8FD); + } + &.stress { + background: linear-gradient(-29deg, #F9E2E6, #FEF8F4); + } + &.tiredness { + background: linear-gradient(-29deg, #FDFBEE, #FAE4CC); + } + p { + font-size: 16px; + } + .health-value { + font-size: 24px; + font-weight: bold; + } + .health-name { + color: #282828; + font-size: 14px; + } + .health-result { + display: flex; + justify-content: space-between; + align-items: center; + .left { + @include center(); + border-radius: 8px; + padding: 2px 5px; + margin: 6px 0; + &.depression { + background: #BCCDE5; + } + &.stress { + background: #F0D1D4; + } + &.tiredness { + background: #EAD9C5; + } + .result { + font-size: 12px; + color: #ffffff; + } + } + .right { + @include center(); + img { + height: 18px; + width: 18px; + margin-left: 3px + } + } + } + .health-time { + display: flex; + justify-content: flex-start; + align-items: flex-start; + .time { + font-size: 12px; + color: #8B8B8B; + } + } + } + } + } +} \ No newline at end of file diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue new file mode 100644 index 0000000..10e84e2 --- /dev/null +++ b/src/views/health/psychological-main/index.vue @@ -0,0 +1,140 @@ + + + + +