Merge branch 'feat' into test

README.md

@@ -778,4 +778,12 @@ update
 - 心理监测详情
     - 修改 天数选择方式
 - 心理监测周报
-    - 增加 周报列表和周报详情接口
+    - 增加 周报列表和周报详情接口
+
+
+## v1.0.98
+`2023.11.7`
+fix
+- 心理监测详情
+    - 修复 图表连线点颜色显示不正确的问题
+    - 修复 选项菜单显示异常的问题

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/',

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();

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;

src/views/health/psychological/report/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-10-30 11:30:22
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-11-06 11:01:41
+ * @LastEditTime: 2023-11-07 09:23:17
  * @FilePath: \TelpoH5FrontendWeb\src\views\health\psychological\report\index.vue
  * @description:
 -->
@@ -168,7 +168,7 @@ export default {
        surveyTitle: '本周概览',
        echarts: null,
        // 路由传过来的情绪参数
-       emoName: null,
+       emoName: '',
        pieData: [],
        xAxisData: [],
        pieEcharts: null,