Browse Source

Merge branch 'fix' into test

test
chenJinxu 11 months ago
parent
commit
822d5714b6
4 changed files with 21 additions and 12 deletions
  1. +8
    -1
      README.md
  2. +1
    -1
      src/config/models.js
  3. +5
    -4
      src/views/health/psychological-main/index.vue
  4. +7
    -6
      src/views/health/psychological/report/index.scss

+ 8
- 1
README.md View File

@@ -824,4 +824,11 @@ update
`2023.11.22`
fix
- c1后台设备功耗查看页面
- 修复 涉水监测开关显示不正确的问题
- 修复 涉水监测开关显示不正确的问题


## v1.0.104
`2023.12.5`
update
- 心理监测首页
- 修改 菜单顺序

+ 1
- 1
src/config/models.js View File

@@ -5,7 +5,7 @@
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.103F'; //版本号
export const VERSION_MODEL = '1.0.104F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 5
- 4
src/views/health/psychological-main/index.vue View File

@@ -121,12 +121,13 @@ export default {
return this.$toast.fail(res.data.msg);
}
this.healhtList = [
// 抑郁
{ value: data.DepScore, name: '抑郁倾向', class: 'depression', result: data.DepDesc, time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
// 压力
{ value: data.StressScore, name: '压力', class: 'stress', result: data.StressDesc, time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
// 2023.12.5 修改菜单顺序
// 疲劳
{ value: data.TirScore, name: '疲劳', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureUpdateTime ? this.$dayjs(data.TirMeasureUpdateTime).format('HH:mm') : '', level: data.TirLevel, img: data.TirScore ? this.calcImg(data.TirLevel, 'tiredness') : '' },
// 压力
{ value: data.StressScore, name: '压力', class: 'stress', result: data.StressDesc, time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
// 抑郁
{ value: data.DepScore, name: '抑郁倾向', class: 'depression', result: data.DepDesc, time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
];
this.$toast.success('数据加载完成');
}).catch(() =>{}).finally(() => { })


+ 7
- 6
src/views/health/psychological/report/index.scss View File

@@ -126,12 +126,12 @@
.pie-chart-right {
height: 150px;
width: 65%;
padding-right: 20px;
@include center();

.list {
display: flex;
justify-content: center;
flex-direction: column;

.item {
width: 100%;
display: flex;
@@ -139,7 +139,6 @@
align-items: center;
font-size: 12px;
padding: 9px 0;

.item-left {
display: flex;
justify-content: flex-start;
@@ -164,6 +163,9 @@

.item-right {
@include center();
span {
font-size: 12px;
}
}
.status {
padding: 0 5px;
@@ -171,7 +173,7 @@
img {
height: 15px;
width: 9px;
padding: 0 5px ;
padding: 0 3px ;
}
}
}
@@ -181,8 +183,7 @@

.statistics {
position: relative;
padding: 0px 14px 5px 14px;

padding: 5px 14px 5px 14px;
.list {
flex: 1;
width: 100%;


Loading…
Cancel
Save