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 0000000..d106db9 Binary files /dev/null and b/src/assets/img/moderate.png differ diff --git a/src/assets/img/regardless.png b/src/assets/img/regardless.png new file mode 100644 index 0000000..0f3b203 Binary files /dev/null and b/src/assets/img/regardless.png differ 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 @@ + + + + +