Browse Source

Merge branch 'fix' into test

test
chenJinxu 10 months ago
parent
commit
a2525803b4
3 changed files with 14 additions and 5 deletions
  1. +7
    -1
      README.md
  2. +1
    -1
      src/config/models.js
  3. +6
    -3
      src/views/health/psychological/index.vue

+ 7
- 1
README.md View File

@@ -890,4 +890,10 @@ update
`2023.12.29`
update
- 心理监测详情,周报
- 修改 legend图例位置
- 修改 legend图例位置

## v1.0.114
`2024.1.3`
fix
- 心理监测详情
- 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题

+ 1
- 1
src/config/models.js View File

@@ -5,7 +5,7 @@
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.113F'; //版本号
export const VERSION_MODEL = '1.0.114F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 6
- 3
src/views/health/psychological/index.vue View File

@@ -1235,8 +1235,8 @@ export default {
this.defaultOptions.series = this.defaultSeries;
this.defaultOptions.series[0].data = this.emotionData;
this.getPsychologiclData(this.selectDate ? this.selectDate : this.$dayjs(currentDate).format("YYYY-MM-DD"));
this.startDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
this.endDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
this.startDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
this.endDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
} else if(value === 30){
// 30天
this.defaultOptions.xAxis.data = this.xAxisData;
@@ -1262,7 +1262,7 @@ export default {
// 即点击了周报,此时调用获取周报接口
this.getWeekResult();
} else {
this.getPsychologiclData(this.startDate, this.endDate);
this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
}
},
getCurrentMonthStaAndEnd(currentDate) {
@@ -1340,6 +1340,9 @@ export default {
this.dateList[0].text = this.$dayjs(value).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : this.$dayjs(value).format("MM-DD");
this.calendarDialogShow = false;
this.selectDate = selectDate;
this.startDate = selectDate;
this.endDate = selectDate;
this.current = 0;
this.getPsychologiclData(selectDate);
},
// 计算字体显示的颜色


Loading…
Cancel
Save