Merge branch 'update' into test

README.md

@@ -925,4 +925,10 @@ fix
 ## v1.0.119
 `2024.3.26`
 fix
-- 修复 心理监测详情心理组件切换历史检测数据没有发生变化的问题
+- 修复 心理监测详情心理组件切换历史检测数据没有发生变化的问题
+
+
+## v1.0.120
+`2024.4.3`
+update
+- ‘焦虑’文字  改成‘忧郁’，

src/config/models.js

@@ -8,7 +8,7 @@
 import store from "@/store";
 // 情绪模型
 const appTypeList = ['1'];
-export const VERSION_MODEL = '1.0.119F'; //版本号
+export const VERSION_MODEL = '1.0.120F'; //版本号
 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/views/health/psychological-main/index.vue

@@ -159,9 +159,9 @@ export default {
             // 抑郁指数
             {
               value: data.DepScore,
-              name: this.$replaceAll(`抑郁指数`, '抑郁', '焦虑'),
+              name: this.$replaceAll(`抑郁指数`, '抑郁', '忧郁'),
               class: "depression",
-              result: this.$replaceAll(data.DepDesc, '抑郁', '焦虑'),
+              result: this.$replaceAll(data.DepDesc, '抑郁', '忧郁'),
               time: data.DepMeasureUpdateTime
                 ? this.$dayjs(data.DepMeasureUpdateTime).format("HH:mm")
                 : "",

src/views/health/psychological/index.vue

@@ -142,7 +142,7 @@
               <span class="title-reminder">结果解读</span>
 
               <p class="title-emo" :style="{ color: currentColor }">
-                {{ this.$replaceAll(result, '抑郁', '焦虑') }}
+                {{ this.$replaceAll(result, '抑郁', '忧郁') }}
               </p>
 
               <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{
@@ -271,7 +271,7 @@ export default {
       psyList: [
         { name: "tiredness", text: "疲劳", value: 0 },
         { name: "stress", text: "压力", value: 1 },
-        { name: "depression", text: this.$replaceAll('抑郁', '抑郁', '焦虑'), value: 2 },
+        { name: "depression", text: this.$replaceAll('抑郁', '抑郁', '忧郁'), value: 2 },
       ],
       // 当前情绪下标
       psyCurrent: 0,
@@ -390,7 +390,7 @@ export default {
   computed: {
     anxietyText() {
       const appTypeList = ['1'];
-      return appTypeList.indexOf(this.$store.getters.appType) > -1 ? `焦虑` : `抑郁`
+      return appTypeList.indexOf(this.$store.getters.appType) > -1 ? `忧郁` : `抑郁`
     },
     // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
     defaultOptions() {
@@ -685,16 +685,16 @@ export default {
       /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
     },
     title1() {
-      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title1, '抑郁', '焦虑') : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title1, '抑郁', '忧郁') : ''
     },
     article1() {
-      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].article1, '抑郁', '焦虑') : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].article1, '抑郁', '忧郁') : ''
     },
     title2() {
-      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title2, '抑郁', '焦虑') : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title2, '抑郁', '忧郁') : ''
     },
     article2() {
-      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].article2, '抑郁', '焦虑') : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].article2, '抑郁', '忧郁') : ''
     },
     // 当前情绪颜色
     currentColor() {
@@ -744,7 +744,7 @@ export default {
     loadParams() {
       let params = this.$route.query;
       if (params) {
-        this.emoName = this.$replaceAll(EmotionModel[params.name].name, '抑郁', '焦虑');
+        this.emoName = this.$replaceAll(EmotionModel[params.name].name, '抑郁', '忧郁');
         this.emoType = EmotionModel[params.name].type;
         this.uid = params.uid;
         this.routeDate = params.date;
@@ -1278,7 +1278,7 @@ export default {
     // 点击情绪tab
     onPsyTabClick(name, index) {
       this.psyCurrent = index;
-      this.emoName = this.$replaceAll(EmotionModel[name].name, '抑郁', '焦虑');
+      this.emoName = this.$replaceAll(EmotionModel[name].name, '抑郁', '忧郁');
       this.currentEmoName = name;
       this.emoType = EmotionModel[name].type;
       console.log("this.currentDays", this.currentDays);
@@ -1460,7 +1460,7 @@ export default {
                   .replace(/-/g, ".")
                   .replace(/~/g, "-"),
                 recordId: item.RecordId,
-                summary: this.$replaceAll(item.Summary, '抑郁', '焦虑'),
+                summary: this.$replaceAll(item.Summary, '抑郁', '忧郁'),
                 summaryLevel: item.SummaryLevel,
                 type: this.emoType,
               };

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

@@ -688,9 +688,9 @@ export default {
             this.statisticsList = [];
             this.emotionList = [];
             this.weekResult = data;
-            this.weekResult.Explain = this.$replaceAll(data.Explain, '抑郁', '焦虑')
-            this.weekResult.Summary = this.$replaceAll(data.Summary, '抑郁', '焦虑')
-            this.weekResult.Advice = this.$replaceAll(data.Advice, '抑郁', '焦虑')
+            this.weekResult.Explain = this.$replaceAll(data.Explain, '抑郁', '忧郁')
+            this.weekResult.Summary = this.$replaceAll(data.Summary, '抑郁', '忧郁')
+            this.weekResult.Advice = this.$replaceAll(data.Advice, '抑郁', '忧郁')
             this.emoName = this.calcTitle(data.Type);
           }
           let None = {

src/views/psychological-modeling/index.vue

@@ -85,8 +85,8 @@ export default {
     },
     tips() {
       return this.info.isFirstModeling === 1
-        ? `首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算${this.$replaceAll('抑郁', '抑郁', '焦虑')}、压力、疲劳分值。`
-        : `由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算${this.$replaceAll('抑郁', '抑郁', '焦虑')}、压力、疲劳的分值。`;
+        ? `首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算${this.$replaceAll('抑郁', '抑郁', '忧郁')}、压力、疲劳分值。`
+        : `由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算${this.$replaceAll('抑郁', '抑郁', '忧郁')}、压力、疲劳的分值。`;
     },
   },
   mounted() {