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] =?UTF-8?q?fix=20-=20=E5=BF=83=E7=90=86=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E8=BF=9E=E7=BA=BF=E7=82=B9=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=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,