Browse Source

Merge branch 'develop' into test

test
JinxChen 1 year ago
parent
commit
c44a249150
3 changed files with 12 additions and 6 deletions
  1. +7
    -1
      README.md
  2. +2
    -2
      src/config/models.js
  3. +3
    -3
      src/views/health/psychological/index.vue

+ 7
- 1
README.md View File

@@ -613,4 +613,10 @@ update
update
- 心理监测详情
- 修改 页面文字
- 修改 页面方框文字大小
- 修改 页面方框文字大小

## v1.0.76
`2023.7.6`
update
- 心理监测详情
- 修改 30天查询条件,从当月月初至月尾改成当天-30天

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

@@ -1,11 +1,11 @@
/*
* @Date: 2021-11-20 10:26:39
* @LastEditors: JinxChen
* @LastEditTime: 2023-07-05 09:13:53
* @LastEditTime: 2023-07-06 09:12:53
* @FilePath: \TelpoH5FrontendWeb\src\config\models.js
* @description:
*/
export const VERSION_MODEL = '1.0.75F'; //版本号
export const VERSION_MODEL = '1.0.76F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


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

@@ -323,7 +323,7 @@ export default {
selectDate: '',
uid: '',
advice: '',
surveyTitle: '' || '本周概览',
surveyTitle: '' || '7天概览',
routeDate: '',
params: {},
isPopup: false,
@@ -1067,7 +1067,7 @@ export default {
this.currentDays = value;
let currentDate = new Date();
let leftText = value === 0 ? '今天' : value === 7 ? '7天' : '30天';
this.surveyTitle = value === 7 ? '本周概览' : '本月概览';
this.surveyTitle = value === 7 ? '7天概览' : '30天概览';
if (value === 7) {
this.defaultOptions.xAxis.data = [
"周一",
@@ -1093,7 +1093,7 @@ export default {
this.defaultOptions.xAxis.data = this.xAxisData;
this.defaultOptions.series = this.defaultSeries;
this.defaultOptions.series[0].data = this.emotionData;
let dateList = this.getCurrentMonthStaAndEnd(currentDate);
let dateList = this.getPostDate(currentDate, 30, true);
console.log("dateList", dateList);
this.getPsychologiclData('', dateList[0], dateList[1]);
}


Loading…
Cancel
Save