|
@@ -823,7 +823,7 @@ export default { |
|
|
let data = res.data.response; |
|
|
let data = res.data.response; |
|
|
// const mergedArr = [...new Set([...arr1, ...arr2, ...arr3])]; |
|
|
// const mergedArr = [...new Set([...arr1, ...arr2, ...arr3])]; |
|
|
/* let name = this.params.name.charAt(0).toUpperCase()+ this.params.name.slice(1); */ |
|
|
/* let name = this.params.name.charAt(0).toUpperCase()+ this.params.name.slice(1); */ |
|
|
let currentName = this.params.name; |
|
|
|
|
|
|
|
|
let currentName = this.currentEmoName; |
|
|
let list = []; |
|
|
let list = []; |
|
|
if (currentName === "stress") { |
|
|
if (currentName === "stress") { |
|
|
list = data.Stress; |
|
|
list = data.Stress; |
|
@@ -1286,8 +1286,10 @@ export default { |
|
|
// 即点击了周报,此时调用获取周报接口 |
|
|
// 即点击了周报,此时调用获取周报接口 |
|
|
this.getWeekResult(); |
|
|
this.getWeekResult(); |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
this.getPsychologiclData(this.selectDate, this.startDate, this.endDate); |
|
|
this.getPsychologiclData(this.selectDate, this.startDate, this.endDate); |
|
|
} |
|
|
} |
|
|
|
|
|
this.getCalendarData(); |
|
|
}, |
|
|
}, |
|
|
getCurrentMonthStaAndEnd(currentDate) { |
|
|
getCurrentMonthStaAndEnd(currentDate) { |
|
|
let list = []; |
|
|
let list = []; |
|
|