Explorar el Código

Merge branch 'develop'

master
chenJinxu hace 8 meses
padre
commit
1afe3863ad
Se han modificado 3 ficheros con 9 adiciones y 2 borrados
  1. +5
    -0
      README.md
  2. +1
    -1
      src/config/models.js
  3. +3
    -1
      src/views/health/psychological/index.vue

+ 5
- 0
README.md Ver fichero

@@ -926,3 +926,8 @@ update
`2024.3.25`
fix
- 修复 心理监测详情中间组件颜色与接口返回的等级颜色不一致的问题

## v1.0.119
`2024.3.26`
fix
- 修复 心理监测详情心理组件切换历史检测数据没有发生变化的问题

+ 1
- 1
src/config/models.js Ver fichero

@@ -8,7 +8,7 @@
import store from "@/store";
// 情绪模型
const appTypeList = ['1'];
export const VERSION_MODEL = '1.0.118F'; //版本号
export const VERSION_MODEL = '1.0.119F'; //版本号
export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/',


+ 3
- 1
src/views/health/psychological/index.vue Ver fichero

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

this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
}
this.getCalendarData();
},
getCurrentMonthStaAndEnd(currentDate) {
let list = [];


Cargando…
Cancelar
Guardar