Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-07-08 16:26:33
+ * @LastEditTime: 2023-07-12 16:52:18
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -650,4 +650,11 @@ update
 `2023.7.10`
 update
 - 心理监测详情
-    - 修改 饼状图右边百分比取整方式，四舍五入
+    - 修改 饼状图右边百分比取整方式，四舍五入
+
+
+## v1.0.81
+`2023.7.12`
+update
+- 心理监测详情
+    - 修改 心情等级日历数据接口参数，增加 startDate 和 endDate，删除month参数

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-07-08 16:26:44
+ * @LastEditTime: 2023-07-12 16:52:30
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.80F'; //版本号
+export const VERSION_MODEL = '1.0.81F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.vue

@@ -690,10 +690,14 @@ export default {
         },
         // 获取这个月中有数据的日期，控制日历组件的日期样式
         getCalendarData() {
+            let currentDate = new Date();
+            // 获取最近30天的心情等级日历数据
+            let dateList = this.getPostDate(currentDate, 30, true);
             let reqUrl = `https://dbmq.rzliot.com/heart/api/Data/GetCalendarData`;
             let reqParams = {
                 uid: this.uid,
-                month: this.$dayjs(new Date()).format('YYYY-MM')
+                startDate: dateList[0],
+                endDate: dateList[1],
             };
             axios.get(reqUrl, {
                 params: { ...reqParams },