Merge branch 'develop'

README.md

@@ -1144,3 +1144,10 @@ update
 fix
 
 - 修复 抑郁没有正确转化成忧郁的问题
+
+## v1.0.123
+
+`2024.4.29`
+update
+
+- ‘忧郁’文字  改成‘抑郁’，

src/config/models.js

@@ -8,7 +8,7 @@
 import store from "@/store";
 // 情绪模型
 const appTypeList = ['1'];
-export const VERSION_MODEL = '1.0.122F'; //版本号
+export const VERSION_MODEL = '1.0.123F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
@@ -29,7 +29,7 @@ export const BaiduStatisticsModel = {
 };
 
 // 焦虑文字
-export const anxietyText = appTypeList.indexOf(store.getters.appType) >-1  ? `忧郁`: `抑郁`
+export const anxietyText = '抑郁'/* appTypeList.indexOf(store.getters.appType) >-1  ? `忧郁`: `抑郁` */
 export const EmotionModel = {
     // 抑郁
     depression: {

src/utils/index.js

@@ -100,9 +100,10 @@ export function isShowAntpay(array) {
  */
 export function replaceAll(target, searchValue, replacement) {
     // 应用类型，目前1 是健康好蕴，其他则不替换
-    const appTypeList = ['1'];
-    const appType = store.getters.appType;
-    if(appTypeList.indexOf(appType) > -1) {
+    /* const appTypeList = ['1'];
+    const appType = store.getters.appType; */
+    return target
+    /* if(appTypeList.indexOf(appType) > -1) {
         if(isNotNull(target) && isNotNull(searchValue)) {
             if(target.includes(searchValue)) {
                 return target.replace(new RegExp(searchValue, 'g'), replacement);
@@ -116,6 +117,6 @@ export function replaceAll(target, searchValue, replacement) {
         
     } else {
         return target
-    }
+    } */
     
   }

src/views/health/psychological/report/index.vue

@@ -282,7 +282,7 @@ export default {
   },
   computed: {
     isShowLeft() {
-      return this.params.isShowLeft ? this.params.isShowLeft === 'true' : false
+      return this.params.isShowLeft || this.params.isShowLeft === 'true'
     },
     // 折线图标题
     echartsTitle() {
@@ -584,7 +584,7 @@ export default {
     async loadParams() {
       let params = this.$route.query;
       if (params) {
-        this.params = params;
+        this.params = { ...params };
         if (params.appType) {
           this.$store.commit("appType", params.appType);
         }