From cf830b894469deda7983f2c4f2a7d7318264b45e Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Wed, 21 Jun 2023 16:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20=20=20-?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=20Advice=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                | 6 ++++--
 src/views/health/psychological/index.vue | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8c659ad..0b27fac 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-19 17:14:23
+ * @LastEditTime: 2023-06-21 16:31:04
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -517,4 +517,6 @@ update
 `2023.6.21`
 update
 - 心理建模进度查询
-    - 增加 建模中，有2个步骤，如果任一步骤已经完成，则该步骤可以隐藏显示。
\ No newline at end of file
+    - 增加 建模中，有2个步骤，如果任一步骤已经完成，则该步骤可以隐藏显示。
+    - 修复 图表时间格式转换错误的问题
+    - 增加 Advice字段显示
\ No newline at end of file
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index ec11198..49af96a 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -143,7 +143,7 @@
 
                             <p class="title-emo" :style="{color: currentColor}">{{ result }}</p>
 
-                            <span class="font-28">继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。</span>
+                            <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{ advice }}</span>
                         </div>
 
                         <div class="friendly-reminder">
@@ -309,7 +309,8 @@ export default {
             ],
             // 选中的日历日期
             selectDate: '',
-            uid: ''
+            uid: '',
+            advice: ''
         };
     },
     computed: {
@@ -801,11 +802,12 @@ export default {
                         // x轴显示数据
                         this.xAxisData = data.ChartDatas.map(item => {
                             return this.$dayjs(item.Key.replace(/-/g, "/")).format(
-                                "hh:mm"
+                                "HH:mm"
                             );
                         });
                         // 结果解读
                         this.result = data.Result;
+                        this.advice = data.Advice;
                         this.$toast.loading({
                             message: '数据加载完成'
                         });