From 4778322b5e513386fa852ae9c78e16b627e5e3af Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Thu, 2 Nov 2023 09:16:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E6=83=85=20=20=20=20=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA=E8=AF=AD=20-?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E4=B8=80=E4=B8=AA=E5=91=A8=E6=8A=A5/?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  | 12 +++++++++--
 src/config/models.js                       |  4 ++--
 src/views/health/psychological/index.vue   |  3 ++-
 src/views/health/psychological/report.scss | 21 ++++++++++++++++++
 src/views/health/psychological/report.vue  | 25 ++++++++++++++++++----
 5 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 src/views/health/psychological/report.scss

diff --git a/README.md b/README.md
index 64a699d..380ba17 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 10:07:43
+ * @LastEditTime: 2023-11-02 09:12:50
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -762,4 +762,12 @@ fix
 `2023.10.30`
 fix
 - 话费查询
-    - 修复 异步问题导致首次进入页面白屏的问题
\ No newline at end of file
+    - 修复 异步问题导致首次进入页面白屏的问题
+
+
+## v1.0.96
+`2023.11.2`
+update
+- 心理监测详情
+    - 修改 温馨提示语
+- 新增 一个周报/月报页面
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index c5bb08a..7f05ebd 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 10:07:56
+ * @LastEditTime: 2023-11-02 09:12:59
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.95F'; //版本号
+export const VERSION_MODEL = '1.0.96F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index a22218d..1c703b8 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -615,7 +615,8 @@ export default {
             return `${today}${this.emoName}数据图`;
         },
         warmTips() {
-            return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。`
+            return `正常连续佩戴腕表，每半小时计算一个${this.emoName}分值。`;
+            /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
         },
         title1() {
             return EmotionModel[this.params.name].title1;
diff --git a/src/views/health/psychological/report.scss b/src/views/health/psychological/report.scss
new file mode 100644
index 0000000..57e1b92
--- /dev/null
+++ b/src/views/health/psychological/report.scss
@@ -0,0 +1,21 @@
+.report{
+    height: 100vh;
+    width: 100%;
+    overflow: hidden;
+    background-color: #fff;
+    .main {
+        height: calc(100vh - 45px);
+        overflow: scroll;
+        padding: 5px 15px;
+        h5 {
+            font-size: 16px;
+        }
+        .overall-rating {
+            display: flex;
+            justify-content: flex-start;
+            align-items: flex-start;
+            flex-direction: column;
+            font-size: 14px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/views/health/psychological/report.vue b/src/views/health/psychological/report.vue
index e4a5e25..5151ffc 100644
--- a/src/views/health/psychological/report.vue
+++ b/src/views/health/psychological/report.vue
@@ -1,18 +1,35 @@
 <!--
  * @Date: 2023-10-30 11:30:22
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 11:40:51
+ * @LastEditTime: 2023-10-30 15:56:20
  * @FilePath: \TelpoH5FrontendWeb\src\views\health\psychological\report.vue
  * @description:
 -->
 <template>
     <!-- 周/月报 -->
     <div class="report">
-        <van-nav-bar title="心理周报" :border="true"  :left-arrow="true" @click-left="onNavBack">
+        <van-nav-bar title="心理监测周报" :border="true"  :left-arrow="true" @click-left="onNavBack">
             <template #left>
                 <van-icon name="arrow-left" size="24" style="padding: 0"/>
             </template>
         </van-nav-bar>
+        <div class="main">
+            <!-- 总评 -->
+            <div class="overall-rating">
+                <h5>本周总评:</h5>
+                <p>轻度抑郁倾向</p>
+                <p>监测次数: 20次</p>
+                <p>发发发发发个规格egg嘎嘎</p>
+            </div>
+            <!-- 趋势对比-饼状图 -->
+            <div class="pie-chart"></div>
+            <!-- 数据图-柱形图 -->
+            <div class="bar-chart "></div>
+            <!-- 建议 -->
+            <div class="advise"></div>
+            <!-- 概览 -->
+            <div class="overview"></div>
+        </div>
     </div>
 </template>
 
@@ -31,6 +48,6 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+@import "./report.scss";
 </style>