diff --git a/README.md b/README.md index 4558fdc..22da19b 100644 --- a/README.md +++ b/README.md @@ -1199,3 +1199,11 @@ fix `2024.8.21` update - 优化 周报汇总切换 + + +## v1.0.131 + +`2024.9.5` +fix +- 修复 周报初始化图表异常的问题 + diff --git a/src/config/models.js b/src/config/models.js index 039a450..79c1e68 100644 --- a/src/config/models.js +++ b/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/', diff --git a/src/views/health/psychological/index.scss b/src/views/health/psychological/index.scss index 50cada7..0a34089 100644 --- a/src/views/health/psychological/index.scss +++ b/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 { diff --git a/src/views/health/psychological/reportDetails/index.vue b/src/views/health/psychological/reportDetails/index.vue index 6a04175..6cc4758 100644 --- a/src/views/health/psychological/reportDetails/index.vue +++ b/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: {