Merge branch 'fix' into test

README.md

@@ -1199,3 +1199,11 @@ fix
 `2024.8.21`
 update
 - 优化 周报汇总切换
+
+
+## v1.0.131
+
+`2024.9.5`
+fix
+- 修复 周报初始化图表异常的问题
+

src/config/models.js

@@ -8,7 +8,7 @@
 import store from "@/store";
 // 情绪模型
 const appTypeList = ['1'];
-export const VERSION_MODEL = '1.0.130F'; //版本号
+export const VERSION_MODEL = '1.0.131F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.scss

@@ -106,7 +106,7 @@ $newBlue: #638EE4;
     }
     .main {
         position: relative;
-        height: calc(100vh - 150px);
+        height: calc(100vh - 110px);
         overflow-y: scroll;
         overflow-x: hidden;
         .top {

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

@@ -908,10 +908,8 @@ export default {
       this.getCalendarData();
 
       this.$nextTick(()=>{
-        this.getPsychologiclData();
-        this.getWeekResultDetail();
         this.getWeekResult();
-        /* this.initEchart(); */
+        this.getWeekResultDetail();
         if(this.params.current) {
           this.current = Number(this.params.current);
           this.currentDays = this.calcDaysByTabClick(
@@ -2038,7 +2036,6 @@ export default {
               },
             };
           });
-          console.log("emotionData", this.emotionData);
           this.weekAndMonData = chartData.map((item, index) => {
             return {
               value: [index, item.MinValue, item.MaxValue],
@@ -2047,7 +2044,7 @@ export default {
           this.xAxisData = chartData.map((item) => {
             return item.Key
               ? this.$dayjs(item.Key.replace(/-/g, "/")).format("MM/DD")
-              : item.key;
+              : item.Key;
           });
           let emphasisStyle = {
             itemStyle: {