From de00ec5a9c44a11bdce60a2c101c1d5a0a7d2d17 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Tue, 12 Dec 2023 09:06:34 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=83=85=E7=BB=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/health/psychological/index.scss     | 42 ++++++++-
 src/views/health/psychological/index.vue      | 92 ++++++++++++++++++-
 .../health/psychological/report/index.vue     |  8 +-
 3 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/src/views/health/psychological/index.scss b/src/views/health/psychological/index.scss
index bf6ce58..4f2d506 100644
--- a/src/views/health/psychological/index.scss
+++ b/src/views/health/psychological/index.scss
@@ -4,7 +4,7 @@ $newBlue: #638EE4;
     width: 100%;
     overflow: hidden;
     background-color: #fff;
-    .tab-bar {
+    .tab-bar{
         width: 100%;
         position: relative;
         .date-tab-con {
@@ -68,9 +68,45 @@ $newBlue: #638EE4;
             }
         }
     }
+    .psy-tab-bar {
+        height: 40px;
+        position: relative;
+        margin: 5px 0;
+        padding: 0 10px;
+        .psy-tab-con {
+            background-color: #EEEEEE;
+            border-top-left-radius: 20px;
+            border-top-right-radius: 20px;
+            border-bottom-left-radius: 20px;
+            border-bottom-right-radius: 20px;
+            .psy-tab-list {
+                display: flex;
+                justify-content: space-around;
+                align-items: center;
+                color: #fff;
+                height: 40px;
+                width: 100%;
+                /* background-color: red; */
+                .psy-tab-item {
+                    position: relative;
+                    padding: 0 10px;
+                    color: #6D6D6D;
+                    height: 100%;
+                    width: 100%;
+                    font-size: 18px;
+                    border-radius: 20px;
+                    @include center();
+                    &.active {
+                        color: #FFFFFF;
+                        background-color: #638EE4;
+                    }
+                }
+            }
+        }
+    }
     .main {
         position: relative;
-        height: calc(100vh - 90px);
+        height: calc(100vh - 150px);
         overflow: scroll;
         .top {
             flex: 1;
@@ -334,7 +370,7 @@ $newBlue: #638EE4;
         }
         &.report {
             position: relative;
-            height: calc(100vh - 90px);
+            height: calc(100vh - 150px);
             overflow: scroll;
             background-color: #f5f5f5;
             .content {
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 11476d2..c7f62de 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -22,6 +22,19 @@
                 </div>
             </div>
         </div>
+        <!-- 情绪切换 -->
+        <div class="psy-tab-bar">
+            <div class="psy-tab-con">
+                <div class="psy-tab-list">
+                    <div :class="['psy-tab-item', {active: psyCurrent === index, notClick: false}]"
+                    @click="onPsyTabClick(item.name, index)"
+                    v-for="(item, index) in psyList"
+                    :key="index">
+                    <span>{{item.text}}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="main" v-show="current !== 3">
             <div class="top">
                 <!-- 日期选择 -->
@@ -261,6 +274,14 @@ export default {
                 { name: "month", text: "30天", value: 30 },
                 { name: "weekReport", text: "周报", value: 49 }
             ],
+            // 情绪tab
+            psyList: [
+                {name: 'tiredness', text: '疲劳', value: 0},
+                {name: 'stress', text: '压力', value: 1},
+                {name: 'depression', text: '抑郁', value: 2},
+            ],
+            // 当前情绪下标
+            psyCurrent: 0,
             current: 0, // 日期选择标签-当前选中的标签
             currentDays: 0, //日期选择标签-日期参数
             emotionData: [], //情绪数据，TODO 接口对接
@@ -382,6 +403,9 @@ export default {
             moreImg: require("@/assets/img/psychological/more.png"),
             noDataImg: require("@/assets/img/no_data_01.png"),
             weekList: [],
+            startDate: '', //接口需要的开始时间
+            endDate: '', //接口需要的结束时间
+            currentEmoName: '', //当前情绪名称
         };
     },
     computed: {
@@ -713,6 +737,8 @@ export default {
     mounted() {
         this.initEchart();
         this.current = Number(this.$store.getters.tabClick) || 0;
+        this.currentDays = this.calcDaysByTabClick(Number(this.$store.getters.tabClick));
+        this.psyCurrent = this.calcPsyTabindex(EmotionModel[this.params.name].type);
         window.document.title = '心理监测';
     },
     methods: {
@@ -724,6 +750,7 @@ export default {
                 this.uid = params.uid;
                 this.routeDate = params.date;
                 this.params = params;
+                this.currentEmoName = params.name;
                 if(params.date) {
                     this.dateList[0].text =  this.$dayjs(params.date).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : this.$dayjs(params.date).format("MM-DD");
                     this.defaultDate = new Date(
@@ -736,6 +763,44 @@ export default {
                 }
             }
         },
+        // 计算点击的天数
+        calcDaysByTabClick(value) {
+            let days = '';
+            console.log("value", value);
+            switch(value) {
+                case 0:
+                days = 0;
+                    break;
+                case 1:
+                days = 7;
+                    break;
+                case 2:
+                days = 30;
+                    break;
+                case 3:
+                days = 49;
+                    break;
+                default: break;
+            };
+            return days
+        },
+        // 计算psyTab的下标值
+        calcPsyTabindex(type) {
+            let psyIndex = '';
+            switch(type) {
+                case 1:
+                    psyIndex = 1;
+                    break;
+                case 2:
+                    psyIndex = 2;
+                    break;
+                case 3:
+                    psyIndex = 0;
+                    break;
+                default: break;
+            };
+            return psyIndex
+        },
         // 获取这个月中有数据的日期，控制日历组件的日期样式
         getCalendarData() {
             let currentDate = new Date();
@@ -1162,12 +1227,16 @@ export default {
             if (value === 7) {
                 let dateList = this.getPostDate(currentDate, 6, true);
                 this.getPsychologiclData('', dateList[0], dateList[1]);
+                this.startDate = dateList[0];
+                this.endDate = dateList[1];
             } else if (value === 0) {
                 // 今天
                 this.defaultOptions.xAxis.data = this.xAxisData;
                 this.defaultOptions.series = this.defaultSeries;
                 this.defaultOptions.series[0].data = this.emotionData;
-                this.getPsychologiclData(this.selectDate ?  this.selectDate : this .$dayjs(currentDate).format("YYYY-MM-DD"));
+                this.getPsychologiclData(this.selectDate ?  this.selectDate : this.$dayjs(currentDate).format("YYYY-MM-DD"));
+                this.startDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
+                this.endDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
             } else if(value === 30){
                 // 30天
                 this.defaultOptions.xAxis.data = this.xAxisData;
@@ -1175,11 +1244,27 @@ export default {
                 this.defaultOptions.series[0].data = this.emotionData;
                 let dateList = this.getPostDate(currentDate, 30, true);
                 this.getPsychologiclData('', dateList[0], dateList[1]);
+                this.startDate = dateList[0];
+                this.endDate = dateList[1];
             } else {
                 // 周报菜单
                 this.getWeekResult();
             }
         },
+        // 点击情绪tab
+        onPsyTabClick(name, index) {
+            this.psyCurrent = index;
+            this.emoName = EmotionModel[name].name;
+            this.currentEmoName = name;
+            this.emoType = EmotionModel[name].type;
+            console.log("this.currentDays", this.currentDays);
+            if(this.currentDays === 49) {
+                // 即点击了周报,此时调用获取周报接口
+                this.getWeekResult();
+            } else { 
+                this.getPsychologiclData(this.startDate, this.endDate);
+            }
+        },
         getCurrentMonthStaAndEnd(currentDate) {
             let list = [];
             let monthStart = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1); // 获取本月第一天的日期时间
@@ -1336,8 +1421,9 @@ export default {
                 name: 'psychologicalReport',
                 query: {
                     recordId: recordId,
-                    name: 'depression',
-                    isShowLeft: true
+                    name: this.currentEmoName,
+                    isShowLeft: true,
+                    uid: this.uid
                 }
             })
         }
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 4bd8b5d..0b76975 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -920,7 +920,13 @@ export default {
             this.pieEcharts.setOption(this.pieOption);
     },
     onNavBack() {
-        this.$router.go(-1);
+        this.$router.push({
+            name: 'psychological',
+            query: {
+                uid: this.params.uid,
+                name: this.params.name
+            }
+        });
     },
     // 计算字体显示的颜色
     calcColor(value) {

From 421ca788c937773761f687ec5c20b0486afc5b48 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Wed, 13 Dec 2023 18:34:20 +0800
Subject: [PATCH 02/14] =?UTF-8?q?`2023.12.13`=20update=20-=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AE=BE=E7=BD=AE=E5=88=97=E8=A1=A8=20=20=20=20=20-?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=20=E5=85=A8=E9=83=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=AE=8C=E6=88=90=E6=89=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                            | 8 +++++++-
 src/config/models.js                                 | 2 +-
 src/views/gps-card-frontend/device-setting/index.vue | 7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1d8a57e..dd1d8fe 100644
--- a/README.md
+++ b/README.md
@@ -865,4 +865,10 @@ update
 `2023.12.12`
 update
 - 心理监测周报列表
-    - 增加 无数据文字提示
\ No newline at end of file
+    - 增加 无数据文字提示
+
+## v1.0.110
+`2023.12.13`
+update
+- 设备设置列表
+    - 优化 全部接口响应完成才加载完成
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index d101486..503f39e 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.109F'; //版本号
+export const VERSION_MODEL = '1.0.110F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/gps-card-frontend/device-setting/index.vue b/src/views/gps-card-frontend/device-setting/index.vue
index 90682a1..ffe908f 100644
--- a/src/views/gps-card-frontend/device-setting/index.vue
+++ b/src/views/gps-card-frontend/device-setting/index.vue
@@ -104,12 +104,15 @@ export default {
         const promise = Promise.all(allPromise);
         try {
             const result = await promise;
-            if(result) {
+            const isLoadAllSuccess = result.every(item => {
+              return item;
+            });
+            if(isLoadAllSuccess) {
                 this.$toast.success({
                     message: '数据加载完成',
                     duration: 2000
                 });
-            }
+            };
         } catch(error){
             console.log('error', error);
             this.$toast.clear();

From 6b8b73bd29b37153cd61971b7f29ca0ade5ea127 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 15 Dec 2023 18:14:21 +0800
Subject: [PATCH 03/14] =?UTF-8?q?fix=20-=20=E8=AE=BE=E5=A4=87=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=88=97=E8=A1=A8=20=20=20=20=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E6=8E=A5=E5=8F=A3=E6=9C=AA=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8F=90=E7=A4=BA=E5=8A=A0=E8=BD=BD=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  8 +++++-
 src/config/models.js                          |  2 +-
 .../device-setting/index.vue                  | 27 ++++++++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index dd1d8fe..edd5582 100644
--- a/README.md
+++ b/README.md
@@ -871,4 +871,10 @@ update
 `2023.12.13`
 update
 - 设备设置列表
-    - 优化 全部接口响应完成才加载完成
\ No newline at end of file
+    - 优化 全部接口响应完成才加载完成
+
+## v1.0.111
+`2023.12.15`
+fix
+- 设备设置列表
+    - 修复 接口未响应完成提示加载完成
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index 503f39e..8259e79 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.110F'; //版本号
+export const VERSION_MODEL = '1.0.111F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/gps-card-frontend/device-setting/index.vue b/src/views/gps-card-frontend/device-setting/index.vue
index ffe908f..7fad3c0 100644
--- a/src/views/gps-card-frontend/device-setting/index.vue
+++ b/src/views/gps-card-frontend/device-setting/index.vue
@@ -112,7 +112,13 @@ export default {
                     message: '数据加载完成',
                     duration: 2000
                 });
-            };
+            } else {
+                this.$toast.clear();
+                this.$dialog.comfirm({
+                    title: '提示',
+                    message: '请重新进入或者刷新页面'
+                })
+            }
         } catch(error){
             console.log('error', error);
             this.$toast.clear();
@@ -223,8 +229,9 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = this.concatTitle('加强省电模式','关闭', '耗电低');
                 }
+                resolve(true)
             });
-            resolve(true)
+            
         })
     },
     // 获取设备定位参数
@@ -257,8 +264,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = this.concatTitle('定位监测','关闭', '耗电低');
                 }
+                resolve(true)
             });
-            resolve(true)
         })
     },
     // 获取免告警水域
@@ -320,8 +327,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('危险区域监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
 
@@ -409,8 +416,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('健康监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 获取血压监测参数设置
@@ -449,8 +456,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('血压监测','关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 格式化等级
@@ -516,8 +523,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('心理监测', '关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
      // 转换时间格式
@@ -605,8 +612,8 @@ export default {
                     this.settingItems[findIndex].text = this.concatTitle('佩戴监测', '关闭', '耗电低');
                     this.settingItems[findIndex].data = [];
                 }
+                resolve(true)
             });
-            resolve(true);
         })
 
     },
@@ -632,8 +639,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = '上报周期(关闭)';
                 }
+                resolve(true)
             });
-            resolve(true);
         })
     },
     // 获取设备状态
@@ -659,8 +666,8 @@ export default {
                 } else {
                     this.settingItems[findIndex].text = `设备状态(无数据)`;
                 }
+                resolve(true)
             });
-            resolve(true);
        })
     },
     // 计算设备状态

From 3a95d16fad4aa4e9900a1d1ce7e742b62ccb0bb7 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 28 Dec 2023 14:31:34 +0800
Subject: [PATCH 04/14] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E9=A6=96=E9=A1=B5=20=20=20=20=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=A0=87=E9=A2=98=E4=B8=BA=E5=BF=83=E7=90=86?=
 =?UTF-8?q?=E5=91=B5=E6=8A=A4=20=20=20=20=20-=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=8C=87=E6=A0=87=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  9 ++++++++-
 src/config/models.js                          |  2 +-
 src/views/health/psychological-main/index.vue | 20 +++++++++----------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index edd5582..9d92733 100644
--- a/README.md
+++ b/README.md
@@ -877,4 +877,11 @@ update
 `2023.12.15`
 fix
 - 设备设置列表
-    - 修复 接口未响应完成提示加载完成
\ No newline at end of file
+    - 修复 接口未响应完成提示加载完成
+
+## v1.0.112
+`2023.12.28`
+update
+- 心理监测首页
+    - 修改 标题为心理呵护
+    - 修改 三个指标文字
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index 8259e79..f4a304c 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.111F'; //版本号
+export const VERSION_MODEL = '1.0.112F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 6aff031..3bcff76 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -50,9 +50,9 @@ export default {
   data(){
    return {
        healhtList: [
-          /*  { value: 40, name: '抑郁倾向', class: 'depression',result: '无抑郁倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
-           { value: 55, name: '压力', class: 'stress', result: '轻度压力', time: '17:52', img: require('@/assets/img/regardless.png') },
-           { value: 75, name: '疲劳', class: 'tiredness', result: '中度疲劳', time: '17:52', img: require('@/assets/img/moderate.png') }, */
+          /*  { value: 40, name: '抑郁指数', class: 'depression',result: '无抑郁倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
+           { value: 55, name: '压力指数', class: 'stress', result: '轻度压力', time: '17:52', img: require('@/assets/img/regardless.png') },
+           { value: 75, name: '疲劳指数', class: 'tiredness', result: '中度疲劳指数', time: '17:52', img: require('@/assets/img/moderate.png') }, */
        ],
        uid: '',
        routeDate: '',
@@ -68,7 +68,7 @@ export default {
   mounted() {
     this.loadParams();
     this.$store.commit('tabClick', 0);
-    window.document.title = '心理监测';
+    window.document.title = '心理呵护';
   },
   methods: {
     //   获取b端token
@@ -122,12 +122,12 @@ export default {
             }
             this.healhtList = [
                 // 2023.12.5 修改菜单顺序
-                // 疲劳
-                { value: data.TirScore,  name: '疲劳', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureUpdateTime ? this.$dayjs(data.TirMeasureUpdateTime).format('HH:mm') : '', level: data.TirLevel, img: data.TirScore ? this.calcImg(data.TirLevel, 'tiredness') : '' },
-                // 压力
-                { value: data.StressScore,  name: '压力', class: 'stress', result: data.StressDesc, time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
-                // 抑郁
-                { value: data.DepScore,  name: '抑郁倾向', class: 'depression', result: data.DepDesc, time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
+                // 疲劳指数
+                { value: data.TirScore,  name: '疲劳指数', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureUpdateTime ? this.$dayjs(data.TirMeasureUpdateTime).format('HH:mm') : '', level: data.TirLevel, img: data.TirScore ? this.calcImg(data.TirLevel, 'tiredness') : '' },
+                // 压力指数
+                { value: data.StressScore,  name: '压力指数', class: 'stress', result: data.StressDesc, time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
+                // 抑郁指数
+                { value: data.DepScore,  name: '抑郁指数', class: 'depression', result: data.DepDesc, time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
             ];
             this.$toast.success('数据加载完成');
         }).catch(() =>{}).finally(() => {  })

From ea18f895d829eee4e11947945ad0183b1de702b1 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 29 Dec 2023 10:09:52 +0800
Subject: [PATCH 05/14] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E6=83=85=EF=BC=8C=E5=91=A8=E6=8A=A5=20=20=20?=
 =?UTF-8?q?=20=20-=20=E4=BF=AE=E6=94=B9=20legend=E5=9B=BE=E4=BE=8B?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  8 +++++-
 src/config/models.js                          |  2 +-
 src/views/health/psychological/index.vue      | 26 +++++++++----------
 .../health/psychological/report/index.vue     | 23 ++++++++--------
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 9d92733..3b7807a 100644
--- a/README.md
+++ b/README.md
@@ -884,4 +884,10 @@ fix
 update
 - 心理监测首页
     - 修改 标题为心理呵护
-    - 修改 三个指标文字
\ No newline at end of file
+    - 修改 三个指标文字
+
+## v1.0.113
+`2023.12.29`
+update
+- 心理监测详情，周报
+    - 修改 legend图例位置
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index f4a304c..260c59b 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.112F'; //版本号
+export const VERSION_MODEL = '1.0.113F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 831a799..8d1159b 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -429,7 +429,7 @@ export default {
                 legend: {
                     width: "65%",
                     orient: "horizontal",
-                    right: 'right',
+                    right: '5%',
                     top: 1,
                     bottom: "1%",
                     itemHeight: 12,
@@ -438,31 +438,31 @@ export default {
                     align: 'left',
                     selectedMode: false,
                     data: [
-
                         {
-                            name: `轻度${this.emoName}倾向`,
+                            name: `无${this.emoName}倾向`,
                             icon: "rect",
+                           
                             itemStyle: {
-                                color: "#ffde00"
+                                color: "#62BD48",
                             },
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `中度${this.emoName}倾向`,
+                            name: `轻度${this.emoName}倾向`,
+                            icon: "rect",
                             itemStyle: {
-                                color: "#ff8a00"
+                                color: "#ffde00"
                             },
-                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `重度${this.emoName}倾向`,
+                            name: `中度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#d70d0d",
+                                color: "#ff8a00"
                             },
                             icon: "rect",
                             textStyle: {
@@ -470,16 +470,16 @@ export default {
                             }
                         },
                         {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
+                            name: `重度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#62BD48"
+                                color: "#d70d0d",
                             },
+                            icon: "rect",
                             textStyle: {
-                                // 项目遗留问题，新项目不需重新转换文字大小
                                 fontSize: 12
                             }
                         },
+                        
                     ],
                     formatter: function(name) {
                         // 自定义显示内容
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 0b76975..5a45fd9 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -285,7 +285,7 @@ export default {
                 legend: {
                     width: "65%",
                     orient: "horizontal",
-                    right: 'right',
+                    right: '5%',
                     top: '3%',
                     bottom: "1%",
                     itemHeight: 12,
@@ -295,29 +295,29 @@ export default {
                     selectedMode: false,
                     data: [
                         {
-                            name: `轻度${this.emoName}倾向`,
+                            name: `无${this.emoName}倾向`,
                             icon: "rect",
                             itemStyle: {
-                                color: "#ffde00"
+                                color: "#62BD48"
                             },
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `中度${this.emoName}倾向`,
+                            name: `轻度${this.emoName}倾向`,
+                            icon: "rect",
                             itemStyle: {
-                                color: "#ff8a00"
+                                color: "#ffde00"
                             },
-                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
                         {
-                            name: `重度${this.emoName}倾向`,
+                            name: `中度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#d70d0d",
+                                color: "#ff8a00"
                             },
                             icon: "rect",
                             textStyle: {
@@ -325,15 +325,16 @@ export default {
                             }
                         },
                         {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
+                            name: `重度${this.emoName}倾向`,
                             itemStyle: {
-                                color: "#62BD48"
+                                color: "#d70d0d",
                             },
+                            icon: "rect",
                             textStyle: {
                                 fontSize: 12
                             }
                         },
+                        
                     ],
                     formatter: function(name) {
                         // 自定义显示内容

From dcd7fde122299d93c981b67e8f1e5c3cfc1506dd Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Wed, 3 Jan 2024 15:03:42 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix=20-=20=E5=BF=83=E7=90=86=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=A6=E6=83=85=20=20=20=20=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E5=BF=83=E7=90=86=E5=88=87=E6=8D=A2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AF=BC=E8=87=B4=20=E2=80=9D=E4=BB=8A=E5=A4=A9?=
 =?UTF-8?q?=E2=80=9C=20=E6=97=A5=E6=9C=9F=E5=8F=82=E6=95=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                | 8 +++++++-
 src/config/models.js                     | 2 +-
 src/views/health/psychological/index.vue | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 3b7807a..ff1a7a3 100644
--- a/README.md
+++ b/README.md
@@ -890,4 +890,10 @@ update
 `2023.12.29`
 update
 - 心理监测详情，周报
-    - 修改 legend图例位置
\ No newline at end of file
+    - 修改 legend图例位置
+
+## v1.0.114
+`2024.1.3`
+fix
+- 心理监测详情
+    - 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index 260c59b..99029a1 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.113F'; //版本号
+export const VERSION_MODEL = '1.0.114F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 8d1159b..d9a847a 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -1235,8 +1235,8 @@ export default {
                 this.defaultOptions.series = this.defaultSeries;
                 this.defaultOptions.series[0].data = this.emotionData;
                 this.getPsychologiclData(this.selectDate ?  this.selectDate : this.$dayjs(currentDate).format("YYYY-MM-DD"));
-                this.startDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
-                this.endDate = this.$dayjs(currentDate).format("YYYY-MM-DD");
+                this.startDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
+                this.endDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
             } else if(value === 30){
                 // 30天
                 this.defaultOptions.xAxis.data = this.xAxisData;
@@ -1262,7 +1262,7 @@ export default {
                 // 即点击了周报,此时调用获取周报接口
                 this.getWeekResult();
             } else { 
-                this.getPsychologiclData(this.startDate, this.endDate);
+                this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
             }
         },
         getCurrentMonthStaAndEnd(currentDate) {
@@ -1340,6 +1340,9 @@ export default {
             this.dateList[0].text = this.$dayjs(value).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : this.$dayjs(value).format("MM-DD");
             this.calendarDialogShow = false;
             this.selectDate = selectDate;
+            this.startDate = selectDate;
+            this.endDate = selectDate;
+            this.current = 0;
             this.getPsychologiclData(selectDate);
         },
         // 计算字体显示的颜色

From 35b519aa7ab69f80e2c513dff2821d0d63874f36 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 12 Jan 2024 18:21:03 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8A=91=E9=83=81?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=B8=BA=E7=84=A6=E8=99=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/models.js                          |   16 +-
 src/views/health/psychological-main/index.vue |  331 +-
 src/views/health/psychological/index.vue      | 2831 +++++++++--------
 .../health/psychological/report/index.vue     | 1812 ++++++-----
 .../psychological/report/report-entry.vue     |  385 +--
 src/views/psychological-modeling/index.vue    |  713 +++--
 6 files changed, 3161 insertions(+), 2927 deletions(-)

diff --git a/src/config/models.js b/src/config/models.js
index 99029a1..b71455e 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.114F'; //版本号
+export const VERSION_MODEL = '1.0.115F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
@@ -26,15 +26,15 @@ export const BaiduStatisticsModel = {
 };
 // 情绪模型
 export const EmotionModel = {
-    // 抑郁
+    // 焦虑
     depression: {
-        name: '抑郁',
+        name: '焦虑',
         type: 2,
-        title1: '抑郁倾向',
-        article1: `<p>设备所检测的是个体的抑郁倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为抑郁症的患者的相应特征进行对比，判断出个体的抑郁倾向（即抑郁症的可能性）程度。抑郁倾向持续的时间越长、程度越严重，代表患有抑郁症的风险就越大。</p>`,
-        title2: '抑郁倾向算法原理',
-        article2: `<p>1．研究发现，抑郁症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
-        <p>2．抑郁症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
+        title1: '焦虑倾向',
+        article1: `<p>设备所检测的是个体的焦虑倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为焦虑症的患者的相应特征进行对比，判断出个体的焦虑倾向（即焦虑症的可能性）程度。焦虑倾向持续的时间越长、程度越严重，代表患有焦虑症的风险就越大。</p>`,
+        title2: '焦虑倾向算法原理',
+        article2: `<p>1．研究发现，焦虑症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
+        <p>2．焦虑症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
 
     },
     // 压力
diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 3bcff76..2bead6c 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -1,43 +1,48 @@
 <template>
-    <div class="psychological-main-container">
-        <van-nav-bar title="今日情绪" :border="true"  @click-left="onNavBack">
-            <template #left>
-                <div v-show="isShowLeft" class="nav-bar-title">
-                    <van-icon name="arrow-left" size="23"/><span>返回</span>
-                </div>
-            </template>
-            <template #title>
-                <span>今日情绪</span>
-            </template>
-        </van-nav-bar>
-        <div class="main">
-            <div class="list">
-                <div v-for="(item,index) in healhtList" :key="index" :class="['item', item.class]" @click="onClick(item)">
-                    <p class="health-value" :style="{ color: calcColor(item.value) }">
-                        {{ item.value || '--' }}
-                    </p>
-                    <p class="health-name">
-                        {{ item.name || '--'}}
-                    </p>
-                    <div class="health-result">
-                        <div :class="['left', item.class]">
-                            <p class="result">
-                                {{ item.result || '暂无数据'}}
-                            </p>
-                        </div>
-                        <div class="right">
-                            <!-- img -->
-                            <img :src="item.img" alt="">
-                        </div>
-                    </div>
-
-                    <div class="health-time">
-                        <p class="time">{{ item.time || '--' }}</p>
-                    </div>
-                </div>
+  <div class="psychological-main-container">
+    <van-nav-bar title="今日情绪" :border="true" @click-left="onNavBack">
+      <template #left>
+        <div v-show="isShowLeft" class="nav-bar-title">
+          <van-icon name="arrow-left" size="23" /><span>返回</span>
+        </div>
+      </template>
+      <template #title>
+        <span>今日情绪</span>
+      </template>
+    </van-nav-bar>
+    <div class="main">
+      <div class="list">
+        <div
+          v-for="(item, index) in healhtList"
+          :key="index"
+          :class="['item', item.class]"
+          @click="onClick(item)"
+        >
+          <p class="health-value" :style="{ color: calcColor(item.value) }">
+            {{ item.value || "--" }}
+          </p>
+          <p class="health-name">
+            {{ item.name || "--" }}
+          </p>
+          <div class="health-result">
+            <div :class="['left', item.class]">
+              <p class="result">
+                {{ item.result || "暂无数据" }}
+              </p>
             </div>
+            <div class="right">
+              <!-- img -->
+              <img :src="item.img" alt="" />
+            </div>
+          </div>
+
+          <div class="health-time">
+            <p class="time">{{ item.time || "--" }}</p>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -46,120 +51,162 @@ import { isNotNull } from "@/utils/index";
 import { PsyBaseUrl } from "@/config/models";
 import APICore from "@/api/core";
 export default {
-  name: 'psychologicalMain',
-  data(){
-   return {
-       healhtList: [
-          /*  { value: 40, name: '抑郁指数', class: 'depression',result: '无抑郁倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
+  name: "psychologicalMain",
+  data() {
+    return {
+      healhtList: [
+        /*  { value: 40, name: '焦虑指数', class: 'depression',result: '无焦虑倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
            { value: 55, name: '压力指数', class: 'stress', result: '轻度压力', time: '17:52', img: require('@/assets/img/regardless.png') },
            { value: 75, name: '疲劳指数', class: 'tiredness', result: '中度疲劳指数', time: '17:52', img: require('@/assets/img/moderate.png') }, */
-       ],
-       uid: '',
-       routeDate: '',
-       params: {}
-
-   }
+      ],
+      uid: "",
+      routeDate: "",
+      params: {},
+    };
   },
   computed: {
     isShowLeft() {
-        return isNotNull(this.$route.query.fromUrl);
-    }
+      return isNotNull(this.$route.query.fromUrl);
+    },
   },
   mounted() {
     this.loadParams();
-    this.$store.commit('tabClick', 0);
-    window.document.title = '心理呵护';
+    this.$store.commit("tabClick", 0);
+    window.document.title = "心理呵护";
   },
   methods: {
     //   获取b端token
     getAuth() {
-        let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
-        let that = this;
-        return new Promise((resolve, reject) => {
-            APICore.getAuth({ manufactorId: manufactorId }).then(res => {
-                let data = res.data;
-                if(data.code === 0) {
-                    resolve(res.data.data);
-                } else {
-                    this.$toast.fail(`${data.message}`);
-                    reject('');
-                }
-            })
-        })
+      let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
+      let that = this;
+      return new Promise((resolve, reject) => {
+        APICore.getAuth({ manufactorId: manufactorId }).then((res) => {
+          let data = res.data;
+          if (data.code === 0) {
+            resolve(res.data.data);
+          } else {
+            this.$toast.fail(`${data.message}`);
+            reject("");
+          }
+        });
+      });
     },
     // 加载路由参数
     async loadParams() {
-        let params = this.$route.query;
-        if (params) {
-            this.uid = params.uid;
-            this.routeDate = params.date;
-            this.params = params;
-            if(!params.accessToken) {
-                let authToken = await this.getAuth();
-                this.$store.commit('ssjlToken', authToken);
-            } else {
-                this.$store.commit('ssjlToken', params.accessToken);
-            }
-            this.getHomeData();
+      let params = this.$route.query;
+      if (params) {
+        this.uid = params.uid;
+        this.routeDate = params.date;
+        this.params = params;
+        if (!params.accessToken) {
+          let authToken = await this.getAuth();
+          this.$store.commit("ssjlToken", authToken);
+        } else {
+          this.$store.commit("ssjlToken", params.accessToken);
         }
+        this.getHomeData();
+      }
     },
     // 获取首页数据
     getHomeData() {
-        this.$toast.loading('数据加载中');
-        let reqUrl = `${PsyBaseUrl}/api/Data/GetHomeData`;
-        let reqParams = {
-            uid: this.uid,
-            date: this.routeDate || this.$dayjs(new Date()).format('YYYY-MM-DD')
-        };
-        axios.get(reqUrl, {
-            params: { ...reqParams },
-            headers: { 'AccessToken': this.$store.getters.ssjlToken }
-        }).then(res => {
-            console.log("res", res);
-            const data = res.data.response;
-            if(!data) {
-                return this.$toast.fail(res.data.msg);
-            }
-            this.healhtList = [
-                // 2023.12.5 修改菜单顺序
-                // 疲劳指数
-                { value: data.TirScore,  name: '疲劳指数', class: 'tiredness', result: data.TirDesc, time: data.TirMeasureUpdateTime ? this.$dayjs(data.TirMeasureUpdateTime).format('HH:mm') : '', level: data.TirLevel, img: data.TirScore ? this.calcImg(data.TirLevel, 'tiredness') : '' },
-                // 压力指数
-                { value: data.StressScore,  name: '压力指数', class: 'stress', result: data.StressDesc, time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '', level: data.StressLevel, img: data.StressScore ? this.calcImg(data.StressLevel, 'stress') : ''},
-                // 抑郁指数
-                { value: data.DepScore,  name: '抑郁指数', class: 'depression', result: data.DepDesc, time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm'): '', level: data.DepLevel, img: data.DepScore ? this.calcImg(data.DepLevel, 'depression') : ''},
-            ];
-            this.$toast.success('数据加载完成');
-        }).catch(() =>{}).finally(() => {  })
-
+      this.$toast.loading("数据加载中");
+      let reqUrl = `${PsyBaseUrl}/api/Data/GetHomeData`;
+      let reqParams = {
+        uid: this.uid,
+        date: this.routeDate || this.$dayjs(new Date()).format("YYYY-MM-DD"),
+      };
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          headers: { AccessToken: this.$store.getters.ssjlToken },
+        })
+        .then((res) => {
+          console.log("res", res);
+          const data = res.data.response;
+          if (!data) {
+            return this.$toast.fail(res.data.msg);
+          }
+          this.healhtList = [
+            // 2023.12.5 修改菜单顺序
+            // 疲劳指数
+            {
+              value: data.TirScore,
+              name: "疲劳指数",
+              class: "tiredness",
+              result: data.TirDesc,
+              time: data.TirMeasureUpdateTime
+                ? this.$dayjs(data.TirMeasureUpdateTime).format("HH:mm")
+                : "",
+              level: data.TirLevel,
+              img: data.TirScore
+                ? this.calcImg(data.TirLevel, "tiredness")
+                : "",
+            },
+            // 压力指数
+            {
+              value: data.StressScore,
+              name: "压力指数",
+              class: "stress",
+              result: data.StressDesc,
+              time: data.StressMeasureUpdateTime
+                ? this.$dayjs(data.StressMeasureUpdateTime).format("HH:mm")
+                : "",
+              level: data.StressLevel,
+              img: data.StressScore
+                ? this.calcImg(data.StressLevel, "stress")
+                : "",
+            },
+            // 焦虑指数
+            {
+              value: data.DepScore,
+              name: "焦虑指数",
+              class: "depression",
+              result: data.DepDesc,
+              time: data.DepMeasureUpdateTime
+                ? this.$dayjs(data.DepMeasureUpdateTime).format("HH:mm")
+                : "",
+              level: data.DepLevel,
+              img: data.DepScore
+                ? this.calcImg(data.DepLevel, "depression")
+                : "",
+            },
+          ];
+          this.$toast.success("数据加载完成");
+        })
+        .catch(() => {})
+        .finally(() => {});
     },
     onClick(item) {
-        this.params.name = item.class;
-        this.$router.replace({
-            name: 'psychological',
-            query: {
-                name: item.class,
-                uid: this.uid,
-                date: this.routeDate,
-                ...this.params
-            }
-        })
+      this.params.name = item.class;
+      this.$router.replace({
+        name: "psychological",
+        query: {
+          name: item.class,
+          uid: this.uid,
+          date: this.routeDate,
+          ...this.params,
+        },
+      });
     },
     onNavBack() {
-        if(this.isShowLeft) {
-            window.location.href = `${this.$route.query.fromUrl}/#/${ this.$route.query.fromMenu || 'device'}`;
-        } else {
-            this.$router.go(-1);
-        }
+      if (this.isShowLeft) {
+        window.location.href = `${this.$route.query.fromUrl}/#/${
+          this.$route.query.fromMenu || "device"
+        }`;
+      } else {
+        this.$router.go(-1);
+      }
     },
     // 计算表情
     calcImg(level, name) {
-        let imgUrl = '';
-        /* imgUrl = require(`@/assets/img/psychological/${name}_${level}.png`); */
-        let numLevel = Number(level);
-        console.log(`@/assets/img/psychological/${name}_${numLevel}.png`);
-        imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`);
-        /* switch(level) {
+      let imgUrl = "";
+      /* imgUrl = require(`@/assets/img/psychological/${name}_${level}.png`); */
+      let numLevel = Number(level);
+      console.log(`@/assets/img/psychological/${name}_${numLevel}.png`);
+      imgUrl = require(`@/assets/img/psychological/${name}_${
+        numLevel + 1
+      }.png`);
+      /* switch(level) {
             case '0':
                 imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`);
             break;
@@ -173,28 +220,28 @@ export default {
                 imgUrl = require('@/assets/img/moderate.png');
             break;
         } */
-        return imgUrl;
+      return imgUrl;
     },
     // 计算颜色
     calcColor(value) {
-        let color = "";
-            if (value <= 40) {
-                color = "#62BD48";
-            } else if (value > 40 && value <= 65) {
-                color = "#FEC350";
-            } else if (value > 65 && value <= 80) {
-                color = "#F86825";
-            } else if (value > 80) {
-                color = "#EB1D15";
-            } else {
-                color = "";
-            }
-            return color;
-    }
-  }
-}
+      let color = "";
+      if (value <= 40) {
+        color = "#62BD48";
+      } else if (value > 40 && value <= 65) {
+        color = "#FEC350";
+      } else if (value > 65 && value <= 80) {
+        color = "#F86825";
+      } else if (value > 80) {
+        color = "#EB1D15";
+      } else {
+        color = "";
+      }
+      return color;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-    @import "./index.scss";
+@import "./index.scss";
 </style>
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index d9a847a..f10a21f 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -1,301 +1,344 @@
 <template>
-    <div class="psychological-container">
-        <van-nav-bar :title="emoName + '监测'" :border="true"  :left-arrow="true"  @click-left="onNavBack">
-            <template #left>
-                <van-icon name="arrow-left" size="24" style="padding: 0"/>
-                <span>返回</span>
-            </template>
-        </van-nav-bar>
-        <div class="tab-bar">
-            <div class="date-tab-con">
-                <div class="date-tab-list">
-                    <div
-                        :class="['date-tab-item', {active: current === index, notClick: false}]"
-                        @click="onTabClick(item.value, index)"
-                        v-for="(item, index) in dateList"
-                        :key="index"
-                    >
-                        <img :src="tabImgUrl" alt v-if="index == 3"/>
-                        <span>{{item.text}}</span>
-                        <img class="more" :src="selectDownImg" alt v-if="index == 3"/>
-                    </div>
-                </div>
-            </div>
+  <div class="psychological-container">
+    <van-nav-bar
+      :title="emoName + '监测'"
+      :border="true"
+      :left-arrow="true"
+      @click-left="onNavBack"
+    >
+      <template #left>
+        <van-icon name="arrow-left" size="24" style="padding: 0" />
+        <span>返回</span>
+      </template>
+    </van-nav-bar>
+    <div class="tab-bar">
+      <div class="date-tab-con">
+        <div class="date-tab-list">
+          <div
+            :class="[
+              'date-tab-item',
+              { active: current === index, notClick: false },
+            ]"
+            @click="onTabClick(item.value, index)"
+            v-for="(item, index) in dateList"
+            :key="index"
+          >
+            <img :src="tabImgUrl" alt v-if="index == 3" />
+            <span>{{ item.text }}</span>
+            <img class="more" :src="selectDownImg" alt v-if="index == 3" />
+          </div>
         </div>
-        <!-- 情绪切换 -->
-        <div class="psy-tab-bar">
-            <div class="psy-tab-con">
-                <div class="psy-tab-list">
-                    <div :class="['psy-tab-item', {active: psyCurrent === index, notClick: false}]"
-                    @click="onPsyTabClick(item.name, index)"
-                    v-for="(item, index) in psyList"
-                    :key="index">
-                    <span>{{item.text}}</span>
-                    </div>
-                </div>
-            </div>
+      </div>
+    </div>
+    <!-- 情绪切换 -->
+    <div class="psy-tab-bar">
+      <div class="psy-tab-con">
+        <div class="psy-tab-list">
+          <div
+            :class="[
+              'psy-tab-item',
+              { active: psyCurrent === index, notClick: false },
+            ]"
+            @click="onPsyTabClick(item.name, index)"
+            v-for="(item, index) in psyList"
+            :key="index"
+          >
+            <span>{{ item.text }}</span>
+          </div>
         </div>
-        <div class="main" v-show="current !== 3">
-            <div class="top">
-                <!-- 日期选择 -->
-                <!-- 标题 -->
-                <div class="title">
-                    <div class="title-left">{{ titleLeft }}<van-icon name="question-o" @click="onHelp"/></div>
-                    <div class="title-right" v-show="currentDays === 0">
-                        <p @click="onHistory">历史监测</p>
-                    </div>
-                </div>
-                <!-- 日历 -->
+      </div>
+    </div>
+    <div class="main" v-show="current !== 3">
+      <div class="top">
+        <!-- 日期选择 -->
+        <!-- 标题 -->
+        <div class="title">
+          <div class="title-left">
+            {{ titleLeft }}<van-icon name="question-o" @click="onHelp" />
+          </div>
+          <div class="title-right" v-show="currentDays === 0">
+            <p @click="onHistory">历史监测</p>
+          </div>
+        </div>
+        <!-- 日历 -->
 
-                <van-dialog
-                    class="calenddar-dialog"
-                    v-model="calendarDialogShow"
-                    :show-confirm-button="false"
-                    :show-cancle-button="false"
-                    :close-on-click-overlay="true"
-                    ref="calenddarDialog"
-                >
-                    <template #default>
-                        <div class="calendar" ref="calendarCon">
-                            <van-calendar
-                                v-model="calendarShow"
-                                :min-date="minDate"
-                                :max-date="maxDate"
-                                :default-date="defaultDate"
-                                :round="false"
-                                :poppable="false"
-                                color="#62BD48"
-                                :show-confirm="false"
-                                :show-title="false"
-                                :show-subtitle="false"
-                                :formatter="formatter"
-                                @select="onSelect"
-                            />
-                        </div>
-                    </template>
-                </van-dialog>
+        <van-dialog
+          class="calenddar-dialog"
+          v-model="calendarDialogShow"
+          :show-confirm-button="false"
+          :show-cancle-button="false"
+          :close-on-click-overlay="true"
+          ref="calenddarDialog"
+        >
+          <template #default>
+            <div class="calendar" ref="calendarCon">
+              <van-calendar
+                v-model="calendarShow"
+                :min-date="minDate"
+                :max-date="maxDate"
+                :default-date="defaultDate"
+                :round="false"
+                :poppable="false"
+                color="#62BD48"
+                :show-confirm="false"
+                :show-title="false"
+                :show-subtitle="false"
+                :formatter="formatter"
+                @select="onSelect"
+              />
+            </div>
+          </template>
+        </van-dialog>
 
-                <!-- 监测次数 -->
-                <div class="monitoring-count">
-                    <p>监测次数：{{ monitoringCount || '0' }}次</p>
-                </div>
+        <!-- 监测次数 -->
+        <div class="monitoring-count">
+          <p>监测次数：{{ monitoringCount || "0" }}次</p>
+        </div>
 
-                <!-- 折线图-非日报 -->
+        <!-- 折线图-非日报 -->
 
-                <div class="pie-chart-con">
-                    <div class="pie-chart-left">
-                        <div id="pieChart" ref="pieChart"></div>
-                    </div>
+        <div class="pie-chart-con">
+          <div class="pie-chart-left">
+            <div id="pieChart" ref="pieChart"></div>
+          </div>
 
-                    <div class="pie-chart-right">
-                        <div class="list">
-                            <div class="item" v-for="(item, index) in pieRightList" :key="index">
-                                <div class="item-left">
-                                    <div class="circle" :style="{backgroundColor: item.color}"></div>
+          <div class="pie-chart-right">
+            <div class="list">
+              <div
+                class="item"
+                v-for="(item, index) in pieRightList"
+                :key="index"
+              >
+                <div class="item-left">
+                  <div
+                    class="circle"
+                    :style="{ backgroundColor: item.color }"
+                  ></div>
 
-                                    <span class="text">{{ item.text || '--' }}</span>
-                                </div>
+                  <span class="text">{{ item.text || "--" }}</span>
+                </div>
 
-                                <div class="item-right">
-                                    <span :style="{color: item.color}">{{ item.count ? item.count + '次' : '0次'}}</span>
-                                    <label :style="{color: item.color}">{{ item.percentage ? '(' + item.percentage + '%'  + ')' : '(0%)'}}</label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                <div class="item-right">
+                  <span :style="{ color: item.color }">{{
+                    item.count ? item.count + "次" : "0次"
+                  }}</span>
+                  <label :style="{ color: item.color }">{{
+                    item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
+                  }}</label>
                 </div>
+              </div>
+            </div>
+          </div>
+        </div>
 
-                <!-- 统计 -->
+        <!-- 统计 -->
 
-                <div class="statistics">
-                    <div class="list">
-                        <div class="item" v-for="(item, index) in statisticsList" :key="index">
-                            <div class="top">
-                                <span>{{ item.label || '--' }}</span>
-                            </div>
+        <div class="statistics">
+          <div class="list">
+            <div
+              class="item"
+              v-for="(item, index) in statisticsList"
+              :key="index"
+            >
+              <div class="top">
+                <span>{{ item.label || "--" }}</span>
+              </div>
 
-                            <div class="middle">
-                                <span
-                                    :style="{ color: calcColor(item.value)}"
-                                >{{ item.value || '--' }}</span>
-                            </div>
+              <div class="middle">
+                <span :style="{ color: calcColor(item.value) }">{{
+                  item.value || "--"
+                }}</span>
+              </div>
 
-                            <div class="bottom">
-                                <span>{{ item.time || '--' }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+              <div class="bottom">
+                <span>{{ item.time || "--" }}</span>
+              </div>
             </div>
-            <!-- 分割线 -->
-            <div class="line"></div>
-            <!-- 底部 -->
-            <div class="bottom">
-                <div class="echart-container">
-                    <div class="echart" ref="charts"></div>
-                </div>
+          </div>
+        </div>
+      </div>
+      <!-- 分割线 -->
+      <div class="line"></div>
+      <!-- 底部 -->
+      <div class="bottom">
+        <div class="echart-container">
+          <div class="echart" ref="charts"></div>
+        </div>
 
-                <div class="line-gray"></div>
+        <div class="line-gray"></div>
 
-                <div class="result" v-if="monitoringCount == ''">
-                    <div class="result-con">
-                        <div class="title ">
-                            <span class="title-no-data">结果解读</span>
-                            <div class="no-data">
-                                <img src="../../../assets/img/no_data_01.png" alt />
-                                <p>暂无数据</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+        <div class="result" v-if="monitoringCount == ''">
+          <div class="result-con">
+            <div class="title">
+              <span class="title-no-data">结果解读</span>
+              <div class="no-data">
+                <img src="../../../assets/img/no_data_01.png" alt />
+                <p>暂无数据</p>
+              </div>
+            </div>
+          </div>
+        </div>
 
-                <div class="result" v-else>
-                    <div class="result-con reminder" v-show="current === 0 ">
-                        <div class="title">
-                            <span class="title-reminder">结果解读</span>
+        <div class="result" v-else>
+          <div class="result-con reminder" v-show="current === 0">
+            <div class="title">
+              <span class="title-reminder">结果解读</span>
 
-                            <p class="title-emo" :style="{color: currentColor}">{{ result }}</p>
+              <p class="title-emo" :style="{ color: currentColor }">
+                {{ result }}
+              </p>
 
-                            <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{ advice }}</span>
-                        </div>
+              <span class="font-28"
+                ><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{
+                  advice
+                }}</span
+              >
+            </div>
 
-                        <div class="friendly-reminder" v-if="emoType === 2">
-                            <p :style="{color: currentColor}">友情提示：</p>
-                            <span>如果您发现抑郁倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现抑郁倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span>
-                        </div>
+            <div class="friendly-reminder" v-if="emoType === 2">
+              <p :style="{ color: currentColor }">友情提示：</p>
+              <span
+                >如果您发现焦虑倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现焦虑倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span
+              >
+            </div>
 
-                        <div class="warm-reminder">
-                            <p :style="{color: currentColor}">温馨提示：</p>
-                            <span>{{ warmTips }}</span>
-                        </div>
-                    </div>
+            <div class="warm-reminder">
+              <p :style="{ color: currentColor }">温馨提示：</p>
+              <span>{{ warmTips }}</span>
+            </div>
+          </div>
 
-                    <div class="result-con" v-show="current > 0">
-                        <div class="title">
-                            <span class="title-text">{{ surveyTitle }}</span>
-                            <div class="mood-list" v-if="emotionList.length > 0">
-                                <div class="item" v-for="(item, index) in emotionList" :key="index">
-                                    <p>
-                                        <span
-                                            :style="{color: item.color}"
-                                            class="day"
-                                        >{{ item.days }}</span>
-                                        <span class="day-text">天</span>
-                                    </p>
+          <div class="result-con" v-show="current > 0">
+            <div class="title">
+              <span class="title-text">{{ surveyTitle }}</span>
+              <div class="mood-list" v-if="emotionList.length > 0">
+                <div
+                  class="item"
+                  v-for="(item, index) in emotionList"
+                  :key="index"
+                >
+                  <p>
+                    <span :style="{ color: item.color }" class="day">{{
+                      item.days
+                    }}</span>
+                    <span class="day-text">天</span>
+                  </p>
 
-                                    <p>{{ item.text }}</p>
-                                </div>
-                            </div>
-                            <div class="mood-list-no-data" v-else>
-                                <div class="no-data">
-                                    <img src="../../../assets/img/no_data_01.png" alt />
-                                    <p>暂无数据</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                  <p>{{ item.text }}</p>
                 </div>
-
-                <!--  -->
+              </div>
+              <div class="mood-list-no-data" v-else>
+                <div class="no-data">
+                  <img src="../../../assets/img/no_data_01.png" alt />
+                  <p>暂无数据</p>
+                </div>
+              </div>
             </div>
+          </div>
         </div>
-        <!-- 周报菜单 -->
-        <div class="main report" v-show="current == 3">
-            <div class="content">
-                <div class="list" v-if="weekList.length > 0">
-                    <div
-                        class="item"
-                        v-for="(item, index) in weekList"
-                        :key="index"
-                        @click="onClickItem(item.recordId)"
-                    >
-                        <div class="left">
-                            <img :src="weekImg" alt />
-                            <div class="middle">
-                                <div class="title">
-                                    <span>周报</span>
-                                    <p>{{ item.name }}</p>
-                                </div>
-                                <div class="overall">
-                                    <div class="left">
-                                        <span>总评</span>
-                                        <p :style="{color: calcResultColor(item.summaryLevel)}">{{ item. summary}}</p>
-                                    </div>
-                                </div>
-                                <!-- <div class="trend">
-                                    <p>( <span>无抑郁倾向</span><span>5%</span>，<span>轻度抑郁倾向</span> <span>5%</span> )</p>
-                                </div>-->
-                            </div>
-                        </div>
 
-                        <div class="right">
-                            <img :src="moreImg" alt />
-                        </div>
-                    </div>
+        <!--  -->
+      </div>
+    </div>
+    <!-- 周报菜单 -->
+    <div class="main report" v-show="current == 3">
+      <div class="content">
+        <div class="list" v-if="weekList.length > 0">
+          <div
+            class="item"
+            v-for="(item, index) in weekList"
+            :key="index"
+            @click="onClickItem(item.recordId)"
+          >
+            <div class="left">
+              <img :src="weekImg" alt />
+              <div class="middle">
+                <div class="title">
+                  <span>周报</span>
+                  <p>{{ item.name }}</p>
                 </div>
-                <div class="list no-data" v-else>
-                    <img :src="noDataImg" alt />
-                    <p>连续佩戴两周产生对比数据</p>
+                <div class="overall">
+                  <div class="left">
+                    <span>总评</span>
+                    <p :style="{ color: calcResultColor(item.summaryLevel) }">
+                      {{ item.summary }}
+                    </p>
+                  </div>
                 </div>
+                <!-- <div class="trend">
+                                    <p>( <span>无焦虑倾向</span><span>5%</span>，<span>轻度焦虑倾向</span> <span>5%</span> )</p>
+                                </div>-->
+              </div>
             </div>
-        </div>
-        <!-- 弹出层 -->
-        <van-popup v-model="isPopup">
-            <div class="popup">
-                <div class="item science-tips first" v-if="emoType === 2">
-                    <div class="tips"><h5>小科普</h5></div>
-                    <p>抑郁症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。</p>
-                </div>
-                <div class="item" >
-                    <h5 v-html="title1"></h5>
-                    <div v-html="article1"></div>
-                </div>
-                <div class="item">
-                    <h5 v-html="title2"></h5>
-                    <div v-html="article2"></div>
-                </div>
-                <van-button size="large" @click="onClose">返回</van-button>
+
+            <div class="right">
+              <img :src="moreImg" alt />
             </div>
-        </van-popup>
+          </div>
+        </div>
+        <div class="list no-data" v-else>
+          <img :src="noDataImg" alt />
+          <p>连续佩戴两周产生对比数据</p>
+        </div>
+      </div>
     </div>
+    <!-- 弹出层 -->
+    <van-popup v-model="isPopup">
+      <div class="popup">
+        <div class="item science-tips first" v-if="emoType === 2">
+          <div class="tips"><h5>小科普</h5></div>
+          <p>
+            焦虑症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是焦虑症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有焦虑的风险。
+          </p>
+        </div>
+        <div class="item">
+          <h5 v-html="title1"></h5>
+          <div v-html="article1"></div>
+        </div>
+        <div class="item">
+          <h5 v-html="title2"></h5>
+          <div v-html="article2"></div>
+        </div>
+        <van-button size="large" @click="onClose">返回</van-button>
+      </div>
+    </van-popup>
+  </div>
 </template>
 
 <script>
 import { EmotionModel, PsyBaseUrl } from "@/config/models";
 import axios from "axios";
 export default {
-    name: "psychological-monitor",
-    data() {
-        return {
-            // 日期选择标签
-            dateList: [
-                { name: "today", text: "今天", value: 0 },
-                { name: "week", text: "7天", value: 7 },
-                { name: "month", text: "30天", value: 30 },
-                { name: "weekReport", text: "周报", value: 49 }
-            ],
-            // 情绪tab
-            psyList: [
-                {name: 'tiredness', text: '疲劳', value: 0},
-                {name: 'stress', text: '压力', value: 1},
-                {name: 'depression', text: '抑郁', value: 2},
-            ],
-            // 当前情绪下标
-            psyCurrent: 0,
-            current: 0, // 日期选择标签-当前选中的标签
-            currentDays: 0, //日期选择标签-日期参数
-            emotionData: [], //情绪数据，TODO 接口对接
-            echarts: null, //折线图
-            itemHeight: Number(
-                ((document.body.clientWidth / 750) * 95).toFixed()
-            ), // 日历组件item高度
-            xAxisData: [], //图表x轴展示的数据
-            monitoringCount: "", //监测次数
-            pieEcharts: null, //饼状图
-            pieData: [], //饼状图数据
-            //饼状图右边数据,TODO 根据接口数据和 模块 重新封装数组
-            pieRightList: [
-                /* {
+  name: "psychological-monitor",
+  data() {
+    return {
+      // 日期选择标签
+      dateList: [
+        { name: "today", text: "今天", value: 0 },
+        { name: "week", text: "7天", value: 7 },
+        { name: "month", text: "30天", value: 30 },
+        { name: "weekReport", text: "周报", value: 49 },
+      ],
+      // 情绪tab
+      psyList: [
+        { name: "tiredness", text: "疲劳", value: 0 },
+        { name: "stress", text: "压力", value: 1 },
+        { name: "depression", text: "焦虑", value: 2 },
+      ],
+      // 当前情绪下标
+      psyCurrent: 0,
+      current: 0, // 日期选择标签-当前选中的标签
+      currentDays: 0, //日期选择标签-日期参数
+      emotionData: [], //情绪数据，TODO 接口对接
+      echarts: null, //折线图
+      itemHeight: Number(((document.body.clientWidth / 750) * 95).toFixed()), // 日历组件item高度
+      xAxisData: [], //图表x轴展示的数据
+      monitoringCount: "", //监测次数
+      pieEcharts: null, //饼状图
+      pieData: [], //饼状图数据
+      //饼状图右边数据,TODO 根据接口数据和 模块 重新封装数组
+      pieRightList: [
+        /* {
                     text: "无情绪倾向",
                     count: 12,
                     percentage: "80",
@@ -319,1171 +362,1221 @@ export default {
                     percentage: "80",
                     color: "#d70d0d"
                 } */
-            ],
-            // 情绪状态列表
-            statisticsList: [
-               /*  { label: "最大值", value: "75", time: "08:15" },
+      ],
+      // 情绪状态列表
+      statisticsList: [
+        /*  { label: "最大值", value: "75", time: "08:15" },
                 { label: "最小值", value: "40", time: "10:15" },
                 { label: "最近值", value: "50", time: "18:15" } */
-            ],
-            // 周报-情绪计算
-            emotionList: [
-               /*  { days: "5", text: "无情绪倾向", color: "#62BD48" },
+      ],
+      // 周报-情绪计算
+      emotionList: [
+        /*  { days: "5", text: "无情绪倾向", color: "#62BD48" },
                 { days: "4", text: "轻度情绪倾向", color: "#ffde00" },
                 { days: "3", text: "中度情绪倾向", color: "#ff8a00" },
                 { days: "2", text: "重度情绪倾向", color: "#ACACAC" } */
-            ],
-            // 弹窗-日历是否显示
-            calendarDialogShow: false,
-            // 日历是否显示，默认为true
-            calendarShow: true,
-            // 日历 默认最小可选择日期，默认为最近1个月
-            minDate: new Date(
-               this.$dayjs()
-                    .month(this.$dayjs().month() - 1)
-                    .hour(0)
-                    .minute(0)
-                    .second(0)
-                    .format()
-            ),
-            // 日历 默认最小可选择日期，默认为当前时间
-            maxDate: new Date(
-                this.$dayjs()
-                    .hour(0)
-                    .minute(0)
-                    .second(0)
-                    .format()
-            ),
-            // 默认日历日期时间
-            defaultDate: new Date(
-                this.$dayjs()
-                    .hour(0)
-                    .minute(0)
-                    .second(0)
-                    .format()
-            ),
-            // 路由传过来的情绪参数
-            emoName: '',
-            // 默认折线图 Series 配置
-            defaultSeries: null,
-            // 非日报折线图 Series 配置
-            weekAndMonthSeries: null,
-            // 当前情绪类型
-            emoType: '',
-            // 结果解读
-            result: "",
-            // 需要高亮的日期数组
-            highlightDates: [],
-            // 选中的日历日期
-            selectDate: '',
-            uid: '',
-            // 建议
-            advice: '',
-            // 底部天数标题
-            surveyTitle: '' || '7天概览',
-            // 路由中的日期
-            routeDate: '',
-            // 路由参数
-            params: {},
-            // 是否显示帮助
-            isPopup: false,
-            // 结果等级
-            resultLevel: '',
-            // 轻度级别颜色
-            mildColor: '#ffde00',
-            // 中度级别颜色
-            severeColor: '#ff8a00',
-            // 重度级别颜色
-            moderateColor: '#d70d0d',
-            // 7天和30天最大数据列表
-            weekAndMonData: [],
-            tabImgUrl: require("@/assets/img/psychological/statistical_form.png"),
-            selectDownImg: require("@/assets/img/psychological/select_down.png"),
-            weekImg: require("@/assets/img/psychological/week_report.png"),
-            moreImg: require("@/assets/img/psychological/more.png"),
-            noDataImg: require("@/assets/img/no_data_01.png"),
-            weekList: [],
-            startDate: '', //接口需要的开始时间
-            endDate: '', //接口需要的结束时间
-            currentEmoName: '', //当前情绪名称
-        };
-    },
-    computed: {
-        // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
-        defaultOptions() {
-            return {
-                time: {
-                    useUTC: false
-                },
-                title: {
-                    text: this.echartsTitle,
-                    left: 1,
-                    right: 25,
-                    bottom: 20,
-                    top: "3%",
-                    textStyle: {
-                        fontSize: 16,
-                        fontWeight: "bold"
-                    }
-                },
-                legend: {
-                    width: "65%",
-                    orient: "horizontal",
-                    right: '5%',
-                    top: 1,
-                    bottom: "1%",
-                    itemHeight: 12,
-                    itemWidth: 12,
-                    itemGap: 10,
-                    align: 'left',
-                    selectedMode: false,
-                    data: [
-                        {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
-                           
-                            itemStyle: {
-                                color: "#62BD48",
-                            },
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `轻度${this.emoName}倾向`,
-                            icon: "rect",
-                            itemStyle: {
-                                color: "#ffde00"
-                            },
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `中度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#ff8a00"
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `重度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#d70d0d",
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        
-                    ],
-                    formatter: function(name) {
-                        // 自定义显示内容
-                        if (name.length > 6) {
-                            return (
-                                name.substring(0, 6) + "\n" + name.substring(6)
-                            );
-                        } else {
-                            return name;
-                        }
-                    }
-                },
-                grid: {
-                    show: true,
-                    borderWidth: 1,
-                    top: '20%',
-                    left: '1%',
-                    right: '5%',
-                    bottom: '10%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: "category",
-                    axisLine: {
-                        show: false
-                    },
-                    textStyle: {
-                        fontSize: 10
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    splitLine: {
-                        show: false,
-                        lineStyle: {
-                            color: "#ddd",
-                            width: 2
-                        }
-                    },
-                    nameLocation: 'center',
-                    axisLabel: {
-                        show: true,
-                        fontSize: 12,
-                        showMinLabel: true, //显示最小值
-                        showMaxLabel: true, //显示最大值
-                    },
-                    data: this.xAxisData
-                },
-                dataZoom: [
-                   /*  {
-                        type: "inside",
-                        start: 0,
-                        end: 100,
-                    }, */
-                    {
-                        start: 0,
-                        end: 100,
-                        textStyle: {
-                            color: "#FFF",
-                            fontSize: 14
-                        },
-                        show: true,
-                        height: 15,
-                        bottom: 5,
-                        handleStyle: {
-                            borderWidth: 1,
-                            borderCap: "square"
-                        }
-                    }
-                ],
-                tooltip: {
-                    trigger: "axis",
-                    textStyle: {
-                        fontSize: 14,
-                        align: "center"
-                    },
-                    formatter: function(params) {
-                        return params[0].marker  + params[0].name + '--' + params[0].value + '</br>'
-                    }
-                },
-                yAxis: {
-                    type: "value",
-                    max: 100,
-                    min: 0,
-                    interval: 20,
-                    splitNumber : 1,
-			        boundaryGap : [ '5%', '5%' ],
-                    nameTextStyle: {
-                        fontSize: 13
-                    },
-                    alignTicks: true,
-                    axisTick: {
-                        show: true
-                    },
-                    axisLabel: {
-                        show: true,
-                        fontSize: 13,
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: "#ddd",
-                            width: 1
-                        }
-                    }
-                },
-                series: [
-                    {
-                        name: `无${this.emoName}倾向`,
-                        type: "line",
-                        padding: 5,
-                        data: this.emotionData,
-                        symbol: "circle",
-                        symbolSize: 8,
-                    },
-                    {
-                        name: `轻度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `中度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `重度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    }
-                ]
-            };
+      ],
+      // 弹窗-日历是否显示
+      calendarDialogShow: false,
+      // 日历是否显示，默认为true
+      calendarShow: true,
+      // 日历 默认最小可选择日期，默认为最近1个月
+      minDate: new Date(
+        this.$dayjs()
+          .month(this.$dayjs().month() - 1)
+          .hour(0)
+          .minute(0)
+          .second(0)
+          .format()
+      ),
+      // 日历 默认最小可选择日期，默认为当前时间
+      maxDate: new Date(this.$dayjs().hour(0).minute(0).second(0).format()),
+      // 默认日历日期时间
+      defaultDate: new Date(this.$dayjs().hour(0).minute(0).second(0).format()),
+      // 路由传过来的情绪参数
+      emoName: "",
+      // 默认折线图 Series 配置
+      defaultSeries: null,
+      // 非日报折线图 Series 配置
+      weekAndMonthSeries: null,
+      // 当前情绪类型
+      emoType: "",
+      // 结果解读
+      result: "",
+      // 需要高亮的日期数组
+      highlightDates: [],
+      // 选中的日历日期
+      selectDate: "",
+      uid: "",
+      // 建议
+      advice: "",
+      // 底部天数标题
+      surveyTitle: "" || "7天概览",
+      // 路由中的日期
+      routeDate: "",
+      // 路由参数
+      params: {},
+      // 是否显示帮助
+      isPopup: false,
+      // 结果等级
+      resultLevel: "",
+      // 轻度级别颜色
+      mildColor: "#ffde00",
+      // 中度级别颜色
+      severeColor: "#ff8a00",
+      // 重度级别颜色
+      moderateColor: "#d70d0d",
+      // 7天和30天最大数据列表
+      weekAndMonData: [],
+      tabImgUrl: require("@/assets/img/psychological/statistical_form.png"),
+      selectDownImg: require("@/assets/img/psychological/select_down.png"),
+      weekImg: require("@/assets/img/psychological/week_report.png"),
+      moreImg: require("@/assets/img/psychological/more.png"),
+      noDataImg: require("@/assets/img/no_data_01.png"),
+      weekList: [],
+      startDate: "", //接口需要的开始时间
+      endDate: "", //接口需要的结束时间
+      currentEmoName: "", //当前情绪名称
+    };
+  },
+  computed: {
+    // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
+    defaultOptions() {
+      return {
+        time: {
+          useUTC: false,
         },
-        imei() {
-            return this.$store.getters.serialNo;
+        title: {
+          text: this.echartsTitle,
+          left: 1,
+          right: 25,
+          bottom: 20,
+          top: "3%",
+          textStyle: {
+            fontSize: 16,
+            fontWeight: "bold",
+          },
         },
-        // 饼状图配置
-        pieOption() {
-            return {
-                tooltip: {
-                    trigger: "item",
-                    textStyle: {
-                        fontSize: 14
-                    },
-                    position: "right"
-                },
-                legend: {
-                    top: "5%",
-                    left: "center",
-                    show: false
-                },
-                series: [
-                    {
-                        type: "pie",
-                        radius: ["40%", "80%"],
-                        avoidLabelOverlap: false,
-                        startAngle: 270, // 设置逆时针渲染
-                        itemStyle: {
-                            borderRadius: 5,
-                            borderColor: "#fff",
-                            borderWidth: 2,
-                            fontSize: 16
-                        },
-                        label: {
-                            show: false,
-                            position: "center",
-                            fontSize: 16
-                        },
-                        emphasis: {
-                            label: {
-                                show: false,
-                                fontSize: 16,
-                                fontWeight: "bold"
-                            }
-                        },
-                        labelLine: {
-                            show: false
-                        },
-                        data: this.pieData
-                    }
-                ]
-            };
-        },
-        titleLeft() {
-            let text = this.emoName === 'depression' ? '趋势' : '';
-            let today = '';
-            if(this.currentDays  !== 0) {
-                today = '';
-            } else {
-                today = this.$dayjs(this.selectDate || this.defaultDate).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : '';
-            }
-            return `${today}${this.emoName}倾向${text}`;
-        },
-        // 折线图标题
-        echartsTitle() {
-            let today = '';
-            if(this.currentDays  !== 0) {
-                today = '';
+        legend: {
+          width: "65%",
+          orient: "horizontal",
+          right: "5%",
+          top: 1,
+          bottom: "1%",
+          itemHeight: 12,
+          itemWidth: 12,
+          itemGap: 10,
+          align: "left",
+          selectedMode: false,
+          data: [
+            {
+              name: `无${this.emoName}倾向`,
+              icon: "rect",
+
+              itemStyle: {
+                color: "#62BD48",
+              },
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `轻度${this.emoName}倾向`,
+              icon: "rect",
+              itemStyle: {
+                color: "#ffde00",
+              },
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `中度${this.emoName}倾向`,
+              itemStyle: {
+                color: "#ff8a00",
+              },
+              icon: "rect",
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `重度${this.emoName}倾向`,
+              itemStyle: {
+                color: "#d70d0d",
+              },
+              icon: "rect",
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+          ],
+          formatter: function (name) {
+            // 自定义显示内容
+            if (name.length > 6) {
+              return name.substring(0, 6) + "\n" + name.substring(6);
             } else {
-                today = this.$dayjs(this.selectDate || this.defaultDate).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : '';
+              return name;
             }
-            return `${today}${this.emoName}数据图`;
+          },
         },
-        warmTips() {
-            return `正常连续佩戴腕表，每${ this.emoType == 2 ? '一':  '半'}小时计算一个${this.emoName}分值。`;
-            /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
+        grid: {
+          show: true,
+          borderWidth: 1,
+          top: "20%",
+          left: "1%",
+          right: "5%",
+          bottom: "10%",
+          containLabel: true,
         },
-        title1() {
-            return EmotionModel[this.params.name].title1;
+        xAxis: {
+          type: "category",
+          axisLine: {
+            show: false,
+          },
+          textStyle: {
+            fontSize: 10,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: "#ddd",
+              width: 2,
+            },
+          },
+          nameLocation: "center",
+          axisLabel: {
+            show: true,
+            fontSize: 12,
+            showMinLabel: true, //显示最小值
+            showMaxLabel: true, //显示最大值
+          },
+          data: this.xAxisData,
         },
-        article1() {
-            return EmotionModel[this.params.name].article1;
+        dataZoom: [
+          /*  {
+                        type: "inside",
+                        start: 0,
+                        end: 100,
+                    }, */
+          {
+            start: 0,
+            end: 100,
+            textStyle: {
+              color: "#FFF",
+              fontSize: 14,
+            },
+            show: true,
+            height: 15,
+            bottom: 5,
+            handleStyle: {
+              borderWidth: 1,
+              borderCap: "square",
+            },
+          },
+        ],
+        tooltip: {
+          trigger: "axis",
+          textStyle: {
+            fontSize: 14,
+            align: "center",
+          },
+          formatter: function (params) {
+            return (
+              params[0].marker +
+              params[0].name +
+              "--" +
+              params[0].value +
+              "</br>"
+            );
+          },
         },
-        title2() {
-            return EmotionModel[this.params.name].title2;
+        yAxis: {
+          type: "value",
+          max: 100,
+          min: 0,
+          interval: 20,
+          splitNumber: 1,
+          boundaryGap: ["5%", "5%"],
+          nameTextStyle: {
+            fontSize: 13,
+          },
+          alignTicks: true,
+          axisTick: {
+            show: true,
+          },
+          axisLabel: {
+            show: true,
+            fontSize: 13,
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "#ddd",
+              width: 1,
+            },
+          },
         },
-        article2() {
-            return EmotionModel[this.params.name].article2;
+        series: [
+          {
+            name: `无${this.emoName}倾向`,
+            type: "line",
+            padding: 5,
+            data: this.emotionData,
+            symbol: "circle",
+            symbolSize: 8,
+          },
+          {
+            name: `轻度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+          {
+            name: `中度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+          {
+            name: `重度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+        ],
+      };
+    },
+    imei() {
+      return this.$store.getters.serialNo;
+    },
+    // 饼状图配置
+    pieOption() {
+      return {
+        tooltip: {
+          trigger: "item",
+          textStyle: {
+            fontSize: 14,
+          },
+          position: "right",
         },
-        // 当前情绪颜色
-        currentColor( ) {
-            return this.calcResultColor(this.resultLevel) || "#62BD48"
+        legend: {
+          top: "5%",
+          left: "center",
+          show: false,
         },
-    },
-    watch: {
-        // 监听数据发生变化 初始化各项图表
-        emotionData: {
-            handler(n, o) {
-                this.initEchart();
+        series: [
+          {
+            type: "pie",
+            radius: ["40%", "80%"],
+            avoidLabelOverlap: false,
+            startAngle: 270, // 设置逆时针渲染
+            itemStyle: {
+              borderRadius: 5,
+              borderColor: "#fff",
+              borderWidth: 2,
+              fontSize: 16,
             },
-            deep: true
-        },
-        xAxisData: {
-            handler(n, o) {
-                this.initEchart();
+            label: {
+              show: false,
+              position: "center",
+              fontSize: 16,
             },
-            deep: true
-        },
-        pieData: {
-            handler(n, o) {
-                this.initPieEchart();
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: 16,
+                fontWeight: "bold",
+              },
             },
-            deep: true
-        },
+            labelLine: {
+              show: false,
+            },
+            data: this.pieData,
+          },
+        ],
+      };
     },
-    created() {
-        // 读取路由传过来的参数，根据路由传过来的参数判断是哪种情绪
-        this.loadParams();
-        this.initEchartText();
-        this.getPieData();
-        this.getCalendarData();
-        this.getPsychologiclData();
-        this.getWeekResult();
+    titleLeft() {
+      let text = this.emoName === "depression" ? "趋势" : "";
+      let today = "";
+      if (this.currentDays !== 0) {
+        today = "";
+      } else {
+        today =
+          this.$dayjs(this.selectDate || this.defaultDate).format(
+            "YYYY-MM-DD"
+          ) === this.$dayjs(new Date()).format("YYYY-MM-DD")
+            ? "今天"
+            : "";
+      }
+      return `${today}${this.emoName}倾向${text}`;
+    },
+    // 折线图标题
+    echartsTitle() {
+      let today = "";
+      if (this.currentDays !== 0) {
+        today = "";
+      } else {
+        today =
+          this.$dayjs(this.selectDate || this.defaultDate).format(
+            "YYYY-MM-DD"
+          ) === this.$dayjs(new Date()).format("YYYY-MM-DD")
+            ? "今天"
+            : "";
+      }
+      return `${today}${this.emoName}数据图`;
+    },
+    warmTips() {
+      return `正常连续佩戴腕表，每${
+        this.emoType == 2 ? "一" : "半"
+      }小时计算一个${this.emoName}分值。`;
+      /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
     },
-    mounted() {
+    title1() {
+      return EmotionModel[this.params.name].title1;
+    },
+    article1() {
+      return EmotionModel[this.params.name].article1;
+    },
+    title2() {
+      return EmotionModel[this.params.name].title2;
+    },
+    article2() {
+      return EmotionModel[this.params.name].article2;
+    },
+    // 当前情绪颜色
+    currentColor() {
+      return this.calcResultColor(this.resultLevel) || "#62BD48";
+    },
+  },
+  watch: {
+    // 监听数据发生变化 初始化各项图表
+    emotionData: {
+      handler(n, o) {
         this.initEchart();
-        this.current = Number(this.$store.getters.tabClick) || 0;
-        this.currentDays = this.calcDaysByTabClick(Number(this.$store.getters.tabClick));
-        this.psyCurrent = this.calcPsyTabindex(EmotionModel[this.params.name].type);
-        window.document.title = '心理监测';
+      },
+      deep: true,
     },
-    methods: {
-        loadParams() {
-            let params = this.$route.query;
-            if (params) {
-                this.emoName = EmotionModel[params.name].name;
-                this.emoType = EmotionModel[params.name].type;
-                this.uid = params.uid;
-                this.routeDate = params.date;
-                this.params = params;
-                this.currentEmoName = params.name;
-                if(params.date) {
-                    this.dateList[0].text =  this.$dayjs(params.date).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : this.$dayjs(params.date).format("MM-DD");
-                    this.defaultDate = new Date(
-                        this.$dayjs(params.date)
-                            .hour(0)
-                            .minute(0)
-                            .second(0)
-                            .format()
-                    );
-                }
+    xAxisData: {
+      handler(n, o) {
+        this.initEchart();
+      },
+      deep: true,
+    },
+    pieData: {
+      handler(n, o) {
+        this.initPieEchart();
+      },
+      deep: true,
+    },
+  },
+  created() {
+    // 读取路由传过来的参数，根据路由传过来的参数判断是哪种情绪
+    this.loadParams();
+    this.initEchartText();
+    this.getPieData();
+    this.getCalendarData();
+    this.getPsychologiclData();
+    this.getWeekResult();
+  },
+  mounted() {
+    this.initEchart();
+    this.current = Number(this.$store.getters.tabClick) || 0;
+    this.currentDays = this.calcDaysByTabClick(
+      Number(this.$store.getters.tabClick)
+    );
+    this.psyCurrent = this.calcPsyTabindex(EmotionModel[this.params.name].type);
+    window.document.title = "心理监测";
+  },
+  methods: {
+    loadParams() {
+      let params = this.$route.query;
+      if (params) {
+        this.emoName = EmotionModel[params.name].name;
+        this.emoType = EmotionModel[params.name].type;
+        this.uid = params.uid;
+        this.routeDate = params.date;
+        this.params = params;
+        this.currentEmoName = params.name;
+        if (params.date) {
+          this.dateList[0].text =
+            this.$dayjs(params.date).format("YYYY-MM-DD") ===
+            this.$dayjs(new Date()).format("YYYY-MM-DD")
+              ? "今天"
+              : this.$dayjs(params.date).format("MM-DD");
+          this.defaultDate = new Date(
+            this.$dayjs(params.date).hour(0).minute(0).second(0).format()
+          );
+        }
+      }
+    },
+    // 计算点击的天数
+    calcDaysByTabClick(value) {
+      let days = "";
+      console.log("value", value);
+      switch (value) {
+        case 0:
+          days = 0;
+          break;
+        case 1:
+          days = 7;
+          break;
+        case 2:
+          days = 30;
+          break;
+        case 3:
+          days = 49;
+          break;
+        default:
+          break;
+      }
+      return days;
+    },
+    // 计算psyTab的下标值
+    calcPsyTabindex(type) {
+      let psyIndex = "";
+      switch (type) {
+        case 1:
+          psyIndex = 1;
+          break;
+        case 2:
+          psyIndex = 2;
+          break;
+        case 3:
+          psyIndex = 0;
+          break;
+        default:
+          break;
+      }
+      return psyIndex;
+    },
+    // 获取这个月中有数据的日期，控制日历组件的日期样式
+    getCalendarData() {
+      let currentDate = new Date();
+      // 获取最近30天的心情等级日历数据
+      let dateList = this.getPostDate(currentDate, 30, true);
+      let reqUrl = `${PsyBaseUrl}/api/Data/GetCalendarData`;
+      let reqParams = {
+        uid: this.uid,
+        startDate: dateList[0],
+        endDate: dateList[1],
+      };
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          headers: { AccessToken: this.$store.getters.ssjlToken },
+        })
+        .then((res) => {
+          if (res.data) {
+            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 list = [];
+            if (currentName === "stress") {
+              list = data.Stress;
+            } else if (currentName === "depression") {
+              list = data.Depression;
+            } else {
+              list = data.Tiredness;
             }
-        },
-        // 计算点击的天数
-        calcDaysByTabClick(value) {
-            let days = '';
-            console.log("value", value);
-            switch(value) {
-                case 0:
-                days = 0;
-                    break;
-                case 1:
-                days = 7;
-                    break;
-                case 2:
-                days = 30;
-                    break;
-                case 3:
-                days = 49;
-                    break;
-                default: break;
+            list = list.map((item) => {
+              item.Date = this.$dayjs(item.Date.replace(/-/g, "/")).format(
+                "YYYY/MM/DD"
+              );
+              return item;
+            });
+            this.highlightDates = [...list];
+          }
+        });
+    },
+    // 获取饼状图数据，TODO 对接接口数据
+    getPieData() {
+      this.pieData = [
+        { value: 12, name: "", itemStyle: { color: "green" } },
+        { value: 2, name: "", itemStyle: { color: "orange" } },
+        { value: 1, name: "", itemStyle: { color: "#FFC0CB" } },
+        { value: 1, name: "", itemStyle: { color: "red" } },
+      ];
+    },
+    // 获取情绪数据
+    getPsychologiclData(date, startDate, endDate) {
+      this.$toast.loading({
+        message: "数据加载中",
+      });
+      let reqDate = date
+        ? this.$dayjs(date).format("YYYY-MM-DD")
+        : this.routeDate ||
+          this.$dayjs(this.defaultDate).format("YYYY-MM-DD"); /* "2023-05-23" */
+      let reqParams = {
+        uid: this.uid,
+        startDate: startDate || reqDate,
+        endDate: endDate || reqDate,
+        type: this.emoType,
+      };
+      console.log("请求参数", reqParams);
+      let reqUrl = `${PsyBaseUrl}/api/Data/GetHisData`;
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          headers: { AccessToken: this.$store.getters.ssjlToken },
+        })
+        .then((res) => {
+          if (res.data) {
+            let data = res.data.response;
+            // 监测次数
+            this.monitoringCount = data.Count;
+            this.pieRightList = [];
+            this.statisticsList = [];
+            this.emotionList = [];
+            let None = {
+              count: data.None,
+              percentage: this.calcPercentage(data.None, data.Count),
+              text: `无${this.emoName}倾向`,
+              color: "#62BD48",
             };
-            return days
-        },
-        // 计算psyTab的下标值
-        calcPsyTabindex(type) {
-            let psyIndex = '';
-            switch(type) {
-                case 1:
-                    psyIndex = 1;
-                    break;
-                case 2:
-                    psyIndex = 2;
-                    break;
-                case 3:
-                    psyIndex = 0;
-                    break;
-                default: break;
+            let Mild = {
+              count: data.Mild,
+              percentage: this.calcPercentage(data.Mild, data.Count),
+              text: `轻度${this.emoName}倾向`,
+              color: "#ffde00",
             };
-            return psyIndex
-        },
-        // 获取这个月中有数据的日期，控制日历组件的日期样式
-        getCalendarData() {
-            let currentDate = new Date();
-            // 获取最近30天的心情等级日历数据
-            let dateList = this.getPostDate(currentDate, 30, true);
-            let reqUrl = `${PsyBaseUrl}/api/Data/GetCalendarData`;
-            let reqParams = {
-                uid: this.uid,
-                startDate: dateList[0],
-                endDate: dateList[1],
+            let Moderate = {
+              count: data.Moderate,
+              percentage: this.calcPercentage(data.Moderate, data.Count),
+              text: `中度${this.emoName}倾向`,
+              color: "#ff8a00",
             };
-            axios.get(reqUrl, {
-                params: { ...reqParams },
-                headers: { 'AccessToken': this.$store.getters.ssjlToken }
-            }).then(res => {
-                    if (res.data) {
-                        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 list = [];
-                        if(currentName === 'stress') {
-                            list = data.Stress;
-                        } else if(currentName === 'depression') {
-                            list = data.Depression;
-                        } else {
-                            list = data.Tiredness;
-                        }
-                        list = list.map(item =>{
-                            item.Date = this.$dayjs(item.Date.replace(/-/g, "/")).format(
-                                "YYYY/MM/DD"
-                            );
-                            return item;
-                        })
-                        this.highlightDates = [...list];
-                    }
-            })
-
-        },
-        // 获取饼状图数据，TODO 对接接口数据
-        getPieData() {
-            this.pieData = [
-                { value: 12, name: "", itemStyle: { color: "green" } },
-                { value: 2, name: "", itemStyle: { color: "orange" } },
-                { value: 1, name: "", itemStyle: { color: "#FFC0CB" } },
-                { value: 1, name: "", itemStyle: { color: "red" } }
-            ];
-        },
-        // 获取情绪数据
-        getPsychologiclData(date, startDate, endDate) {
-
-            this.$toast.loading({
-                message: '数据加载中'
+            let Severe = {
+              count: data.Severe,
+              percentage: this.calcPercentage(data.Severe, data.Count),
+              text: `重度${this.emoName}倾向`,
+              color: "#d70d0d",
+            };
+            // 饼状图右边数据
+            this.pieRightList.push(None);
+            this.pieRightList.push(Mild);
+            this.pieRightList.push(Moderate);
+            this.pieRightList.push(Severe);
+            this.pieData = this.pieRightList.map((item) => {
+              item.value = item.count;
+              item.itemStyle = {
+                color: item.color,
+              };
+              return item;
             });
-            let reqDate =
-                date
-                ? this.$dayjs(date).format("YYYY-MM-DD")
-                : this.routeDate || this.$dayjs(this.defaultDate).format("YYYY-MM-DD") /* "2023-05-23" */;
-            let reqParams = {
-                uid: this.uid,
-                startDate: startDate || reqDate,
-                endDate: endDate || reqDate,
-                type: this.emoType
+            // 最大，最小和最近值
+            let Max = {
+              label: "最大值",
+              value: data.Max,
+              time: data.MaxDesc
+                ? this.currentDays === 0
+                  ? this.$dayjs(data.MaxDesc).format("HH:mm")
+                  : this.$dayjs(data.MaxDesc).format("MM/DD HH:mm")
+                : "",
             };
-            console.log("请求参数", reqParams);
-            let reqUrl = `${PsyBaseUrl}/api/Data/GetHisData`;
-            axios
-                .get(reqUrl, {
-                    params: { ...reqParams },
-                    headers: { 'AccessToken': this.$store.getters.ssjlToken }
-                })
-                .then(res => {
-                    if (res.data) {
-                        let data = res.data.response;
-                        // 监测次数
-                        this.monitoringCount = data.Count;
-                        this.pieRightList = [];
-                        this.statisticsList = [];
-                         this.emotionList = [];
-                        let None = {
-                            count: data.None,
-                            percentage: this.calcPercentage(
-                                data.None,
-                                data.Count
-                            ),
-                            text: `无${this.emoName}倾向`,
-                            color: "#62BD48"
-                        };
-                        let Mild = {
-                            count: data.Mild,
-                            percentage: this.calcPercentage(
-                                data.Mild,
-                                data.Count
-                            ),
-                            text: `轻度${this.emoName}倾向`,
-                            color: "#ffde00"
-                        };
-                        let Moderate = {
-                            count: data.Moderate,
-                            percentage: this.calcPercentage(
-                                data.Moderate,
-                                data.Count
-                            ),
-                            text: `中度${this.emoName}倾向`,
-                            color: "#ff8a00"
-                        };
-                        let Severe = {
-                            count: data.Severe,
-                            percentage: this.calcPercentage(
-                                data.Severe,
-                                data.Count
-                            ),
-                            text: `重度${this.emoName}倾向`,
-                            color: "#d70d0d"
-                        };
-                        // 饼状图右边数据
-                        this.pieRightList.push(None);
-                        this.pieRightList.push(Mild);
-                        this.pieRightList.push(Moderate);
-                        this.pieRightList.push(Severe);
-                        this.pieData = this.pieRightList.map(item => {
-                            item.value = item.count;
-                            item.itemStyle = {
-                                color: item.color
-                            };
-                            return item;
-                        });
-                        // 最大，最小和最近值
-                        let Max = {
-                            label: "最大值",
-                            value: data.Max,
-                            time: data.MaxDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.MaxDesc).format("HH:mm")
-                                : this.$dayjs(data.MaxDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        let Min = {
-                            label: "最小值",
-                            value: data.Min,
-                            time: data.MinDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.MinDesc).format("HH:mm")
-                                : this.$dayjs(data.MinDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        let Avg = {
-                            label: "平均值",
-                            value: data.Avg,
-                            time: data.AvgDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.AvgDesc).format("HH:mm")
-                                : this.$dayjs(data.AvgDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        let Current = {
-                            label: "最近值",
-                            value: data.Current,
-                            time: data.CurrentDesc
-                                ?  this.currentDays === 0 ? this.$dayjs(data.CurrentDesc).format("HH:mm")
-                                : this.$dayjs(data.CurrentDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        this.statisticsList.push(Max);
-                        this.statisticsList.push(Min);
-                        this.statisticsList.push(Avg);
-                        this.statisticsList.push(Current);
-                        // 周报月报底部显示数据
-                        let NoneDay = {
-                            days: data.NoneDay,
-                            text: `无${this.emoName}倾向`,
-                            color: "#62BD48"
-                        };
-                        let MildDay = {
-                            days: data.MildDay,
-                            text: `轻度${this.emoName}倾向`,
-                            color: "#ffde00"
-                        };
-                        let ModerateDay = {
-                            days: data.ModerateDay,
-                            text: `中度${this.emoName}倾向`,
-                            color: "#ff8a00"
-                        };
-                        let SevereDay = {
-                            days: data.SevereDay,
-                            text: `重度${this.emoName}倾向`,
-                            color: "#d70d0d"
-                        };
-                        this.emotionList.push(NoneDay);
-                        this.emotionList.push(MildDay);
-                        this.emotionList.push(ModerateDay);
-                        this.emotionList.push(SevereDay);
-                        // 图表数据
-                        this.emotionData = data.ChartDatas.map(item => {
-                            return {
-                                value: item.Value,
-                                itemStyle: {
-                                    color: this.calcResultColor(item.Level)
-                                }
-                            };
-                        });
-                        // 7天 和 30天柱形图显示
-                        this.weekAndMonData = data.ChartDatas.map((item, index) => {
-                            return {
-                                value: [index, item.MinValue, item.MaxValue],
-                            };
-                        });
-                        // x轴显示数据
-                        if(this.currentDays === 0) {
-                            // 显示今天数据
-                            this.xAxisData = data.ChartDatas.map(item => {
-                                return this.$dayjs(item.Key.replace(/-/g, "/")).format(
-                                    "HH:mm"
-                                );
-                            });
-                        } else {
-                            this.xAxisData = data.ChartDatas.map(item => {
-                                return this.$dayjs(item.Key.replace(/-/g, "/")).format(
-                                    "MM/DD"
-                                );
-                            });
-                            let emphasisStyle = {
-                                itemStyle: {
-                                    shadowBlur: 10,
-                                    shadowColor: 'rgba(0,0,0,0.3)'
-                                }
-                            };
-                            let that = this;
-                            // 7天和30天变成柱状图
-                            this.weekAndMonthSeries = [
-                                {
-                                    name: '平均值',
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: this.emotionData,
-                                },
-                                {
-                                    name: '',
-                                    type: 'custom',
-                                    data: this.weekAndMonData,
-                                    renderItem: function (params, api) {
-                                        var categoryIndex = api.value(0);
-                                        var end = api.coord([categoryIndex, api.value(1)]);
-                                        var start = api.coord([categoryIndex, api.value(2)]);
-                                        var width = 8;
-                                        var rectShape = that.$echarts.graphic.clipRectByRect(
-                                            {
-                                            x: start[0] - width / 2,
-                                            y: start[1],
-                                            width: 8,
-                                            height: end[1] - start[1],
-                                            },
-                                            {
-                                            x: params.coordSys.x,
-                                            y: params.coordSys.y,
-                                            width: params.coordSys.width,
-                                            height: params.coordSys.height,
-                                            }
-                                        );
-                                        if(rectShape) {
-                                            rectShape.r = [10]
-                                        };
-                                        return (
-                                            rectShape && {
-                                            type: "rect",
-                                            shape: rectShape,
-                                            style: api.style(),
-                                            }
-                                        );
-                                    },
-                                    itemStyle: {
-                                        opacity: 0.8,
-                                    },
-                                    encode: {
-                                        y: [1, 2],
-                                        x: 0,
-                                    },
-                                },
-                                {
-                                    name: `轻度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `中度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `重度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `无${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                            ];
-                            // 点击提示此时为空
-                            this.defaultOptions.tooltip = {
-                                trigger: "axis",
-                                formatter: function(params) {
-                                    return params[0].marker + '平均值:' + params[0].name + '--' + params[0].value + '</br>' +
-                                    params[1].marker + '最大值:' + params[1].name +  '--' + params[1].value[2] + '</br>' +
-                                    params[1].marker + '最小值:' + params[1].name +  '--' + params[1].value[1];
-                                }
-                            };
-                            this.defaultOptions.series = this.weekAndMonthSeries;
-                        }
-                        // 结果解读
-                        this.result = data.Result;
-                        this.resultLevel = data.ResultLevel;
-                        this.advice = data.Advice;
-                        this.$toast.success({
-                            message: '数据加载完成'
-                        });
-                    }
-                }).catch(() => {
-                   this.$dialog({
-                        message: '登录过期，请重新进入'
-                    })
-                }).finally(() => { });
-        },
-        // 计算百分比
-        calcPercentage(value, total) {
-            if (
-                typeof value !== "number" ||
-                typeof total !== "number" ||
-                total === 0
-            ) {
-                return 0;
-            }
-            let milValue = value * 1000;
-            let milTotal = total * 1000;
-            return Math.round((milValue / milTotal) * 100);
-        },
-        // 初始化图表的文字内容
-        initEchartText() {
-            let text = this.emoName === 'depression' ? '趋势' : '';
-            let today = this.$dayjs(this.defaultDate).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : '';
-            this.result = `无${this.emoName}倾向`;
-            this.defaultSeries = [
-                {
-                        name: ``,
-                        type: "line",
-                        padding: 5,
-                        data: this.emotionData,
-                        symbol: "circle",
-                        symbolSize: 8, // 拐点圆的大小
-                        areaStyle: {},
-                    },
-                    {
-                        name: `轻度${this.emoName}倾向`,
-                        type: "line",
-                        padding: 10,
-                        data: "",
-                        symbol: "circle",
-                        symbolSize: 8, // 拐点圆的大小
-                    },
-                    {
-                        name: `中度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `重度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    }
-            ];
-            this.pieRightList = this.pieRightList.map(item => {
-                item.text = item.text.replace("情绪", this.emoName);
-                return item;
+            let Min = {
+              label: "最小值",
+              value: data.Min,
+              time: data.MinDesc
+                ? this.currentDays === 0
+                  ? this.$dayjs(data.MinDesc).format("HH:mm")
+                  : this.$dayjs(data.MinDesc).format("MM/DD HH:mm")
+                : "",
+            };
+            let Avg = {
+              label: "平均值",
+              value: data.Avg,
+              time: data.AvgDesc
+                ? this.currentDays === 0
+                  ? this.$dayjs(data.AvgDesc).format("HH:mm")
+                  : this.$dayjs(data.AvgDesc).format("MM/DD HH:mm")
+                : "",
+            };
+            let Current = {
+              label: "最近值",
+              value: data.Current,
+              time: data.CurrentDesc
+                ? this.currentDays === 0
+                  ? this.$dayjs(data.CurrentDesc).format("HH:mm")
+                  : this.$dayjs(data.CurrentDesc).format("MM/DD HH:mm")
+                : "",
+            };
+            this.statisticsList.push(Max);
+            this.statisticsList.push(Min);
+            this.statisticsList.push(Avg);
+            this.statisticsList.push(Current);
+            // 周报月报底部显示数据
+            let NoneDay = {
+              days: data.NoneDay,
+              text: `无${this.emoName}倾向`,
+              color: "#62BD48",
+            };
+            let MildDay = {
+              days: data.MildDay,
+              text: `轻度${this.emoName}倾向`,
+              color: "#ffde00",
+            };
+            let ModerateDay = {
+              days: data.ModerateDay,
+              text: `中度${this.emoName}倾向`,
+              color: "#ff8a00",
+            };
+            let SevereDay = {
+              days: data.SevereDay,
+              text: `重度${this.emoName}倾向`,
+              color: "#d70d0d",
+            };
+            this.emotionList.push(NoneDay);
+            this.emotionList.push(MildDay);
+            this.emotionList.push(ModerateDay);
+            this.emotionList.push(SevereDay);
+            // 图表数据
+            this.emotionData = data.ChartDatas.map((item) => {
+              return {
+                value: item.Value,
+                itemStyle: {
+                  color: this.calcResultColor(item.Level),
+                },
+              };
             });
-        },
-        // 初始化饼状图
-        initPieEchart() {
-            if (
-                this.pieEcharts != null &&
-                this.pieEcharts != "" &&
-                this.pieEcharts != undefined
-            ) {
-                this.pieEcharts.dispose();
-            }
-            this.pieEcharts = this.$echarts.init(this.$refs.pieChart);
-            this.pieEcharts.setOption(this.pieOption);
-        },
-        // 格式化日期显示参数
-        formatter(day) {
-            const month = day.date.getMonth() + 1;
-            const date = day.date.getDate();
-            const formatDate = this.$dayjs(day.date).format("YYYY/MM/DD");
-            const currentDate = this.$dayjs(new Date()).format("YYYY/MM/DD");
-            day.className = "custom-calendar";
-            for( let h = 0; h < this.highlightDates.length; h ++) {
-                if (this.highlightDates[h].Date === formatDate) {
-                    day.className = `highlight-border ${this.calcResultColor(this.highlightDates[h].SummaryLevel, true)}`;
-                } else if (formatDate === currentDate) {
-                    day.text = '今天'
-                }
-            }
-            return day;
-        },
-        //   返回
-        onNavBack() {
-            this.params.name = '';
-            this.$router.replace({
-                name: 'psychologicalMain',
-                query: {
-                    ...this.params
-                }
+            // 7天 和 30天柱形图显示
+            this.weekAndMonData = data.ChartDatas.map((item, index) => {
+              return {
+                value: [index, item.MinValue, item.MaxValue],
+              };
             });
-        },
-        // 点击日期选择
-        onTabClick(value, index) {
-            this.current = index;
-            this.currentDays = value;
-            this.$store.commit('tabClick', index);
-            let currentDate = new Date();
-            let leftText = value === 0 ? '今天' : value === 7 ? '7天' : '30天';
-            this.surveyTitle = value === 7 ? '7天概览' : '30天概览';
-            if (value === 7) {
-                let dateList = this.getPostDate(currentDate, 6, true);
-                this.getPsychologiclData('', dateList[0], dateList[1]);
-                this.startDate = dateList[0];
-                this.endDate = dateList[1];
-            } else if (value === 0) {
-                // 今天
-                this.defaultOptions.xAxis.data = this.xAxisData;
-                this.defaultOptions.series = this.defaultSeries;
-                this.defaultOptions.series[0].data = this.emotionData;
-                this.getPsychologiclData(this.selectDate ?  this.selectDate : this.$dayjs(currentDate).format("YYYY-MM-DD"));
-                this.startDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
-                this.endDate = this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
-            } else if(value === 30){
-                // 30天
-                this.defaultOptions.xAxis.data = this.xAxisData;
-                this.defaultOptions.series = this.defaultSeries;
-                this.defaultOptions.series[0].data = this.emotionData;
-                let dateList = this.getPostDate(currentDate, 30, true);
-                this.getPsychologiclData('', dateList[0], dateList[1]);
-                this.startDate = dateList[0];
-                this.endDate = dateList[1];
+            // x轴显示数据
+            if (this.currentDays === 0) {
+              // 显示今天数据
+              this.xAxisData = data.ChartDatas.map((item) => {
+                return this.$dayjs(item.Key.replace(/-/g, "/")).format("HH:mm");
+              });
             } else {
-                // 周报菜单
-                this.getWeekResult();
-            }
-        },
-        // 点击情绪tab
-        onPsyTabClick(name, index) {
-            this.psyCurrent = index;
-            this.emoName = EmotionModel[name].name;
-            this.currentEmoName = name;
-            this.emoType = EmotionModel[name].type;
-            console.log("this.currentDays", this.currentDays);
-            if(this.currentDays === 49) {
-                // 即点击了周报,此时调用获取周报接口
-                this.getWeekResult();
-            } else { 
-                this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
-            }
-        },
-        getCurrentMonthStaAndEnd(currentDate) {
-            let list = [];
-            let monthStart = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1); // 获取本月第一天的日期时间
-            let monthEnd = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0, 23, 59, 59); // 获取本月最后一天的日期时间（时间为23:59:59）
-            list.push(this.$dayjs(monthStart).format("YYYY-MM-DD"));
-            list.push(this.$dayjs(monthEnd).format("YYYY-MM-DD"));
-            return list;
-        },
-        // 获取指定天数的起始日期
-        /**
-         *
-         * @param dateNow :Date类
-         * @param intervalDays ：间隔天数
-         * @param bolPastTime  ：Boolean,判断在参数date之前，还是之后，
-      */
-        getPostDate(dateNow,intervalDays,bolPastTime) {
-            let oneDayTime = 24 * 60 * 60 * 1000;
-            let list = [];
-            let lastDay;
-
-            if(bolPastTime == true){
-                lastDay = new Date(dateNow.getTime() - intervalDays * oneDayTime);
-                list.push(this.formateDate(lastDay));
-                list.push(this.formateDate(dateNow));
-            }else{
-                lastDay = new Date(dateNow.getTime() + intervalDays * oneDayTime);
-                list.push(this.formateDate(dateNow));
-                list.push(this.formateDate(lastDay));
-            }
-            return list;
-        },
-        formateDate(time){
-            let year = time.getFullYear();
-            let month = time.getMonth() + 1;
-            let day = time.getDate();
-            if (month < 10) {
-                month = '0' + month
-            };
-            if (day < 10) {
-                day = '0' + day
-            };
-            return year + '-' + month + '-' + day + '';
-        },
-        // 字体大小转化
-        fontChar(res) {
-            const clientWidth =
-                window.innerWidth ||
-                document.documentElement.clientWidth ||
-                document.body.clientWidth;
-            if (!clientWidth) return;
-            let fontSize = clientWidth / 750;
-            return res * fontSize;
-        },
-        // 初始化折线图表
-        initEchart() {
-            if (
-                this.echarts != null &&
-                this.echarts != "" &&
-                this.echarts != undefined
-            ) {
-                this.echarts.dispose();
+              this.xAxisData = data.ChartDatas.map((item) => {
+                return this.$dayjs(item.Key.replace(/-/g, "/")).format("MM/DD");
+              });
+              let emphasisStyle = {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowColor: "rgba(0,0,0,0.3)",
+                },
+              };
+              let that = this;
+              // 7天和30天变成柱状图
+              this.weekAndMonthSeries = [
+                {
+                  name: "平均值",
+                  type: "scatter",
+                  symbolSize: 8,
+                  data: this.emotionData,
+                },
+                {
+                  name: "",
+                  type: "custom",
+                  data: this.weekAndMonData,
+                  renderItem: function (params, api) {
+                    var categoryIndex = api.value(0);
+                    var end = api.coord([categoryIndex, api.value(1)]);
+                    var start = api.coord([categoryIndex, api.value(2)]);
+                    var width = 8;
+                    var rectShape = that.$echarts.graphic.clipRectByRect(
+                      {
+                        x: start[0] - width / 2,
+                        y: start[1],
+                        width: 8,
+                        height: end[1] - start[1],
+                      },
+                      {
+                        x: params.coordSys.x,
+                        y: params.coordSys.y,
+                        width: params.coordSys.width,
+                        height: params.coordSys.height,
+                      }
+                    );
+                    if (rectShape) {
+                      rectShape.r = [10];
+                    }
+                    return (
+                      rectShape && {
+                        type: "rect",
+                        shape: rectShape,
+                        style: api.style(),
+                      }
+                    );
+                  },
+                  itemStyle: {
+                    opacity: 0.8,
+                  },
+                  encode: {
+                    y: [1, 2],
+                    x: 0,
+                  },
+                },
+                {
+                  name: `轻度${this.emoName}倾向`,
+                  type: "scatter",
+                  symbolSize: 8,
+                  data: "",
+                },
+                {
+                  name: `中度${this.emoName}倾向`,
+                  type: "scatter",
+                  symbolSize: 8,
+                  data: "",
+                },
+                {
+                  name: `重度${this.emoName}倾向`,
+                  type: "scatter",
+                  symbolSize: 8,
+                  data: "",
+                },
+                {
+                  name: `无${this.emoName}倾向`,
+                  type: "scatter",
+                  symbolSize: 8,
+                  data: "",
+                },
+              ];
+              // 点击提示此时为空
+              this.defaultOptions.tooltip = {
+                trigger: "axis",
+                formatter: function (params) {
+                  return (
+                    params[0].marker +
+                    "平均值:" +
+                    params[0].name +
+                    "--" +
+                    params[0].value +
+                    "</br>" +
+                    params[1].marker +
+                    "最大值:" +
+                    params[1].name +
+                    "--" +
+                    params[1].value[2] +
+                    "</br>" +
+                    params[1].marker +
+                    "最小值:" +
+                    params[1].name +
+                    "--" +
+                    params[1].value[1]
+                  );
+                },
+              };
+              this.defaultOptions.series = this.weekAndMonthSeries;
             }
-            this.echarts = this.$echarts.init(this.$refs.charts);
-            this.echarts.setOption(this.defaultOptions);
-        },
-        // 点击历史监测，打开日历
-        onHistory() {
-            this.calendarDialogShow = true;
-        },
-        // 选择日历具体某一个日期
-        onSelect(value) {
-            const selectDate = this.$dayjs(value).format("YYYY-MM-DD");
-            this.dateList[0].text = this.$dayjs(value).format("YYYY-MM-DD") === this.$dayjs(new Date()).format("YYYY-MM-DD") ? '今天' : this.$dayjs(value).format("MM-DD");
-            this.calendarDialogShow = false;
-            this.selectDate = selectDate;
-            this.startDate = selectDate;
-            this.endDate = selectDate;
-            this.current = 0;
-            this.getPsychologiclData(selectDate);
+            // 结果解读
+            this.result = data.Result;
+            this.resultLevel = data.ResultLevel;
+            this.advice = data.Advice;
+            this.$toast.success({
+              message: "数据加载完成",
+            });
+          }
+        })
+        .catch(() => {
+          this.$dialog({
+            message: "登录过期，请重新进入",
+          });
+        })
+        .finally(() => {});
+    },
+    // 计算百分比
+    calcPercentage(value, total) {
+      if (
+        typeof value !== "number" ||
+        typeof total !== "number" ||
+        total === 0
+      ) {
+        return 0;
+      }
+      let milValue = value * 1000;
+      let milTotal = total * 1000;
+      return Math.round((milValue / milTotal) * 100);
+    },
+    // 初始化图表的文字内容
+    initEchartText() {
+      let text = this.emoName === "depression" ? "趋势" : "";
+      let today =
+        this.$dayjs(this.defaultDate).format("YYYY-MM-DD") ===
+        this.$dayjs(new Date()).format("YYYY-MM-DD")
+          ? "今天"
+          : "";
+      this.result = `无${this.emoName}倾向`;
+      this.defaultSeries = [
+        {
+          name: ``,
+          type: "line",
+          padding: 5,
+          data: this.emotionData,
+          symbol: "circle",
+          symbolSize: 8, // 拐点圆的大小
+          areaStyle: {},
         },
-        // 计算字体显示的颜色
-        calcColor(value) {
-            let color = "";
-            if (value <= 40) {
-                color = "#62BD48";
-            } else if (value > 40 && value <= 65) {
-                color = "#ffde00";
-            } else if (value > 65 && value <= 80) {
-                color = "#ff8a00";
-            } else if (value > 80) {
-                color = "#d70d0d";
-            } else {
-                color = "";
-            }
-            return color;
+        {
+          name: `轻度${this.emoName}倾向`,
+          type: "line",
+          padding: 10,
+          data: "",
+          symbol: "circle",
+          symbolSize: 8, // 拐点圆的大小
         },
-        // 计算结果采用哪种颜色
-        calcResultColor(value, isCallBackClass) {
-            let color = "";
-            let className = "";
-            switch(Number(value)) {
-                case 0:
-                    color = "#62BD48";
-                    className = 'none';
-                break;
-                case 1:
-                    color = "#ffde00";
-                    className = 'mild';
-                break;
-                case 2:
-                    color = "#ff8a00";
-                    className = 'moderate';
-                break;
-                case 3:
-                    color = "#d70d0d";
-                    className = 'severe';
-                break;
-            }
-            return isCallBackClass ? className : color;
+        {
+          name: `中度${this.emoName}倾向`,
+          type: "line",
+          data: "",
         },
-        // 点击帮助
-        onHelp() {
-            this.isPopup = true;
+        {
+          name: `重度${this.emoName}倾向`,
+          type: "line",
+          data: "",
         },
-        // 关闭poup
-        onClose() {
-            this.isPopup = false;
+      ];
+      this.pieRightList = this.pieRightList.map((item) => {
+        item.text = item.text.replace("情绪", this.emoName);
+        return item;
+      });
+    },
+    // 初始化饼状图
+    initPieEchart() {
+      if (
+        this.pieEcharts != null &&
+        this.pieEcharts != "" &&
+        this.pieEcharts != undefined
+      ) {
+        this.pieEcharts.dispose();
+      }
+      this.pieEcharts = this.$echarts.init(this.$refs.pieChart);
+      this.pieEcharts.setOption(this.pieOption);
+    },
+    // 格式化日期显示参数
+    formatter(day) {
+      const month = day.date.getMonth() + 1;
+      const date = day.date.getDate();
+      const formatDate = this.$dayjs(day.date).format("YYYY/MM/DD");
+      const currentDate = this.$dayjs(new Date()).format("YYYY/MM/DD");
+      day.className = "custom-calendar";
+      for (let h = 0; h < this.highlightDates.length; h++) {
+        if (this.highlightDates[h].Date === formatDate) {
+          day.className = `highlight-border ${this.calcResultColor(
+            this.highlightDates[h].SummaryLevel,
+            true
+          )}`;
+        } else if (formatDate === currentDate) {
+          day.text = "今天";
+        }
+      }
+      return day;
+    },
+    //   返回
+    onNavBack() {
+      this.params.name = "";
+      this.$router.replace({
+        name: "psychologicalMain",
+        query: {
+          ...this.params,
         },
-        getWeekResult() {
-            this.$toast.loading('数据加载中');
-            let baseUrl = process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart';
-            let reqUrl = `${baseUrl}/api/Data/GetWeekResult`;
-            let reqParams = {
-                uid: this.uid/* '2023101521270090082 */,
-                type: this.emoType
-            };
-            axios.get(reqUrl, {
-                params: { ...reqParams },
-            /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
-            }).then(res => {
-                console.log("res", res);
-                const data = res.data.response;
-                this.weekList = data.map(item => {
-                    return {
-                        name: item.Name.replace('周报', '').replace(/-/g, ".").replace(/~/g, "-"),
-                        recordId: item.RecordId,
-                        summary: item.Summary,
-                        summaryLevel: item.SummaryLevel,
-                        type: this.emoType
-                    }
-                }).reverse();
-                this.$toast.success('数据加载完成');
+      });
+    },
+    // 点击日期选择
+    onTabClick(value, index) {
+      this.current = index;
+      this.currentDays = value;
+      this.$store.commit("tabClick", index);
+      let currentDate = new Date();
+      let leftText = value === 0 ? "今天" : value === 7 ? "7天" : "30天";
+      this.surveyTitle = value === 7 ? "7天概览" : "30天概览";
+      if (value === 7) {
+        let dateList = this.getPostDate(currentDate, 6, true);
+        this.getPsychologiclData("", dateList[0], dateList[1]);
+        this.startDate = dateList[0];
+        this.endDate = dateList[1];
+      } else if (value === 0) {
+        // 今天
+        this.defaultOptions.xAxis.data = this.xAxisData;
+        this.defaultOptions.series = this.defaultSeries;
+        this.defaultOptions.series[0].data = this.emotionData;
+        this.getPsychologiclData(
+          this.selectDate
+            ? this.selectDate
+            : this.$dayjs(currentDate).format("YYYY-MM-DD")
+        );
+        this.startDate =
+          this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
+        this.endDate =
+          this.selectDate || this.$dayjs(currentDate).format("YYYY-MM-DD");
+      } else if (value === 30) {
+        // 30天
+        this.defaultOptions.xAxis.data = this.xAxisData;
+        this.defaultOptions.series = this.defaultSeries;
+        this.defaultOptions.series[0].data = this.emotionData;
+        let dateList = this.getPostDate(currentDate, 30, true);
+        this.getPsychologiclData("", dateList[0], dateList[1]);
+        this.startDate = dateList[0];
+        this.endDate = dateList[1];
+      } else {
+        // 周报菜单
+        this.getWeekResult();
+      }
+    },
+    // 点击情绪tab
+    onPsyTabClick(name, index) {
+      this.psyCurrent = index;
+      this.emoName = EmotionModel[name].name;
+      this.currentEmoName = name;
+      this.emoType = EmotionModel[name].type;
+      console.log("this.currentDays", this.currentDays);
+      if (this.currentDays === 49) {
+        // 即点击了周报,此时调用获取周报接口
+        this.getWeekResult();
+      } else {
+        this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
+      }
+    },
+    getCurrentMonthStaAndEnd(currentDate) {
+      let list = [];
+      let monthStart = new Date(
+        currentDate.getFullYear(),
+        currentDate.getMonth(),
+        1
+      ); // 获取本月第一天的日期时间
+      let monthEnd = new Date(
+        currentDate.getFullYear(),
+        currentDate.getMonth() + 1,
+        0,
+        23,
+        59,
+        59
+      ); // 获取本月最后一天的日期时间（时间为23:59:59）
+      list.push(this.$dayjs(monthStart).format("YYYY-MM-DD"));
+      list.push(this.$dayjs(monthEnd).format("YYYY-MM-DD"));
+      return list;
+    },
+    // 获取指定天数的起始日期
+    /**
+     *
+     * @param dateNow :Date类
+     * @param intervalDays ：间隔天数
+     * @param bolPastTime  ：Boolean,判断在参数date之前，还是之后，
+     */
+    getPostDate(dateNow, intervalDays, bolPastTime) {
+      let oneDayTime = 24 * 60 * 60 * 1000;
+      let list = [];
+      let lastDay;
+
+      if (bolPastTime == true) {
+        lastDay = new Date(dateNow.getTime() - intervalDays * oneDayTime);
+        list.push(this.formateDate(lastDay));
+        list.push(this.formateDate(dateNow));
+      } else {
+        lastDay = new Date(dateNow.getTime() + intervalDays * oneDayTime);
+        list.push(this.formateDate(dateNow));
+        list.push(this.formateDate(lastDay));
+      }
+      return list;
+    },
+    formateDate(time) {
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      if (month < 10) {
+        month = "0" + month;
+      }
+      if (day < 10) {
+        day = "0" + day;
+      }
+      return year + "-" + month + "-" + day + "";
+    },
+    // 字体大小转化
+    fontChar(res) {
+      const clientWidth =
+        window.innerWidth ||
+        document.documentElement.clientWidth ||
+        document.body.clientWidth;
+      if (!clientWidth) return;
+      let fontSize = clientWidth / 750;
+      return res * fontSize;
+    },
+    // 初始化折线图表
+    initEchart() {
+      if (
+        this.echarts != null &&
+        this.echarts != "" &&
+        this.echarts != undefined
+      ) {
+        this.echarts.dispose();
+      }
+      this.echarts = this.$echarts.init(this.$refs.charts);
+      this.echarts.setOption(this.defaultOptions);
+    },
+    // 点击历史监测，打开日历
+    onHistory() {
+      this.calendarDialogShow = true;
+    },
+    // 选择日历具体某一个日期
+    onSelect(value) {
+      const selectDate = this.$dayjs(value).format("YYYY-MM-DD");
+      this.dateList[0].text =
+        this.$dayjs(value).format("YYYY-MM-DD") ===
+        this.$dayjs(new Date()).format("YYYY-MM-DD")
+          ? "今天"
+          : this.$dayjs(value).format("MM-DD");
+      this.calendarDialogShow = false;
+      this.selectDate = selectDate;
+      this.startDate = selectDate;
+      this.endDate = selectDate;
+      this.current = 0;
+      this.getPsychologiclData(selectDate);
+    },
+    // 计算字体显示的颜色
+    calcColor(value) {
+      let color = "";
+      if (value <= 40) {
+        color = "#62BD48";
+      } else if (value > 40 && value <= 65) {
+        color = "#ffde00";
+      } else if (value > 65 && value <= 80) {
+        color = "#ff8a00";
+      } else if (value > 80) {
+        color = "#d70d0d";
+      } else {
+        color = "";
+      }
+      return color;
+    },
+    // 计算结果采用哪种颜色
+    calcResultColor(value, isCallBackClass) {
+      let color = "";
+      let className = "";
+      switch (Number(value)) {
+        case 0:
+          color = "#62BD48";
+          className = "none";
+          break;
+        case 1:
+          color = "#ffde00";
+          className = "mild";
+          break;
+        case 2:
+          color = "#ff8a00";
+          className = "moderate";
+          break;
+        case 3:
+          color = "#d70d0d";
+          className = "severe";
+          break;
+      }
+      return isCallBackClass ? className : color;
+    },
+    // 点击帮助
+    onHelp() {
+      this.isPopup = true;
+    },
+    // 关闭poup
+    onClose() {
+      this.isPopup = false;
+    },
+    getWeekResult() {
+      this.$toast.loading("数据加载中");
+      let baseUrl =
+        process.env.NODE_ENV === "production"
+          ? "https://dbmq.rzliot.com/auth_heart"
+          : "https://dbmq.rzliot.com/heart";
+      let reqUrl = `${baseUrl}/api/Data/GetWeekResult`;
+      let reqParams = {
+        uid: this.uid /* '2023101521270090082 */,
+        type: this.emoType,
+      };
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
+        })
+        .then((res) => {
+          console.log("res", res);
+          const data = res.data.response;
+          this.weekList = data
+            .map((item) => {
+              return {
+                name: item.Name.replace("周报", "")
+                  .replace(/-/g, ".")
+                  .replace(/~/g, "-"),
+                recordId: item.RecordId,
+                summary: item.Summary,
+                summaryLevel: item.SummaryLevel,
+                type: this.emoType,
+              };
             })
+            .reverse();
+          this.$toast.success("数据加载完成");
+        });
+    },
+    onClickItem(recordId) {
+      this.$router.push({
+        name: "psychologicalReport",
+        query: {
+          recordId: recordId,
+          name: this.currentEmoName,
+          isShowLeft: true,
+          uid: this.uid,
         },
-        onClickItem(recordId) {
-            this.$router.push({
-                name: 'psychologicalReport',
-                query: {
-                    recordId: recordId,
-                    name: this.currentEmoName,
-                    isShowLeft: true,
-                    uid: this.uid
-                }
-            })
-        }
-    }
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 .van-nav-bar .van-icon {
-    padding-left: 10px;
+  padding-left: 10px;
 }
 
 .calenddar-dialog {
-    overflow: scroll;
+  overflow: scroll;
 }
 .calendar {
-    overflow: scroll;
-    .van-calendar {
-        height: 350px;
-        .van-calendar__header {
-            display: none;
+  overflow: scroll;
+  .van-calendar {
+    height: 350px;
+    .van-calendar__header {
+      display: none;
+    }
+    .van-calendar__days .van-calendar__day {
+      width: 27px;
+      height: 27px;
+      margin: 5px;
+      font-size: 12px;
+      &.custom-calendar {
+        width: 27px;
+        height: 27px;
+      }
+      &.highlight-border {
+        border: 1px solid #62bd48;
+        width: 27px;
+        height: 27px;
+        border-radius: 50%;
+        &.none {
+          border: 1px solid #62bd48;
         }
-        .van-calendar__days .van-calendar__day {
-            width: 27px;
-            height: 27px;
-            margin: 5px;
-            font-size: 12px;
-            &.custom-calendar {
-                width: 27px;
-                height: 27px;
-            }
-            &.highlight-border {
-                border: 1px solid #62bd48;
-                width: 27px;
-                height: 27px;
-                border-radius: 50%;
-                &.none {
-                    border: 1px solid #62bd48;
-                }
-                &.mild {
-                    border: 1px solid #ffde00;
-                }
-                &.moderate {
-                    border: 1px solid #ff8a00;
-                }
-                &.severe {
-                    border: 1px solid #d70d0d;
-                }
-            }
+        &.mild {
+          border: 1px solid #ffde00;
+        }
+        &.moderate {
+          border: 1px solid #ff8a00;
         }
-        .van-calendar__selected-day {
-            width: 27px;
-            height: 27px;
-            border-radius: 50%;
-            font-size: 12px;
+        &.severe {
+          border: 1px solid #d70d0d;
         }
+      }
+    }
+    .van-calendar__selected-day {
+      width: 27px;
+      height: 27px;
+      border-radius: 50%;
+      font-size: 12px;
     }
+  }
 }
 </style>
 <style scoped lang="scss">
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 5a45fd9..132ef2c 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -6,143 +6,190 @@
  * @description:
 -->
 <template>
-    <!-- 周/月报 -->
-    <div class="report">
-        <van-nav-bar title="心理监测周报" :border="true"  @click-left="onNavBack">
-            <template #left >
-                <van-icon name="arrow-left" size="24" style="padding: 0" v-show="params.isShowLeft"/>
-                <span v-show="params.isShowLeft">返回</span>
-            </template>
-        </van-nav-bar>
-        <div class="main">
-            <!-- 总评 -->
-            <div class="overall-rating">
-                <div class="con">
-                    <p class="space-between">
-                        <span class="bold">本周总评</span>
-                        <span class="time">{{ resetDate(weekResult.StartDate,weekResult.EndDate) || '--' }}</span>
-                    </p>
-                    <p
-                        class="bold-pro"
-                        :style="{color: calcResultColor(weekResult.SummaryLevel) || '--'}"
-                    >{{ weekResult.Summary }}</p>
-                    <p class="normal">监测次数: {{ weekResult.Total || '--'}}次</p>
-                    <p class="normal">{{ weekResult.Explain || '--' }}</p>
-                </div>
-            </div>
-            <div class="line"></div>
-            <div class="pie-chart-top">
-                <p class="bold">上周趋势对比</p>
-                <p>{{ resetDate(weekResult.StartDate,weekResult.EndDate) || '--' }}</p>
-            </div>
-            <div class="count">
-                <p>监测次数：{{ weekResult.LastTotal || '--' }}次</p>
-            </div>
-            <!-- 趋势对比-饼状图 -->
-            <div class="pie-chart-con">
-                <div class="pie-chart-left">
-                    <div id="pieChart" ref="pieChart"></div>
-                </div>
+  <!-- 周/月报 -->
+  <div class="report">
+    <van-nav-bar title="心理监测周报" :border="true" @click-left="onNavBack">
+      <template #left>
+        <van-icon
+          name="arrow-left"
+          size="24"
+          style="padding: 0"
+          v-show="params.isShowLeft"
+        />
+        <span v-show="params.isShowLeft">返回</span>
+      </template>
+    </van-nav-bar>
+    <div class="main">
+      <!-- 总评 -->
+      <div class="overall-rating">
+        <div class="con">
+          <p class="space-between">
+            <span class="bold">本周总评</span>
+            <span class="time">{{
+              resetDate(weekResult.StartDate, weekResult.EndDate) || "--"
+            }}</span>
+          </p>
+          <p
+            class="bold-pro"
+            :style="{ color: calcResultColor(weekResult.SummaryLevel) || '--' }"
+          >
+            {{ weekResult.Summary }}
+          </p>
+          <p class="normal">监测次数: {{ weekResult.Total || "--" }}次</p>
+          <p class="normal">{{ weekResult.Explain || "--" }}</p>
+        </div>
+      </div>
+      <div class="line"></div>
+      <div class="pie-chart-top">
+        <p class="bold">上周趋势对比</p>
+        <p>{{ resetDate(weekResult.StartDate, weekResult.EndDate) || "--" }}</p>
+      </div>
+      <div class="count">
+        <p>监测次数：{{ weekResult.LastTotal || "--" }}次</p>
+      </div>
+      <!-- 趋势对比-饼状图 -->
+      <div class="pie-chart-con">
+        <div class="pie-chart-left">
+          <div id="pieChart" ref="pieChart"></div>
+        </div>
 
-                <div class="pie-chart-right">
-                    <div class="list">
-                        <div class="item" v-for="(item, index) in pieRightList" :key="index">
-                            <div class="item-left">
-                                <div class="circle" :style="{backgroundColor: item.color}"></div>
-                                <span class="text">{{ item.text || '--' }}</span>
-                            </div>
+        <div class="pie-chart-right">
+          <div class="list">
+            <div
+              class="item"
+              v-for="(item, index) in pieRightList"
+              :key="index"
+            >
+              <div class="item-left">
+                <div
+                  class="circle"
+                  :style="{ backgroundColor: item.color }"
+                ></div>
+                <span class="text">{{ item.text || "--" }}</span>
+              </div>
 
-                            <div class="item-right">
-                                <span
-                                    :style="{color: item.color}"
-                                >{{ item.count ? item.count + '次' : '0次'}}</span>
-                                <label
-                                    :style="{color: item.color}"
-                                >{{ item.percentage ? '(' + item.percentage + '%' + ')' : '(0%)'}}</label>
-                            </div>
+              <div class="item-right">
+                <span :style="{ color: item.color }">{{
+                  item.count ? item.count + "次" : "0次"
+                }}</span>
+                <label :style="{ color: item.color }">{{
+                  item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
+                }}</label>
+              </div>
 
-                            <div class="status">
-                                <img :src="calcImg(item.percentage, item.lastPercentage)" alt="" />
-                                <span :style="{color: calcImg(item.percentage, item.lastPercentage, true) != 0 ? item.color : ''}">{{ calcImg(item.percentage, item.lastPercentage, true) ? Math.abs(calcImg(item.percentage, item.lastPercentage, true)) + '%' : '持平'}}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+              <div class="status">
+                <img
+                  :src="calcImg(item.percentage, item.lastPercentage)"
+                  alt=""
+                />
+                <span
+                  :style="{
+                    color:
+                      calcImg(item.percentage, item.lastPercentage, true) != 0
+                        ? item.color
+                        : '',
+                  }"
+                  >{{
+                    calcImg(item.percentage, item.lastPercentage, true)
+                      ? Math.abs(
+                          calcImg(item.percentage, item.lastPercentage, true)
+                        ) + "%"
+                      : "持平"
+                  }}</span
+                >
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="statistics">
+        <div class="list">
+          <div
+            class="item"
+            v-for="(item, index) in statisticsList"
+            :key="index"
+          >
+            <div class="top">
+              <span>{{ item.label || "--" }}</span>
             </div>
-            <div class="statistics">
-                <div class="list">
-                    <div class="item" v-for="(item, index) in statisticsList" :key="index">
-                        <div class="top">
-                            <span>{{ item.label || '--' }}</span>
-                        </div>
-
-                        <div class="middle">
-                            <span :style="{ color: calcColor(item.value)}">{{ item.value || '--' }}</span>
-                        </div>
 
-                        <div class="bottom">
-                            <span>{{ item.time || '--' }}</span>
-                        </div>
-                    </div>
-                </div>
+            <div class="middle">
+              <span :style="{ color: calcColor(item.value) }">{{
+                item.value || "--"
+              }}</span>
             </div>
-            <div class="line"></div>
-            <!-- 数据图-柱形图 -->
-            <div class="bar-chart">
-                <div class="echart" ref="charts"></div>
+
+            <div class="bottom">
+              <span>{{ item.time || "--" }}</span>
             </div>
-            <div class="line"></div>
-            <!-- 建议 -->
-            <div class="advice">
-                <div class="content">
-                    <p class="title">健康建议</p>
-                    <p>{{ weekResult.Advice || '--' }}</p>
-                </div>
+          </div>
+        </div>
+      </div>
+      <div class="line"></div>
+      <!-- 数据图-柱形图 -->
+      <div class="bar-chart">
+        <div class="echart" ref="charts"></div>
+      </div>
+      <div class="line"></div>
+      <!-- 建议 -->
+      <div class="advice">
+        <div class="content">
+          <p class="title">健康建议</p>
+          <p>{{ weekResult.Advice || "--" }}</p>
+        </div>
+      </div>
+      <!-- 概览 -->
+      <div class="overview">
+        <div class="content">
+          <div class="title">
+            <span class="title-text">{{ surveyTitle }}</span>
+            <div class="mood-list">
+              <div
+                class="item"
+                v-for="(item, index) in emotionList"
+                :key="index"
+              >
+                <p>
+                  <span :style="{ color: item.color }" class="day">{{
+                    item.days
+                  }}</span>
+                  <span class="day-text">天</span>
+                  <img :src="calcWeekImg(item.days, item.lastDay)" alt="" />
+                  <span class="day-text status">{{
+                    calcWeekImg(item.days, item.lastDay, true)
+                  }}</span>
+                </p>
+                <p>{{ item.text }}</p>
+              </div>
             </div>
-            <!-- 概览 -->
-            <div class="overview">
-                <div class="content">
-                    <div class="title">
-                        <span class="title-text">{{ surveyTitle }}</span>
-                        <div class="mood-list">
-                            <div class="item" v-for="(item, index) in emotionList" :key="index">
-                                <p>
-                                    <span :style="{color: item.color}" class="day">{{ item.days }}</span>
-                                    <span class="day-text">天</span>
-                                    <img :src="calcWeekImg(item.days, item.lastDay)" alt="">
-                                    <span class="day-text status">{{ calcWeekImg(item.days, item.lastDay, true) }}</span>
-                                </p>
-                                <p>{{ item.text }}</p>
-                            </div>
-                        </div>
-                        <!-- <div class="mood-list-no-data" v-else>
+            <!-- <div class="mood-list-no-data" v-else>
                             <div class="no-data">
                                 <img src="../../../../assets/img/no_data_01.png" alt />
                                 <p>暂无数据</p>
                             </div>
                         </div>-->
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="main no-data">
-            <img src="../../../../assets/img/no_data_01.png" alt />
-            <p>暂无数据</p>
+          </div>
         </div>
+      </div>
     </div>
+    <div class="main no-data">
+      <img src="../../../../assets/img/no_data_01.png" alt />
+      <p>暂无数据</p>
+    </div>
+  </div>
 </template>
 
 <script>
 import { EmotionModel, PsyBaseUrl } from "@/config/models";
-import { isNotNull} from "@/utils/index";
+import { isNotNull } from "@/utils/index";
 import axios from "axios";
 import APICore from "@/api/core";
 export default {
-  name:'',
-  data(){
-   return {
-       pieRightList: [
-          /*  {
+  name: "",
+  data() {
+    return {
+      pieRightList: [
+        /*  {
                     text: "无情绪倾向",
                     count: 12,
                     percentage: "80",
@@ -166,72 +213,72 @@ export default {
                     percentage: "80",
                     color: "#d70d0d"
                 } */
-       ],
-       statisticsList: [
-           /*  { label: "最大值", value: "75", time: "08:15" },
+      ],
+      statisticsList: [
+        /*  { label: "最大值", value: "75", time: "08:15" },
                 { label: "最小值", value: "40", time: "10:15" },
                 { label: "最近值", value: "50", time: "18:15" } */
-       ],
-       emotionList: [],
-       surveyTitle: '本周概览',
-       echarts: null,
-       // 路由传过来的情绪参数
-       emoName: '',
-       pieData: [],
-       xAxisData: [],
-       pieEcharts: null,
-       monitoringCount: '',
-       // 7天和30天最大数据列表
-       weekAndMonData: [],
-       defaultSeries: null,
-       defaultLegend: [
-           {
-                            name: `轻度${this.emoName}倾向`,
-                            icon: "rect",
-                            itemStyle: {
-                                color: "#ffde00"
-                            },
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `中度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#ff8a00"
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `重度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#d70d0d",
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
-                            itemStyle: {
-                                color: "#62BD48"
-                            },
-                            textStyle: {
-                                // 项目遗留问题，新项目不需重新转换文字大小
-                                fontSize: 12
-                            }
-                        },
-       ],
-       params: {},
-       weekResult: {},
-       upImg: require("@/assets/img/psychological/up.png"),
-       downImg: require("@/assets/img/psychological/down.png")
-   }
+      ],
+      emotionList: [],
+      surveyTitle: "本周概览",
+      echarts: null,
+      // 路由传过来的情绪参数
+      emoName: "",
+      pieData: [],
+      xAxisData: [],
+      pieEcharts: null,
+      monitoringCount: "",
+      // 7天和30天最大数据列表
+      weekAndMonData: [],
+      defaultSeries: null,
+      defaultLegend: [
+        {
+          name: `轻度${this.emoName}倾向`,
+          icon: "rect",
+          itemStyle: {
+            color: "#ffde00",
+          },
+          textStyle: {
+            fontSize: 12,
+          },
+        },
+        {
+          name: `中度${this.emoName}倾向`,
+          itemStyle: {
+            color: "#ff8a00",
+          },
+          icon: "rect",
+          textStyle: {
+            fontSize: 12,
+          },
+        },
+        {
+          name: `重度${this.emoName}倾向`,
+          itemStyle: {
+            color: "#d70d0d",
+          },
+          icon: "rect",
+          textStyle: {
+            fontSize: 12,
+          },
+        },
+        {
+          name: `无${this.emoName}倾向`,
+          icon: "rect",
+          itemStyle: {
+            color: "#62BD48",
+          },
+          textStyle: {
+            // 项目遗留问题，新项目不需重新转换文字大小
+            fontSize: 12,
+          },
+        },
+      ],
+      params: {},
+      weekResult: {},
+      upImg: require("@/assets/img/psychological/up.png"),
+      downImg: require("@/assets/img/psychological/down.png"),
+    };
   },
   created() {
     this.initEchartText();
@@ -243,756 +290,771 @@ export default {
   watch: {
     // 监听数据发生变化 初始化各项图表
     emotionData: {
-        handler(n, o) {
-            this.initEchart();
-        },
-        deep: true
+      handler(n, o) {
+        this.initEchart();
+      },
+      deep: true,
     },
     xAxisData: {
-        handler(n, o) {
-            this.initEchart();
-        },
-        deep: true
+      handler(n, o) {
+        this.initEchart();
+      },
+      deep: true,
     },
     pieData: {
-        handler(n, o) {
-            this.initPieEchart();
-        },
-        deep: true
+      handler(n, o) {
+        this.initPieEchart();
+      },
+      deep: true,
     },
   },
   computed: {
     // 折线图标题
     echartsTitle() {
-        return `${this.emoName}数据图`;
+      return `${this.emoName}数据图`;
     },
     defaultOptions() {
-            return {
-                time: {
-                    useUTC: false
-                },
-                title: {
-                    text: this.echartsTitle,
-                    left: 1,
-                    right: 25,
-                    bottom: 20,
-                    top: "3%",
-                    textStyle: {
-                        fontSize: 18,
-                        fontWeight: "bold"
-                    }
-                },
-                legend: {
-                    width: "65%",
-                    orient: "horizontal",
-                    right: '5%',
-                    top: '3%',
-                    bottom: "1%",
-                    itemHeight: 12,
-                    itemWidth: 12,
-                    itemGap: 10,
-                    align: 'left',
-                    selectedMode: false,
-                    data: [
-                        {
-                            name: `无${this.emoName}倾向`,
-                            icon: "rect",
-                            itemStyle: {
-                                color: "#62BD48"
-                            },
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `轻度${this.emoName}倾向`,
-                            icon: "rect",
-                            itemStyle: {
-                                color: "#ffde00"
-                            },
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `中度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#ff8a00"
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        {
-                            name: `重度${this.emoName}倾向`,
-                            itemStyle: {
-                                color: "#d70d0d",
-                            },
-                            icon: "rect",
-                            textStyle: {
-                                fontSize: 12
-                            }
-                        },
-                        
-                    ],
-                    formatter: function(name) {
-                        // 自定义显示内容
-                        if (name.length > 6) {
-                            return (
-                                name.substring(0, 6) + "\n" + name.substring(6)
-                            );
-                        } else {
-                            return name;
-                        }
-                    }
-                },
-                grid: {
-                    show: true,
-                    borderWidth: 1,
-                    top: '20%',
-                    left: '1%',
-                    right: '5%',
-                    bottom: '15%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: "category",
-                    axisLine: {
-                        show: false
-                    },
-                    textStyle: {
-                        fontSize: 10
-                    },
-                    axisTick: {
-                        show: false
-                    },
-                    splitLine: {
-                        show: false,
-                        lineStyle: {
-                            color: "#ddd",
-                            width: 2
-                        }
-                    },
-                    nameLocation: 'center',
-                    axisLabel: {
-                        show: true,
-                        fontSize: 12,
-                        showMinLabel: true, //显示最小值
-                        showMaxLabel: true, //显示最大值
-                    },
-                    data: this.xAxisData
-                },
-                dataZoom: [
-                    {
-                        type: "inside",
-                        start: 0,
-                        end: 100,
-                    },
-                    {
-                        start: 0,
-                        end: 100,
-                        textStyle: {
-                            color: "#FFF",
-                            fontSize: 14
-                        },
-                        show: true,
-                        height: 25,
-                        bottom: '3%',
-                        handleStyle: {
-                            borderWidth: 1,
-                            borderCap: "square"
-                        }
-                    }
-                ],
-                tooltip: {
-                    trigger: "axis",
-                    textStyle: {
-                        fontSize: 14,
-                        align: "center"
-                    },
-                    formatter: function(params) {
-                        return params[0].marker  + params[0].name + '--' + params[0].value + '</br>'
-                    }
-                },
-                yAxis: {
-                    type: "value",
-                    max: 100,
-                    min: 0,
-                    interval: 20,
-                    splitNumber : 1,
-			        boundaryGap : [ '5%', '5%' ],
-                    nameTextStyle: {
-                        fontSize: 13
-                    },
-                    alignTicks: true,
-                    axisTick: {
-                        show: true
-                    },
-                    axisLabel: {
-                        show: true,
-                        fontSize: 13,
-                    },
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: "#ddd",
-                            width: 1
-                        }
-                    }
-                },
-                series: [
-                    {
-                        name: `无${this.emoName}倾向`,
-                        type: "line",
-                        padding: 5,
-                        data: this.emotionData,
-                        symbol: "circle",
-                        symbolSize: 8,
-                    },
-                    {
-                        name: `轻度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `中度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `重度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    }
-                ]
-            };
+      return {
+        time: {
+          useUTC: false,
+        },
+        title: {
+          text: this.echartsTitle,
+          left: 1,
+          right: 25,
+          bottom: 20,
+          top: "3%",
+          textStyle: {
+            fontSize: 18,
+            fontWeight: "bold",
+          },
+        },
+        legend: {
+          width: "65%",
+          orient: "horizontal",
+          right: "5%",
+          top: "3%",
+          bottom: "1%",
+          itemHeight: 12,
+          itemWidth: 12,
+          itemGap: 10,
+          align: "left",
+          selectedMode: false,
+          data: [
+            {
+              name: `无${this.emoName}倾向`,
+              icon: "rect",
+              itemStyle: {
+                color: "#62BD48",
+              },
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `轻度${this.emoName}倾向`,
+              icon: "rect",
+              itemStyle: {
+                color: "#ffde00",
+              },
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `中度${this.emoName}倾向`,
+              itemStyle: {
+                color: "#ff8a00",
+              },
+              icon: "rect",
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+            {
+              name: `重度${this.emoName}倾向`,
+              itemStyle: {
+                color: "#d70d0d",
+              },
+              icon: "rect",
+              textStyle: {
+                fontSize: 12,
+              },
+            },
+          ],
+          formatter: function (name) {
+            // 自定义显示内容
+            if (name.length > 6) {
+              return name.substring(0, 6) + "\n" + name.substring(6);
+            } else {
+              return name;
+            }
+          },
+        },
+        grid: {
+          show: true,
+          borderWidth: 1,
+          top: "20%",
+          left: "1%",
+          right: "5%",
+          bottom: "15%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "category",
+          axisLine: {
+            show: false,
+          },
+          textStyle: {
+            fontSize: 10,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: "#ddd",
+              width: 2,
+            },
+          },
+          nameLocation: "center",
+          axisLabel: {
+            show: true,
+            fontSize: 12,
+            showMinLabel: true, //显示最小值
+            showMaxLabel: true, //显示最大值
+          },
+          data: this.xAxisData,
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+            textStyle: {
+              color: "#FFF",
+              fontSize: 14,
+            },
+            show: true,
+            height: 25,
+            bottom: "3%",
+            handleStyle: {
+              borderWidth: 1,
+              borderCap: "square",
+            },
+          },
+        ],
+        tooltip: {
+          trigger: "axis",
+          textStyle: {
+            fontSize: 14,
+            align: "center",
+          },
+          formatter: function (params) {
+            return (
+              params[0].marker +
+              params[0].name +
+              "--" +
+              params[0].value +
+              "</br>"
+            );
+          },
+        },
+        yAxis: {
+          type: "value",
+          max: 100,
+          min: 0,
+          interval: 20,
+          splitNumber: 1,
+          boundaryGap: ["5%", "5%"],
+          nameTextStyle: {
+            fontSize: 13,
+          },
+          alignTicks: true,
+          axisTick: {
+            show: true,
+          },
+          axisLabel: {
+            show: true,
+            fontSize: 13,
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "#ddd",
+              width: 1,
+            },
+          },
+        },
+        series: [
+          {
+            name: `无${this.emoName}倾向`,
+            type: "line",
+            padding: 5,
+            data: this.emotionData,
+            symbol: "circle",
+            symbolSize: 8,
+          },
+          {
+            name: `轻度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+          {
+            name: `中度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+          {
+            name: `重度${this.emoName}倾向`,
+            type: "line",
+            data: "",
+          },
+        ],
+      };
     },
     // 饼状图配置
     pieOption() {
-            return {
-                tooltip: {
-                    trigger: "item",
-                    textStyle: {
-                        fontSize: 14
-                    },
-                    position: "right"
-                },
-                legend: {
-                    top: "5%",
-                    left: "center",
-                    show: false
-                },
-                series: [
-                    {
-                        type: "pie",
-                        radius: ["40%", "80%"],
-                        avoidLabelOverlap: false,
-                        startAngle: 270, // 设置逆时针渲染
-                        itemStyle: {
-                            borderRadius: 5,
-                            borderColor: "#fff",
-                            borderWidth: 2,
-                            fontSize: 16
-                        },
-                        label: {
-                            show: false,
-                            position: "center",
-                            fontSize: 16
-                        },
-                        emphasis: {
-                            label: {
-                                show: false,
-                                fontSize: 16,
-                                fontWeight: "bold"
-                            }
-                        },
-                        labelLine: {
-                            show: false
-                        },
-                        data: this.pieData
-                    }
-                ]
-            };
+      return {
+        tooltip: {
+          trigger: "item",
+          textStyle: {
+            fontSize: 14,
+          },
+          position: "right",
+        },
+        legend: {
+          top: "5%",
+          left: "center",
+          show: false,
+        },
+        series: [
+          {
+            type: "pie",
+            radius: ["40%", "80%"],
+            avoidLabelOverlap: false,
+            startAngle: 270, // 设置逆时针渲染
+            itemStyle: {
+              borderRadius: 5,
+              borderColor: "#fff",
+              borderWidth: 2,
+              fontSize: 16,
+            },
+            label: {
+              show: false,
+              position: "center",
+              fontSize: 16,
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: 16,
+                fontWeight: "bold",
+              },
+            },
+            labelLine: {
+              show: false,
+            },
+            data: this.pieData,
+          },
+        ],
+      };
     },
   },
   methods: {
     calcWeekImg(cur, last, callBackText) {
-        let imgurl = '';
-        let text = '';
-        if(isNotNull(cur) && isNotNull(last) && this.weekAndMonData.length > 0) {
-            let curNumber = Number(cur);
-            let latNumber = Number(last);
-            if(curNumber - latNumber == 0) {
-                text = '持平';
-            } else {
-                imgurl = curNumber < latNumber ? this.downImg : this.upImg;
-                text = Math.abs(curNumber - latNumber) + '天';
-            }
-            if(callBackText) {
-                return text
-            } else {
-                return imgurl
-            }
+      let imgurl = "";
+      let text = "";
+      if (isNotNull(cur) && isNotNull(last) && this.weekAndMonData.length > 0) {
+        let curNumber = Number(cur);
+        let latNumber = Number(last);
+        if (curNumber - latNumber == 0) {
+          text = "持平";
+        } else {
+          imgurl = curNumber < latNumber ? this.downImg : this.upImg;
+          text = Math.abs(curNumber - latNumber) + "天";
         }
+        if (callBackText) {
+          return text;
+        } else {
+          return imgurl;
+        }
+      }
     },
     // 计算显示是上升or下降的图片
     /**
-     * 
-     * @param { 本周情绪比例} current 
-     * @param { 上周情绪比例 } last 
-     * @param { 是否返回对比比例 } isCallBackCompare 
+     *
+     * @param { 本周情绪比例} current
+     * @param { 上周情绪比例 } last
+     * @param { 是否返回对比比例 } isCallBackCompare
      */
     calcImg(current, last, isCallBackCompare) {
-        let imgUrl = '';
-        let compare = '';
-        if(isNotNull(current) && isNotNull(last)) {
-            compare = Number(current) - Number(last);
-            imgUrl = compare > 0 ? this.upImg : compare == 0 ? '' : this.downImg
-        }
-        if(isCallBackCompare) {
-            return compare
+      let imgUrl = "";
+      let compare = "";
+      if (isNotNull(current) && isNotNull(last)) {
+        compare = Number(current) - Number(last);
+        imgUrl = compare > 0 ? this.upImg : compare == 0 ? "" : this.downImg;
+      }
+      if (isCallBackCompare) {
+        return compare;
+      } else {
+        return imgUrl;
+      }
+    },
+    async loadParams() {
+      let params = this.$route.query;
+      if (params) {
+        this.params = params;
+        if (!params.accessToken) {
+          let authToken = await this.getAuth();
+          this.$store.commit("ssjlToken", authToken);
         } else {
-            return imgUrl;
+          this.$store.commit("ssjlToken", params.accessToken);
         }
+        this.getWeekResultDetail();
+      }
     },
-    async loadParams() {
-        let params = this.$route.query;
-            if (params) {
-                this.params = params;
-                if(!params.accessToken) {
-                    let authToken = await this.getAuth();
-                    this.$store.commit('ssjlToken', authToken);
-                } else {
-                    this.$store.commit('ssjlToken', params.accessToken);
-                }
-                this.getWeekResultDetail();
-            }
-        },
     //   获取b端token
     getAuth() {
-        let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
-        let that = this;
-        return new Promise((resolve, reject) => {
-            APICore.getAuth({ manufactorId: manufactorId }).then(res => {
-                let data = res.data;
-                if(data.code === 0) {
-                    resolve(res.data.data);
-                } else {
-                    this.$toast.fail(`${data.message}`);
-                    reject('');
-                }
-            })
-        })
+      let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
+      let that = this;
+      return new Promise((resolve, reject) => {
+        APICore.getAuth({ manufactorId: manufactorId }).then((res) => {
+          let data = res.data;
+          if (data.code === 0) {
+            resolve(res.data.data);
+          } else {
+            this.$toast.fail(`${data.message}`);
+            reject("");
+          }
+        });
+      });
     },
-    initEchartText( ) {
-        this.defaultSeries = [
-                {
-                        name: ``,
-                        type: "line",
-                        padding: 5,
-                        data: this.emotionData,
-                        symbol: "circle",
-                        symbolSize: 8, // 拐点圆的大小
-                        areaStyle: {},
-                    },
-                    {
-                        name: `轻度${this.emoName}倾向`,
-                        type: "line",
-                        padding: 10,
-                        data: "",
-                        symbol: "circle",
-                        symbolSize: 8, // 拐点圆的大小
-                    },
-                    {
-                        name: `中度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    },
-                    {
-                        name: `重度${this.emoName}倾向`,
-                        type: "line",
-                        data: ""
-                    }
-            ];
+    initEchartText() {
+      this.defaultSeries = [
+        {
+          name: ``,
+          type: "line",
+          padding: 5,
+          data: this.emotionData,
+          symbol: "circle",
+          symbolSize: 8, // 拐点圆的大小
+          areaStyle: {},
+        },
+        {
+          name: `轻度${this.emoName}倾向`,
+          type: "line",
+          padding: 10,
+          data: "",
+          symbol: "circle",
+          symbolSize: 8, // 拐点圆的大小
+        },
+        {
+          name: `中度${this.emoName}倾向`,
+          type: "line",
+          data: "",
+        },
+        {
+          name: `重度${this.emoName}倾向`,
+          type: "line",
+          data: "",
+        },
+      ];
     },
     calcTitle(type) {
-        let title = '';
-        switch(type) {
-            case 1:
-                title = '压力'
-                break;
-            case 2:
-                title = '抑郁'
-                break;
-            case 3:
-                title = '疲劳'
-                break;
-            default: break;
-        };
-        return title;
+      let title = "";
+      switch (type) {
+        case 1:
+          title = "压力";
+          break;
+        case 2:
+          title = "焦虑";
+          break;
+        case 3:
+          title = "疲劳";
+          break;
+        default:
+          break;
+      }
+      return title;
     },
     getWeekResultDetail() {
-        this.$toast.loading('数据加载中');
-        let baseUrl = process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart';
-        let reqUrl = `${baseUrl}/api/Data/GetWeekResultDetail`;
-        let reqParams = {
-            recordId: this.params.recordId,
-        };
-        axios.get(reqUrl, {
-            params: { ...reqParams },
-           /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
-        }).then(res => {
-            const data = res.data.response;
-            let chartData = data.ChartData ? (JSON.parse(data.ChartData)).filter(item => {return item.Key}) : [];
-            if(data) {
-                this.monitoringCount = data.Total;
-                this.pieRightList = [];
-                this.statisticsList = [];
-                this.emotionList = [];
-                this.weekResult = data;
-                this.emoName = this.calcTitle(data.Type);
-            }
-            let None = {
-                count: data.None,
-                percentage: this.calcPercentage(
-                    data.None,
-                    data.Total
-                ),
-                text: `无${this.emoName}倾向`,
-                color: "#62BD48",
-                scale: data.NoneRatio,
-                lastPercentage: this.calcPercentage(
-                    data.LastNone,
-                    data.LastTotal
-                )
-            };
-            let Mild = {
-                count: data.Mild,
-                percentage: this.calcPercentage(
-                data.Mild,
-                data.Total
-                ),
-                text: `轻度${this.emoName}倾向`,
-                color: "#ffde00",
-                scale: data.MildRatio,
-                lastPercentage: this.calcPercentage(
-                    data.LastMild,
-                    data.LastTotal
-                )
+      this.$toast.loading("数据加载中");
+      let baseUrl =
+        process.env.NODE_ENV === "production"
+          ? "https://dbmq.rzliot.com/auth_heart"
+          : "https://dbmq.rzliot.com/heart";
+      let reqUrl = `${baseUrl}/api/Data/GetWeekResultDetail`;
+      let reqParams = {
+        recordId: this.params.recordId,
+      };
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
+        })
+        .then((res) => {
+          const data = res.data.response;
+          let chartData = data.ChartData
+            ? JSON.parse(data.ChartData).filter((item) => {
+                return item.Key;
+              })
+            : [];
+          if (data) {
+            this.monitoringCount = data.Total;
+            this.pieRightList = [];
+            this.statisticsList = [];
+            this.emotionList = [];
+            this.weekResult = data;
+            this.emoName = this.calcTitle(data.Type);
+          }
+          let None = {
+            count: data.None,
+            percentage: this.calcPercentage(data.None, data.Total),
+            text: `无${this.emoName}倾向`,
+            color: "#62BD48",
+            scale: data.NoneRatio,
+            lastPercentage: this.calcPercentage(data.LastNone, data.LastTotal),
+          };
+          let Mild = {
+            count: data.Mild,
+            percentage: this.calcPercentage(data.Mild, data.Total),
+            text: `轻度${this.emoName}倾向`,
+            color: "#ffde00",
+            scale: data.MildRatio,
+            lastPercentage: this.calcPercentage(data.LastMild, data.LastTotal),
+          };
+          let Moderate = {
+            count: data.Moderate,
+            percentage: this.calcPercentage(data.Moderate, data.Total),
+            text: `中度${this.emoName}倾向`,
+            color: "#ff8a00",
+            scale: data.ModerateRatio,
+            lastPercentage: this.calcPercentage(
+              data.LastModerate,
+              data.LastTotal
+            ),
+          };
+          let Severe = {
+            count: data.Severe,
+            percentage: this.calcPercentage(data.Severe, data.Total),
+            text: `重度${this.emoName}倾向`,
+            color: "#d70d0d",
+            scale: data.SevereRatio,
+            lastPercentage: this.calcPercentage(
+              data.LastSevere,
+              data.LastTotal
+            ),
+          };
+          // 饼状图右边数据
+          this.pieRightList.push(None);
+          this.pieRightList.push(Mild);
+          this.pieRightList.push(Moderate);
+          this.pieRightList.push(Severe);
+          this.pieData = this.pieRightList.map((item) => {
+            item.value = item.count;
+            item.itemStyle = {
+              color: item.color,
             };
-            let Moderate = {
-                count: data.Moderate,
-                percentage: this.calcPercentage(
-                    data.Moderate,
-                    data.Total
-                ),
-                text: `中度${this.emoName}倾向`,
-                color: "#ff8a00",
-                scale: data.ModerateRatio,
-                lastPercentage: this.calcPercentage(
-                    data.LastModerate,
-                    data.LastTotal
-                )
+            return item;
+          });
+          let Max = {
+            label: "最大值",
+            value: data.Max,
+            time: data.MaxDesc
+              ? this.currentDays === 0
+                ? this.$dayjs(data.MaxDesc).format("HH:mm")
+                : this.$dayjs(data.MaxDesc).format("MM/DD HH:mm")
+              : "",
+          };
+          let Min = {
+            label: "最小值",
+            value: data.Min,
+            time: data.MinDesc
+              ? this.currentDays === 0
+                ? this.$dayjs(data.MinDesc).format("HH:mm")
+                : this.$dayjs(data.MinDesc).format("MM/DD HH:mm")
+              : "",
+          };
+          let Avg = {
+            label: "平均值",
+            value: data.Avg,
+            time: data.AvgDesc
+              ? this.currentDays === 0
+                ? this.$dayjs(data.AvgDesc).format("HH:mm")
+                : this.$dayjs(data.AvgDesc).format("MM/DD HH:mm")
+              : "",
+          };
+          this.statisticsList.push(Max);
+          this.statisticsList.push(Min);
+          this.statisticsList.push(Avg);
+          let NoneDay = {
+            days: data.NoneDay,
+            text: `无${this.emoName}倾向`,
+            color: "#62BD48",
+            lastDay: data.LastNoneDay,
+            scale: data.NoneDayRatio,
+          };
+          let MildDay = {
+            days: data.MildDay,
+            text: `轻度${this.emoName}倾向`,
+            color: "#ffde00",
+            lastDay: data.LastMildDay,
+            scale: data.MildDayRatio,
+          };
+          let ModerateDay = {
+            days: data.ModerateDay,
+            text: `中度${this.emoName}倾向`,
+            color: "#ff8a00",
+            lastDay: data.LastModerateDay,
+            scale: data.ModerateDayRatio,
+          };
+          let SevereDay = {
+            days: data.SevereDay,
+            text: `重度${this.emoName}倾向`,
+            color: "#d70d0d",
+            lastDay: data.LastSevereDay,
+            scale: data.SevereDayRatio,
+          };
+          this.emotionList.push(NoneDay);
+          this.emotionList.push(MildDay);
+          this.emotionList.push(ModerateDay);
+          this.emotionList.push(SevereDay);
+          // 图表数据
+          this.emotionData = chartData.map((item) => {
+            return {
+              value: item.Value,
+              itemStyle: {
+                color: this.calcResultColor(item.Level),
+              },
             };
-            let Severe = {
-                count: data.Severe,
-                percentage: this.calcPercentage(
-                    data.Severe,
-                    data.Total
-                ),
-                text: `重度${this.emoName}倾向`,
-                color: "#d70d0d",
-                scale: data.SevereRatio,
-                lastPercentage: this.calcPercentage(
-                    data.LastSevere,
-                    data.LastTotal
-                )
+          });
+          this.weekAndMonData = chartData.map((item, index) => {
+            return {
+              value: [index, item.MinValue, item.MaxValue],
             };
-                        // 饼状图右边数据
-                        this.pieRightList.push(None);
-                        this.pieRightList.push(Mild);
-                        this.pieRightList.push(Moderate);
-                        this.pieRightList.push(Severe);
-                        this.pieData = this.pieRightList.map(item => {
-                            item.value = item.count;
-                            item.itemStyle = {
-                                color: item.color
-                            };
-                            return item;
-                        });
-                        let Max = {
-                            label: "最大值",
-                            value: data.Max,
-                            time: data.MaxDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.MaxDesc).format("HH:mm")
-                                : this.$dayjs(data.MaxDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        let Min = {
-                            label: "最小值",
-                            value: data.Min,
-                            time: data.MinDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.MinDesc).format("HH:mm")
-                                : this.$dayjs(data.MinDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        let Avg = {
-                            label: "平均值",
-                            value: data.Avg,
-                            time: data.AvgDesc
-                                ? this.currentDays === 0 ? this.$dayjs(data.AvgDesc).format("HH:mm")
-                                : this.$dayjs(data.AvgDesc).format("MM/DD HH:mm")
-                                : ""
-                        };
-                        this.statisticsList.push(Max);
-                        this.statisticsList.push(Min);
-                        this.statisticsList.push(Avg);
-                        let NoneDay = {
-                            days: data.NoneDay,
-                            text: `无${this.emoName}倾向`,
-                            color: "#62BD48",
-                            lastDay: data.LastNoneDay,
-                            scale: data.NoneDayRatio
-                        };
-                        let MildDay = {
-                            days: data.MildDay,
-                            text: `轻度${this.emoName}倾向`,
-                            color: "#ffde00",
-                            lastDay: data.LastMildDay,
-                            scale: data.MildDayRatio
-                        };
-                        let ModerateDay = {
-                            days: data.ModerateDay,
-                            text: `中度${this.emoName}倾向`,
-                            color: "#ff8a00",
-                            lastDay: data.LastModerateDay,
-                            scale: data.ModerateDayRatio
-                        };
-                        let SevereDay = {
-                            days: data.SevereDay,
-                            text: `重度${this.emoName}倾向`,
-                            color: "#d70d0d",
-                            lastDay: data.LastSevereDay,
-                            scale: data.SevereDayRatio
-                        };
-                        this.emotionList.push(NoneDay);
-                        this.emotionList.push(MildDay);
-                        this.emotionList.push(ModerateDay);
-                        this.emotionList.push(SevereDay);
-                        // 图表数据
-                        this.emotionData = chartData.map(item => {
-                            return {
-                                value: item.Value,
-                                itemStyle: {
-                                    color: this.calcResultColor(item.Level)
-                                }
-                            };
-                        });
-                        this.weekAndMonData = chartData.map((item, index) => {
-                            return {
-                                value: [index, item.MinValue, item.MaxValue],
-                            };
-                        });
-                        this.xAxisData = chartData.map(item => {
-                            return item.Key ? this.$dayjs(item.Key.replace(/-/g, "/")).format(
-                                "MM/DD"
-                            ) : item.key;
-                        });
-                        let emphasisStyle = {
-                            itemStyle: {
-                                shadowBlur: 10,
-                                shadowColor: 'rgba(0,0,0,0.3)'
-                            }
-                        };
-                        let that = this;
-                        // 7天和30天变成柱状图
-                        this.weekAndMonthSeries = [
-                                {
-                                    name: '平均值',
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: this.emotionData,
-                                },
-                                {
-                                    name: '',
-                                    type: 'custom',
-                                    data: this.weekAndMonData,
-                                    renderItem: function (params, api) {
-                                        var categoryIndex = api.value(0);
-                                        var end = api.coord([categoryIndex, api.value(1)]);
-                                        var start = api.coord([categoryIndex, api.value(2)]);
-                                        var width = 8;
-                                        var rectShape = that.$echarts.graphic.clipRectByRect(
-                                            {
-                                            x: start[0] - width / 2,
-                                            y: start[1],
-                                            width: 8,
-                                            height: end[1] - start[1],
-                                            },
-                                            {
-                                            x: params.coordSys.x,
-                                            y: params.coordSys.y,
-                                            width: params.coordSys.width,
-                                            height: params.coordSys.height,
-                                            }
-                                        );
-                                        if(rectShape) {
-                                            rectShape.r = [10]
-                                        };
-                                        return (
-                                            rectShape && {
-                                            type: "rect",
-                                            shape: rectShape,
-                                            style: api.style(),
-                                            }
-                                        );
-                                    },
-                                    itemStyle: {
-                                        opacity: 0.8,
-                                    },
-                                    encode: {
-                                        y: [1, 2],
-                                        x: 0,
-                                    },
-                                },
-                                {
-                                    name: `轻度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `中度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `重度${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                                {
-                                    name: `无${this.emoName}倾向`,
-                                    type: 'scatter',
-                                    symbolSize: 8,
-                                    data: '',
-                                },
-                        ];
-                        // 点击提示此时为空
-                        this.defaultOptions.tooltip = {
-                            trigger: "axis",
-                            formatter: function(params) {
-                                if(params) {
-                                    return params[0].marker + '平均值:' + params[0].name + '--' + params[0].value + '</br>' +
-                                    params[1].marker + '最大值:' + params[1].name +  '--' + params[1].value[2] + '</br>' +
-                                    params[1].marker + '最小值:' + params[1].name +  '--' + params[1].value[1];
-                                }
-
-                            }
-                        };
-                        this.defaultOptions.series = this.weekAndMonthSeries;
-            this.$toast.success('数据加载完成');
-        })
+          });
+          this.xAxisData = chartData.map((item) => {
+            return item.Key
+              ? this.$dayjs(item.Key.replace(/-/g, "/")).format("MM/DD")
+              : item.key;
+          });
+          let emphasisStyle = {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowColor: "rgba(0,0,0,0.3)",
+            },
+          };
+          let that = this;
+          // 7天和30天变成柱状图
+          this.weekAndMonthSeries = [
+            {
+              name: "平均值",
+              type: "scatter",
+              symbolSize: 8,
+              data: this.emotionData,
+            },
+            {
+              name: "",
+              type: "custom",
+              data: this.weekAndMonData,
+              renderItem: function (params, api) {
+                var categoryIndex = api.value(0);
+                var end = api.coord([categoryIndex, api.value(1)]);
+                var start = api.coord([categoryIndex, api.value(2)]);
+                var width = 8;
+                var rectShape = that.$echarts.graphic.clipRectByRect(
+                  {
+                    x: start[0] - width / 2,
+                    y: start[1],
+                    width: 8,
+                    height: end[1] - start[1],
+                  },
+                  {
+                    x: params.coordSys.x,
+                    y: params.coordSys.y,
+                    width: params.coordSys.width,
+                    height: params.coordSys.height,
+                  }
+                );
+                if (rectShape) {
+                  rectShape.r = [10];
+                }
+                return (
+                  rectShape && {
+                    type: "rect",
+                    shape: rectShape,
+                    style: api.style(),
+                  }
+                );
+              },
+              itemStyle: {
+                opacity: 0.8,
+              },
+              encode: {
+                y: [1, 2],
+                x: 0,
+              },
+            },
+            {
+              name: `轻度${this.emoName}倾向`,
+              type: "scatter",
+              symbolSize: 8,
+              data: "",
+            },
+            {
+              name: `中度${this.emoName}倾向`,
+              type: "scatter",
+              symbolSize: 8,
+              data: "",
+            },
+            {
+              name: `重度${this.emoName}倾向`,
+              type: "scatter",
+              symbolSize: 8,
+              data: "",
+            },
+            {
+              name: `无${this.emoName}倾向`,
+              type: "scatter",
+              symbolSize: 8,
+              data: "",
+            },
+          ];
+          // 点击提示此时为空
+          this.defaultOptions.tooltip = {
+            trigger: "axis",
+            formatter: function (params) {
+              if (params) {
+                return (
+                  params[0].marker +
+                  "平均值:" +
+                  params[0].name +
+                  "--" +
+                  params[0].value +
+                  "</br>" +
+                  params[1].marker +
+                  "最大值:" +
+                  params[1].name +
+                  "--" +
+                  params[1].value[2] +
+                  "</br>" +
+                  params[1].marker +
+                  "最小值:" +
+                  params[1].name +
+                  "--" +
+                  params[1].value[1]
+                );
+              }
+            },
+          };
+          this.defaultOptions.series = this.weekAndMonthSeries;
+          this.$toast.success("数据加载完成");
+        });
     },
     initEchart() {
-        if (
-            this.echarts != null &&
-            this.echarts != "" &&
-            this.echarts != undefined
-        ) {
-            this.echarts.dispose();
-        }
-        this.echarts = this.$echarts.init(this.$refs.charts);
-        this.echarts.setOption(this.defaultOptions);
+      if (
+        this.echarts != null &&
+        this.echarts != "" &&
+        this.echarts != undefined
+      ) {
+        this.echarts.dispose();
+      }
+      this.echarts = this.$echarts.init(this.$refs.charts);
+      this.echarts.setOption(this.defaultOptions);
     },
     // 初始化饼状图
     initPieEchart() {
-            if (
-                this.pieEcharts != null &&
-                this.pieEcharts != "" &&
-                this.pieEcharts != undefined
-            ) {
-                this.pieEcharts.dispose();
-            }
-            this.pieEcharts = this.$echarts.init(this.$refs.pieChart);
-            this.pieEcharts.setOption(this.pieOption);
+      if (
+        this.pieEcharts != null &&
+        this.pieEcharts != "" &&
+        this.pieEcharts != undefined
+      ) {
+        this.pieEcharts.dispose();
+      }
+      this.pieEcharts = this.$echarts.init(this.$refs.pieChart);
+      this.pieEcharts.setOption(this.pieOption);
     },
     onNavBack() {
-        this.$router.push({
-            name: 'psychological',
-            query: {
-                uid: this.params.uid,
-                name: this.params.name
-            }
-        });
+      this.$router.push({
+        name: "psychological",
+        query: {
+          uid: this.params.uid,
+          name: this.params.name,
+        },
+      });
     },
     // 计算字体显示的颜色
     calcColor(value) {
-        let color = "";
-        if (value <= 40) {
-            color = "#62BD48";
-        } else if (value > 40 && value <= 65) {
-            color = "#ffde00";
-        } else if (value > 65 && value <= 80) {
-            color = "#ff8a00";
-        } else if (value > 80) {
-            color = "#d70d0d";
-        } else {
-            color = "";
-        }
-        return color;
+      let color = "";
+      if (value <= 40) {
+        color = "#62BD48";
+      } else if (value > 40 && value <= 65) {
+        color = "#ffde00";
+      } else if (value > 65 && value <= 80) {
+        color = "#ff8a00";
+      } else if (value > 80) {
+        color = "#d70d0d";
+      } else {
+        color = "";
+      }
+      return color;
     },
     // 计算百分比
     calcPercentage(value, total) {
-        if (
-                typeof value !== "number" ||
-                typeof total !== "number" ||
-                total === 0
-            ) {
-                return 0;
-            }
-            let milValue = value * 1000;
-            let milTotal = total * 1000;
-            return Math.round((milValue / milTotal) * 100);
+      if (
+        typeof value !== "number" ||
+        typeof total !== "number" ||
+        total === 0
+      ) {
+        return 0;
+      }
+      let milValue = value * 1000;
+      let milTotal = total * 1000;
+      return Math.round((milValue / milTotal) * 100);
     },
     // 计算结果采用哪种颜色
-        calcResultColor(value, isCallBackClass) {
-            let color = "";
-            let className = "";
-            switch(value) {
-                case '0', 0:
-                    color = "#62BD48";
-                    className = 'none';
-                break;
-                case '1', 1:
-                    color = "#ffde00";
-                    className = 'mild';
-                break;
-                case '2', 2:
-                    color = "#ff8a00";
-                    className = 'moderate';
-                break;
-                case '3', 3:
-                    color = "#d70d0d";
-                    className = 'severe';
-                break;
-            }
-            return isCallBackClass ? className : color;
-        },
+    calcResultColor(value, isCallBackClass) {
+      let color = "";
+      let className = "";
+      switch (value) {
+        case ("0", 0):
+          color = "#62BD48";
+          className = "none";
+          break;
+        case ("1", 1):
+          color = "#ffde00";
+          className = "mild";
+          break;
+        case ("2", 2):
+          color = "#ff8a00";
+          className = "moderate";
+          break;
+        case ("3", 3):
+          color = "#d70d0d";
+          className = "severe";
+          break;
+      }
+      return isCallBackClass ? className : color;
+    },
     // 重新拼接日期
     resetDate(startDate, endDate) {
-        let callBackDate = '';
-        if(startDate && endDate) {
-            callBackDate = startDate.replace(/-/g, ".") + '-' + endDate.slice(5,endDate.length).replace(/-/g, ".");
-        };
-        return callBackDate
-
-    }
-  }
-}
+      let callBackDate = "";
+      if (startDate && endDate) {
+        callBackDate =
+          startDate.replace(/-/g, ".") +
+          "-" +
+          endDate.slice(5, endDate.length).replace(/-/g, ".");
+      }
+      return callBackDate;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/health/psychological/report/report-entry.vue b/src/views/health/psychological/report/report-entry.vue
index e84b579..7fefbbb 100644
--- a/src/views/health/psychological/report/report-entry.vue
+++ b/src/views/health/psychological/report/report-entry.vue
@@ -6,226 +6,235 @@
  * @description:
 -->
 <template>
-    <div class="report-main">
-        <van-nav-bar title="心理监测" :border="true" :left-arrow="true" @click-left="onNavBack">
-            <template #left>
-                <van-icon name="arrow-left" size="24" style="padding: 0" />
-            </template>
-        </van-nav-bar>
-        <div class="main">
-            <div class="tabs"></div>
-            <div class="content">
-                <div class="list" v-if="weekList">
-                    <div
-                        class="item"
-                        v-for="(item, index) in weekList"
-                        :key="index"
-                        @click="onClickItem(item.recordId)"
-                    >
-                        <div class="left">
-                            <img :src="weekImg" alt />
-                            <div class="middle">
-                                <div class="title">
-                                    <span>周报</span>
-                                    <p>{{ item.name }}</p>
-                                </div>
-                                <div class="overall">
-                                    <div class="left">
-                                        <span>总评</span>
-                                        <p>{{ item. summary}}</p>
-                                    </div>
-                                </div>
-                                <!-- <div class="trend">
-                                    <p>( <span>无抑郁倾向</span><span>5%</span>，<span>轻度抑郁倾向</span> <span>5%</span> )</p>
-                                </div>-->
-                            </div>
-                        </div>
-
-                        <div class="right">
-                            <img :src="moreImg" alt />
-                        </div>
-                    </div>
+  <div class="report-main">
+    <van-nav-bar
+      title="心理监测"
+      :border="true"
+      :left-arrow="true"
+      @click-left="onNavBack"
+    >
+      <template #left>
+        <van-icon name="arrow-left" size="24" style="padding: 0" />
+      </template>
+    </van-nav-bar>
+    <div class="main">
+      <div class="tabs"></div>
+      <div class="content">
+        <div class="list" v-if="weekList">
+          <div
+            class="item"
+            v-for="(item, index) in weekList"
+            :key="index"
+            @click="onClickItem(item.recordId)"
+          >
+            <div class="left">
+              <img :src="weekImg" alt />
+              <div class="middle">
+                <div class="title">
+                  <span>周报</span>
+                  <p>{{ item.name }}</p>
                 </div>
-                <div class="list no-data" v-else>
-                    <img src="../../../../assets/img/no_data_01.png" alt />
-                    <p>暂无数据</p>
+                <div class="overall">
+                  <div class="left">
+                    <span>总评</span>
+                    <p>{{ item.summary }}</p>
+                  </div>
                 </div>
+                <!-- <div class="trend">
+                                    <p>( <span>无焦虑倾向</span><span>5%</span>，<span>轻度焦虑倾向</span> <span>5%</span> )</p>
+                                </div>-->
+              </div>
             </div>
+
+            <div class="right">
+              <img :src="moreImg" alt />
+            </div>
+          </div>
+        </div>
+        <div class="list no-data" v-else>
+          <img src="../../../../assets/img/no_data_01.png" alt />
+          <p>暂无数据</p>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import { EmotionModel, PsyBaseUrl } from "@/config/models";
 import axios from "axios";
 export default {
-  name:'',
-  data(){
-   return {
-       active: 0,
-       tabImgUrl: require("@/assets/img/psychological/statistical_form.png"),
-       selectDownImg: require("@/assets/img/psychological/select_down.png"),
-       weekImg: require("@/assets/img/psychological/week_report.png"),
-       moreImg: require("@/assets/img/psychological/more.png"),
-       weekList: [],
-       uid: '',
-       emoName: '',
-   }
+  name: "",
+  data() {
+    return {
+      active: 0,
+      tabImgUrl: require("@/assets/img/psychological/statistical_form.png"),
+      selectDownImg: require("@/assets/img/psychological/select_down.png"),
+      weekImg: require("@/assets/img/psychological/week_report.png"),
+      moreImg: require("@/assets/img/psychological/more.png"),
+      weekList: [],
+      uid: "",
+      emoName: "",
+    };
   },
   methods: {
     onNavBack() {},
     loadParams() {
-        let params = this.$route.query;
-            if (params) {
-            this.emoName = EmotionModel[params.name].name;
-            this.emoType = EmotionModel[params.name].type;
-            this.uid = params.uid;
-        }
+      let params = this.$route.query;
+      if (params) {
+        this.emoName = EmotionModel[params.name].name;
+        this.emoType = EmotionModel[params.name].type;
+        this.uid = params.uid;
+      }
     },
     onClickItem(recordId) {
-        this.$router.push({
-            name: 'psychologicalReport',
-            query: {
-                recordId: recordId,
-                name: 'depression',
-                isShowLeft: true
-            }
-        })
+      this.$router.push({
+        name: "psychologicalReport",
+        query: {
+          recordId: recordId,
+          name: "depression",
+          isShowLeft: true,
+        },
+      });
     },
     getWeekResult() {
-        this.$toast.loading('数据加载中');
-        let baseUrl = process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart';
-        let reqUrl = `${baseUrl}/api/Data/GetWeekResult`;
-        let reqParams = {
-            uid: /* this.uid */'2023101521270090082',
-            type: this.emoType
-        };
-        axios.get(reqUrl, {
-            params: { ...reqParams },
-           /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
-        }).then(res => {
-            console.log("res", res);
-            const data = res.data.response;
-            this.weekList = data.map(item => {
-                return {
-                    name: item.Name.replace('周报', ''),
-                    recordId: item.RecordId,
-                    summary: item.Summary,
-                    type: this.emoType
-                }
-            });
-            this.$toast.success('数据加载完成');
+      this.$toast.loading("数据加载中");
+      let baseUrl =
+        process.env.NODE_ENV === "production"
+          ? "https://dbmq.rzliot.com/auth_heart"
+          : "https://dbmq.rzliot.com/heart";
+      let reqUrl = `${baseUrl}/api/Data/GetWeekResult`;
+      let reqParams = {
+        uid: /* this.uid */ "2023101521270090082",
+        type: this.emoType,
+      };
+      axios
+        .get(reqUrl, {
+          params: { ...reqParams },
+          /*  headers: { 'AccessToken': this.$store.getters.ssjlToken } */
         })
-
-    }
+        .then((res) => {
+          console.log("res", res);
+          const data = res.data.response;
+          this.weekList = data.map((item) => {
+            return {
+              name: item.Name.replace("周报", ""),
+              recordId: item.RecordId,
+              summary: item.Summary,
+              type: this.emoType,
+            };
+          });
+          this.$toast.success("数据加载完成");
+        });
+    },
   },
   mounted() {
     this.loadParams();
     this.getWeekResult();
-  }
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
 .report-main {
-    height: 100vh;
-    width: 100%;
-    overflow: hidden;
-    background-color: #f5f5f5;
-    .main {
-        height: calc(100vh - 45px);
-        overflow: scroll;
-        .content {
-            position: relative;
-            .list {
-                .item {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: flex-end;
-                    padding: 34px 15px;
-                    background-color: #fff;
-                    margin-bottom: 11px;
-                    .left {
-                        display: flex;
-                        justify-content: flex-start;
-                        align-items: flex-start;
-                        img {
-                            height: 25px;
-                            width: 25px;
-                        }
-                        .middle {
-                            .title,
-                            .overall,
-                            .trend {
-                                display: flex;
-                                justify-content: flex-start;
-                                align-items: center;
-                                padding-left: 13px;
-                                span,
-                                p {
-                                    font-size: 18px;
-                                    font-family: Source Han Sans CN;
-                                    font-weight: 400;
-                                    color: #8d8d8d;
-                                    line-height: 30px;
-                                }
-                            }
-                            .title {
-                                span {
-                                    padding-right: 20px;
-                                }
-                                p {
-                                    color: #282828;
-                                }
-                            }
-                            .overall {
-                                display: flex;
-                                justify-content: space-between;
-                                align-items: center;
-                                width: 100%;
-                                .left {
-                                    p {
-                                        padding-left: 20px;
-                                        font-weight: bold;
-                                    }
-                                }
-                                .right {
-                                    img {
-                                        height: 15px;
-                                        width: 9px;
-                                    }
-                                }
-                            }
-                            .trend {
-                                align-items: flex-start;
-                                text-align: left;
-                            }
-                        }
-                    }
-                    .right {
-                        img {
-                            width: 9px;
-                            height: 15px;
-                        }
-                    }
+  height: 100vh;
+  width: 100%;
+  overflow: hidden;
+  background-color: #f5f5f5;
+  .main {
+    height: calc(100vh - 45px);
+    overflow: scroll;
+    .content {
+      position: relative;
+      .list {
+        .item {
+          display: flex;
+          justify-content: space-between;
+          align-items: flex-end;
+          padding: 34px 15px;
+          background-color: #fff;
+          margin-bottom: 11px;
+          .left {
+            display: flex;
+            justify-content: flex-start;
+            align-items: flex-start;
+            img {
+              height: 25px;
+              width: 25px;
+            }
+            .middle {
+              .title,
+              .overall,
+              .trend {
+                display: flex;
+                justify-content: flex-start;
+                align-items: center;
+                padding-left: 13px;
+                span,
+                p {
+                  font-size: 18px;
+                  font-family: Source Han Sans CN;
+                  font-weight: 400;
+                  color: #8d8d8d;
+                  line-height: 30px;
+                }
+              }
+              .title {
+                span {
+                  padding-right: 20px;
                 }
-                &.no-data {
-                    height: calc(100vh - 45px);
-                    width: 100%;
-                    @include center();
-                    flex-direction: column;
-                    img {
-                        height: 110px;
-                        width: 175px;
-                    }
-                    p {
-                        color: #999;
-                        font-size: 12px;
-                        padding: 20px 0 65px 0;
-                    }
+                p {
+                  color: #282828;
                 }
+              }
+              .overall {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 100%;
+                .left {
+                  p {
+                    padding-left: 20px;
+                    font-weight: bold;
+                  }
+                }
+                .right {
+                  img {
+                    height: 15px;
+                    width: 9px;
+                  }
+                }
+              }
+              .trend {
+                align-items: flex-start;
+                text-align: left;
+              }
+            }
+          }
+          .right {
+            img {
+              width: 9px;
+              height: 15px;
             }
+          }
         }
+        &.no-data {
+          height: calc(100vh - 45px);
+          width: 100%;
+          @include center();
+          flex-direction: column;
+          img {
+            height: 110px;
+            width: 175px;
+          }
+          p {
+            color: #999;
+            font-size: 12px;
+            padding: 20px 0 65px 0;
+          }
+        }
+      }
     }
+  }
 }
 </style>
diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue
index 19234af..9377d8e 100644
--- a/src/views/psychological-modeling/index.vue
+++ b/src/views/psychological-modeling/index.vue
@@ -1,382 +1,405 @@
 <template>
-	<div class="page" v-if="isSHowPage">
-         <van-nav-bar title="" :border="true" :left-arrow="true"  @click-left="onNavBack" v-if="showLeftArrow">
-             <template #left>
-                <van-icon name="arrow-left" size="23" style="padding: 0"/>返回
-            </template>
-         </van-nav-bar>
-		<div class="tip">
-			<div class="icon">
-				<i class="iconfont icon-tishi"></i>
-			</div>
-			<div class="info">
-				<div class="titie">温馨提醒：</div>
-				<div class="content">
-                    {{ tips }}
-				</div>
-			</div>
-		</div>
-		<div v-if="info">
-            <!-- 第一步 -->
-			<div class="step" v-show="info.initScaleState !== 1">
-				<div class="name">第一步</div>
-				<div class="title">
-					<div class="text">情绪初始化评估</div>
-					<div class="status success" v-if="info.initScaleState === 1">
-						<span class="icon"
-							><i class="iconfont icon-caozuochenggong"></i
-						></span>
-						<span>已完成</span>
-					</div>
-					<div class="status" v-else>待完成</div>
-				</div>
-				<div class="sub_title">
-					完成一次“情绪初始化评估”，有助于建立您的个人情绪模型。
-				</div>
-                <div class="step_button">
-                    <van-button
-                        round
-                        type="info"
-                        style="width: 100%; height: 100%"
-                        v-if="info.initScaleState !== 1"
-                        @click="toQuestion"
-                    >去完成</van-button>
-                </div>
-			</div>
+  <div class="page" v-if="isSHowPage">
+    <van-nav-bar
+      title=""
+      :border="true"
+      :left-arrow="true"
+      @click-left="onNavBack"
+      v-if="showLeftArrow"
+    >
+      <template #left>
+        <van-icon name="arrow-left" size="23" style="padding: 0" />返回
+      </template>
+    </van-nav-bar>
+    <div class="tip">
+      <div class="icon">
+        <i class="iconfont icon-tishi"></i>
+      </div>
+      <div class="info">
+        <div class="titie">温馨提醒：</div>
+        <div class="content">
+          {{ tips }}
+        </div>
+      </div>
+    </div>
+    <div v-if="info">
+      <!-- 第一步 -->
+      <div class="step" v-show="info.initScaleState !== 1">
+        <div class="name">第一步</div>
+        <div class="title">
+          <div class="text">情绪初始化评估</div>
+          <div class="status success" v-if="info.initScaleState === 1">
+            <span class="icon"
+              ><i class="iconfont icon-caozuochenggong"></i
+            ></span>
+            <span>已完成</span>
+          </div>
+          <div class="status" v-else>待完成</div>
+        </div>
+        <div class="sub_title">
+          完成一次“情绪初始化评估”，有助于建立您的个人情绪模型。
+        </div>
+        <div class="step_button">
+          <van-button
+            round
+            type="info"
+            style="width: 100%; height: 100%"
+            v-if="info.initScaleState !== 1"
+            @click="toQuestion"
+            >去完成</van-button
+          >
+        </div>
+      </div>
 
-            <!-- 第二步 -->
-            <div class="step" v-show="info.progress !== 1">
-				<div class="name">第二步</div>
-				<div class="title">
-					<div class="text">连续佩戴两小时</div>
-					<div class="status success" v-if="info.progress === 1">
-						<span class="icon"
-							><i class="iconfont icon-caozuochenggong"></i
-						></span>
-						<span>已完成</span>
-					</div>
-					<div class="status" v-else>{{ stateText}}</div>
-				</div>
-				<div class="schedule">
-					<van-progress
-						:percentage="(info.progress) * 100"
-						stroke-width="10px"
-						color="#638ee4"
-						:show-pivot="true"
-					></van-progress>
-				</div>
-				<div class="sub_title">
-					请连续佩戴不低于2小时,有助于为您输出更加精准的情绪分析指标。
-				</div>
-			</div>
-            <div class="completed" v-show="info.progress === 1 && info.initScaleState === 1">
-                <van-button
-                    round
-                    type="info"
-                    >建模已完成</van-button
-                >
-            </div>
-		</div>
-
-	</div>
+      <!-- 第二步 -->
+      <div class="step" v-show="info.progress !== 1">
+        <div class="name">第二步</div>
+        <div class="title">
+          <div class="text">连续佩戴两小时</div>
+          <div class="status success" v-if="info.progress === 1">
+            <span class="icon"
+              ><i class="iconfont icon-caozuochenggong"></i
+            ></span>
+            <span>已完成</span>
+          </div>
+          <div class="status" v-else>{{ stateText }}</div>
+        </div>
+        <div class="schedule">
+          <van-progress
+            :percentage="info.progress * 100"
+            stroke-width="10px"
+            color="#638ee4"
+            :show-pivot="true"
+          ></van-progress>
+        </div>
+        <div class="sub_title">
+          请连续佩戴不低于2小时,有助于为您输出更加精准的情绪分析指标。
+        </div>
+      </div>
+      <div
+        class="completed"
+        v-show="info.progress === 1 && info.initScaleState === 1"
+      >
+        <van-button round type="info">建模已完成</van-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-import axios from 'axios'
+import axios from "axios";
 import APICore from "@/api/core";
 export default {
-	name: 'PsychologicalModeling',
-	data() {
-		return {
-            info: null,
-            showLeftArrow: null,
-            isSHowPage: false,
-            fromUrl: '',
-		}
+  name: "PsychologicalModeling",
+  data() {
+    return {
+      info: null,
+      showLeftArrow: null,
+      isSHowPage: false,
+      fromUrl: "",
+    };
+  },
+  computed: {
+    stateText() {
+      return this.info.progress > 0 ? "进行中" : "待完成";
     },
-    computed: {
-        stateText() {
-            return this.info.progress > 0 ? '进行中' : '待完成';
-        },
-        autoJump() {
-            return this.$route.query.autoJump === '1';
-        },
-        tips() {
-            return this.info.isFirstModeling === 1
-            ? '首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算抑郁、压力、疲劳分值。'
-            : '由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算抑郁、压力、疲劳的分值。'
-        }
+    autoJump() {
+      return this.$route.query.autoJump === "1";
+    },
+    tips() {
+      return this.info.isFirstModeling === 1
+        ? "首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算焦虑、压力、疲劳分值。"
+        : "由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算焦虑、压力、疲劳的分值。";
     },
-	mounted() {
-		//页面标题
-		window.document.title = '情绪初始化建模'
+  },
+  mounted() {
+    //页面标题
+    window.document.title = "情绪初始化建模";
 
-		//页面传参
-        let params = { ...this.$route.query }
-		if (params.uid) {
-            this.uid = params.uid;
-            // 缓存从随手精灵传过来的token
-            this.$store.commit('ssjlToken', params.accessToken || '');
-            // 缓存从随手精灵传过来的标识
-            this.$store.commit('fromSsjl', params.fromSsjl);
-            // 是否显示 返回标签
-            this.showLeftArrow = this.$store.getters.fromSsjl === 'true';
-            this.fromUrl = params.fromUrl;
-            console.log("fromUrl", this.fromUrl);
-			//初始化
-			this.init()
-		} else {
-			this.$toast('参数错误')
-		}
-	},
-	methods: {
-        // 获取b端token
-        getAuth() {
-            let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
-            let that = this;
-            return new Promise((resolve, reject) => {
-                APICore.getAuth({ manufactorId: manufactorId }).then(res => {
-                    let data = res.data;
-                    if(data.code === 0) {
-                        resolve(res.data.data);
-                    } else {
-                        that.$toast.fail(`${data.message}`);
-                        reject('');
-                    }
-                })
-            })
-        },
-        // 返回
-        onNavBack() {
-            let fromSsjl = this.$store.getters.fromSsjl === 'true';
-            if(fromSsjl) {
-                let baseUrl = this.fromUrl;
-                window.location.href = `${baseUrl}/#/${ this.$route.query.fromMenu || 'device'}`;
-            } else {
-                this.$router.go(-1);
-            }
+    //页面传参
+    let params = { ...this.$route.query };
+    if (params.uid) {
+      this.uid = params.uid;
+      // 缓存从随手精灵传过来的token
+      this.$store.commit("ssjlToken", params.accessToken || "");
+      // 缓存从随手精灵传过来的标识
+      this.$store.commit("fromSsjl", params.fromSsjl);
+      // 是否显示 返回标签
+      this.showLeftArrow = this.$store.getters.fromSsjl === "true";
+      this.fromUrl = params.fromUrl;
+      console.log("fromUrl", this.fromUrl);
+      //初始化
+      this.init();
+    } else {
+      this.$toast("参数错误");
+    }
+  },
+  methods: {
+    // 获取b端token
+    getAuth() {
+      let manufactorId = "5bf13062-a41e-4d00-ba14-1101aad12650";
+      let that = this;
+      return new Promise((resolve, reject) => {
+        APICore.getAuth({ manufactorId: manufactorId }).then((res) => {
+          let data = res.data;
+          if (data.code === 0) {
+            resolve(res.data.data);
+          } else {
+            that.$toast.fail(`${data.message}`);
+            reject("");
+          }
+        });
+      });
+    },
+    // 返回
+    onNavBack() {
+      let fromSsjl = this.$store.getters.fromSsjl === "true";
+      if (fromSsjl) {
+        let baseUrl = this.fromUrl;
+        window.location.href = `${baseUrl}/#/${
+          this.$route.query.fromMenu || "device"
+        }`;
+      } else {
+        this.$router.go(-1);
+      }
+    },
+    async init() {
+      if (!this.$route.query.accessToken) {
+        //  如果当前url没有 accessToken， 获取token,并且存储到本地缓存里面
+        let authToken = await this.getAuth();
+        this.$store.commit("ssjlToken", authToken);
+      }
+      let ssjlToken = this.$store.getters.ssjlToken;
+      let re = await this.api(
+        "/api/Question/Progress",
+        {
+          method: "GET",
+          sslVerify: false,
+          withCredentials: false,
+          params: {
+            uid: this.uid,
+          },
         },
-		async init() {
-            if(!this.$route.query.accessToken) {
-                //  如果当前url没有 accessToken， 获取token,并且存储到本地缓存里面
-                let authToken = await this.getAuth();
-                this.$store.commit('ssjlToken', authToken);
-            }
-            let ssjlToken = this.$store.getters.ssjlToken;
-			let re = await this.api('/api/Question/Progress', {
-				method: 'GET',
-				sslVerify: false,
-				withCredentials: false,
-				params: {
-					uid: this.uid,
-                },
-			}, ssjlToken)
-			if (re.success) {
-                this.info = re.response
-                setTimeout(() => {
-                    this.isSHowPage = true;
-                }, 800)
-				if (re.response && re.response.state === -1) {
-					this.$toast('用户不存在或未绑定手表')
-				} else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1 && !this.autoJump) {
-                    // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面
-                    this.$router.replace(`/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ''}&fromMenu=${ this.showLeftArrow ? 'device' : ''}`);
-                }
-			} else {
-				this.$toast(re.msg)
+        ssjlToken
+      );
+      if (re.success) {
+        this.info = re.response;
+        setTimeout(() => {
+          this.isSHowPage = true;
+        }, 800);
+        if (re.response && re.response.state === -1) {
+          this.$toast("用户不存在或未绑定手表");
+        } else if (
+          re.response &&
+          re.response.initScaleState === 1 &&
+          re.response.progress === 1 &&
+          !this.autoJump
+        ) {
+          // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面
+          this.$router.replace(
+            `/psychologicalMain?uid=${this.uid}&fromUrl=${
+              this.fromUrl || ""
+            }&fromMenu=${this.showLeftArrow ? "device" : ""}`
+          );
+        }
+      } else {
+        this.$toast(re.msg);
+      }
+    },
+    toQuestion() {
+      this.$router.replace(`/PsychologicalQuestionnaire?uid=${this.uid}`);
+    },
+    api(url, config, token) {
+      let baseUrl =
+        process.env.NODE_ENV === "production"
+          ? "https://dbmq.rzliot.com/auth_heart"
+          : "https://dbmq.rzliot.com/heart";
+      setTimeout(() => {
+        this.$toast.loading({
+          message: "",
+          forbidClick: true,
+          duration: 0,
+        });
+      }, 100);
+      return new Promise((res) => {
+        axios({
+          url: `${baseUrl}${url}`,
+          ...config,
+          // 增加请求头部 token
+          headers: {
+            AccessToken: token,
+          },
+        })
+          .then((re) => {
+            if (re) {
+              if (re.data) {
+                console.log(re.data);
+                res(re.data);
+                this.$toast.clear();
+                return;
+              }
+              this.$toast(`信息获取失败-${re.status}`);
+              res(true);
+              this.$toast.clear();
+              return;
             }
-		},
-		toQuestion() {
-			this.$router.replace(`/PsychologicalQuestionnaire?uid=${this.uid}`)
-		},
-		api(url, config, token) {
-			let baseUrl = process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart';
-			setTimeout(() => {
-				this.$toast.loading({
-					message: '',
-					forbidClick: true,
-					duration: 0,
-				})
-			}, 100)
-			return new Promise((res) => {
-				axios({
-					url: `${baseUrl}${url}`,
-                    ...config,
-                    // 增加请求头部 token
-                    headers: {
-                        'AccessToken': token
-                    }
-				})
-					.then((re) => {
-						if (re) {
-							if (re.data) {
-								console.log(re.data)
-								res(re.data)
-								this.$toast.clear()
-								return
-							}
-							this.$toast(`信息获取失败-${re.status}`)
-							res(true)
-							this.$toast.clear()
-							return
-						}
-						this.$toast(`信息获取失败-${url}`)
-						res(true)
-						this.$toast.clear()
-					})
-					.catch((e) => {
-						this.$toast(`信息获取失败-${url}`)
-						res(true)
-						this.$toast.clear()
-						console.log(e)
-					})
-			})
-		},
-	},
-}
+            this.$toast(`信息获取失败-${url}`);
+            res(true);
+            this.$toast.clear();
+          })
+          .catch((e) => {
+            this.$toast(`信息获取失败-${url}`);
+            res(true);
+            this.$toast.clear();
+            console.log(e);
+          });
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 @font-face {
-	font-family: 'iconfont'; /* Project id 2652084 */
-	src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQoAAsAAAAACFQAAAPaAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDBgqEIIQDATYCJAMMCwgABCAFhGcHQRtqBxEVnBvJPhLjmMRz8aCJJho3wfN8ne+5817QmS/XTApqUAGT1kmpHaidloBWXGdzOaZE+Aj1S75l+ek70v5OL82zLE6hFEIiJEbx96dyFkjAnwUAJnXNTcUP1HiBAtaxhhUr2KsXyLuo1/rCrIx6BgFM6tACo12HbjZpk4bPmkIRGksqkFbKpPFjhxOWRnRLpRBGCEKXamQTATDWGo+AjeHn5RdRCYNBQGHt0mtM+1Hc+Zr+1VZ+0gf1Gl+CgIcbQABQQI2NmWVIu7MfKk7WQGHWKTUpDKIRjEkjySSEglIHt/zHM0CCWMoUTFVRGBclugwEvto8VnH9qyAIhIDrIApTOVMVOr2mNDQjKSPHeM4zz6ZrPrYDY3fjR7a4+xTrY15tvZVw5KkZtx/X+HznyRPHnvCeqZskVmTOjMmRnF1girdzz7F4ju3uiB/xc53CoFi1HdXMW9Vu1TonY+gTzqB98OucaHakkW3GjxWJhX9kQXymq/AjJ5sfbS5Hc9nm5+KfvW9ZiYfnRXbG8tzG6nK7+u265yW2Hv38lNG3PmqlJo7Hjv0enTXu0fJ0ouuAIf1WL94ysHiw9aA5vca2mth0ZPGOvtu99JioF7HtiBd95LA4E7Gj3qPSVmO6tC3erV1e54F9yvUsu3Bh2Z7l+lwiLGETNtvRp9ylmtsGlm7eieOF8GLvn+zifT/067/LLFd8TdeujrureHTFyFEf+hbPVft+SK96RrBXE7tqx8rt21XpUO2QwwZswmZvsZsOz8+pN3TsrzXZ143c71m5NwLL+4xyo30jdTbxttGdTvRcMG4rPzrU0SFdrfTjHqXWlOrxuHR1FdK1219m/7yFvU52Hh3x6th9I25U9b0QTS1XvFyq35thACTvqtuqZZiOq5kq9v9/w/jtj8cOTW/2P2xpAN5vbXsP+5NxDcwN4RfjFPjbqkFApFYhULpOcFsQQLEkk4cBmLYJfm81QBZvh6uzweUghMlOwSBEcVCEKYdpqhoEsIhCkDDNwaQ67VdbZPsIzBFdDKjEC4GQwRsM0rgKigw+mKa+ECCPHwTJ4A8mrqy2s6gkZs2oBC3oB9SGBudoJJR7QD92iqtiF+RY4wjkSVbM7HFAHmNGvPpCxIFj6mHHT8OuIwhMDRpJKpFQpqmre0liqJ+sYRCFgFgAzQOgxkAMOB8t+e87gHhGOhQMxC52JlKeyAdyEjIAtlcOoLYb6R254ikQBEdHORiiB9gpO9LZSQII9YMaEIOQUA2IB0pSgnJQZbK8un+5XYCJtaUSQ5Ro0kcqeo5kKhy8J7dhKXWs6skEAAA=');
+  font-family: "iconfont"; /* Project id 2652084 */
+  src: url("data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQoAAsAAAAACFQAAAPaAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDBgqEIIQDATYCJAMMCwgABCAFhGcHQRtqBxEVnBvJPhLjmMRz8aCJJho3wfN8ne+5817QmS/XTApqUAGT1kmpHaidloBWXGdzOaZE+Aj1S75l+ek70v5OL82zLE6hFEIiJEbx96dyFkjAnwUAJnXNTcUP1HiBAtaxhhUr2KsXyLuo1/rCrIx6BgFM6tACo12HbjZpk4bPmkIRGksqkFbKpPFjhxOWRnRLpRBGCEKXamQTATDWGo+AjeHn5RdRCYNBQGHt0mtM+1Hc+Zr+1VZ+0gf1Gl+CgIcbQABQQI2NmWVIu7MfKk7WQGHWKTUpDKIRjEkjySSEglIHt/zHM0CCWMoUTFVRGBclugwEvto8VnH9qyAIhIDrIApTOVMVOr2mNDQjKSPHeM4zz6ZrPrYDY3fjR7a4+xTrY15tvZVw5KkZtx/X+HznyRPHnvCeqZskVmTOjMmRnF1girdzz7F4ju3uiB/xc53CoFi1HdXMW9Vu1TonY+gTzqB98OucaHakkW3GjxWJhX9kQXymq/AjJ5sfbS5Hc9nm5+KfvW9ZiYfnRXbG8tzG6nK7+u265yW2Hv38lNG3PmqlJo7Hjv0enTXu0fJ0ouuAIf1WL94ysHiw9aA5vca2mth0ZPGOvtu99JioF7HtiBd95LA4E7Gj3qPSVmO6tC3erV1e54F9yvUsu3Bh2Z7l+lwiLGETNtvRp9ylmtsGlm7eieOF8GLvn+zifT/067/LLFd8TdeujrureHTFyFEf+hbPVft+SK96RrBXE7tqx8rt21XpUO2QwwZswmZvsZsOz8+pN3TsrzXZ143c71m5NwLL+4xyo30jdTbxttGdTvRcMG4rPzrU0SFdrfTjHqXWlOrxuHR1FdK1219m/7yFvU52Hh3x6th9I25U9b0QTS1XvFyq35thACTvqtuqZZiOq5kq9v9/w/jtj8cOTW/2P2xpAN5vbXsP+5NxDcwN4RfjFPjbqkFApFYhULpOcFsQQLEkk4cBmLYJfm81QBZvh6uzweUghMlOwSBEcVCEKYdpqhoEsIhCkDDNwaQ67VdbZPsIzBFdDKjEC4GQwRsM0rgKigw+mKa+ECCPHwTJ4A8mrqy2s6gkZs2oBC3oB9SGBudoJJR7QD92iqtiF+RY4wjkSVbM7HFAHmNGvPpCxIFj6mHHT8OuIwhMDRpJKpFQpqmre0liqJ+sYRCFgFgAzQOgxkAMOB8t+e87gHhGOhQMxC52JlKeyAdyEjIAtlcOoLYb6R254ikQBEdHORiiB9gpO9LZSQII9YMaEIOQUA2IB0pSgnJQZbK8un+5XYCJtaUSQ5Ro0kcqeo5kKhy8J7dhKXWs6skEAAA=");
 }
 
 .iconfont {
-	font-family: 'iconfont' !important;
-	// font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
+  font-family: "iconfont" !important;
+  // font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 .icon-caozuochenggong:before {
-	content: '\e60f';
+  content: "\e60f";
 }
 
 .icon-tishi:before {
-	content: '\e654';
+  content: "\e654";
 }
 
 .page {
-	width: 100%;
-	min-height: 100%;
-	box-sizing: border-box;
-	font-size: 3.6vw;
-	text-align: left;
-	background: #f4f4f4;
-	padding-bottom: 30vw;
-	.tip {
-		display: flex;
-		font-size: 3.3vw;
-		padding: 6vw 4vw;
-		justify-content: space-between;
-		align-items: center;
-		background: white;
+  width: 100%;
+  min-height: 100%;
+  box-sizing: border-box;
+  font-size: 3.6vw;
+  text-align: left;
+  background: #f4f4f4;
+  padding-bottom: 30vw;
+  .tip {
+    display: flex;
+    font-size: 3.3vw;
+    padding: 6vw 4vw;
+    justify-content: space-between;
+    align-items: center;
+    background: white;
 
-		.icon {
-			overflow: hidden;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 40px;
-			height: 40px;
-			color: #ff865a;
-			font-size: 6vw;
-			border-radius: 50%;
-			background: #fff5f1;
-		}
-		.info {
-			width: calc(100% - 50px);
-			line-height: 20px;
-			text-align: left;
-			.titie {
-				color: #ff865a;
-			}
-			.content {
-				color: gray;
-			}
-		}
-	}
-	.step {
-		margin-top: 3vw;
-		padding: 4vw 8vw;
-		padding-right: 4vw;
-		background: white;
+    .icon {
+      overflow: hidden;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 40px;
+      height: 40px;
+      color: #ff865a;
+      font-size: 6vw;
+      border-radius: 50%;
+      background: #fff5f1;
+    }
+    .info {
+      width: calc(100% - 50px);
+      line-height: 20px;
+      text-align: left;
+      .titie {
+        color: #ff865a;
+      }
+      .content {
+        color: gray;
+      }
+    }
+  }
+  .step {
+    margin-top: 3vw;
+    padding: 4vw 8vw;
+    padding-right: 4vw;
+    background: white;
 
-		.name {
-			display: flex;
-			align-items: center;
-			font-size: 3.8vw;
-			padding-bottom: 2vw;
+    .name {
+      display: flex;
+      align-items: center;
+      font-size: 3.8vw;
+      padding-bottom: 2vw;
 
-			&::before {
-				content: '';
-				display: block;
-				width: 1vw;
-				height: 1vw;
-				border: 2px solid #638ee4;
-				border-radius: 50%;
-				margin-left: calc(-2vw - 4px);
-				margin-right: 1vw;
-			}
-		}
-		.title {
-			display: flex;
-			justify-content: space-between;
-			padding: 3vw 0;
+      &::before {
+        content: "";
+        display: block;
+        width: 1vw;
+        height: 1vw;
+        border: 2px solid #638ee4;
+        border-radius: 50%;
+        margin-left: calc(-2vw - 4px);
+        margin-right: 1vw;
+      }
+    }
+    .title {
+      display: flex;
+      justify-content: space-between;
+      padding: 3vw 0;
 
-			.status {
-				color: #ff865a;
-			}
-			.success {
-				color: #638ee4;
+      .status {
+        color: #ff865a;
+      }
+      .success {
+        color: #638ee4;
 
-				.icon {
-					font-size: 4vw;
-					margin-right: 1vw;
-				}
-			}
-		}
-		.sub_title {
-			padding: 3vw 0;
-			color: gray;
-        }
-        .step_button {
-            height: 14vw;
-            width: 60vw;
-            margin: auto;
-            .van-button--info {
-                background-color: #638ee4;
-                border: 1px solid #638ee4;
-            }
-        }
-	}
-    .completed {
-        position: relative;
-        margin-top: 3vw;
-        height: 400px;
-            @include center();
-            .van-button--info {
-                height: 8vh;
-                width: 75vw;
-                background-color: #638ee4;
-                border: 1px solid #638ee4;
-            }
+        .icon {
+          font-size: 4vw;
+          margin-right: 1vw;
         }
-	.button {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 15vw;
-		width: 75vw;
-		height: 14vw;
-		margin: auto;
+      }
+    }
+    .sub_title {
+      padding: 3vw 0;
+      color: gray;
+    }
+    .step_button {
+      height: 14vw;
+      width: 60vw;
+      margin: auto;
+      .van-button--info {
+        background-color: #638ee4;
+        border: 1px solid #638ee4;
+      }
+    }
+  }
+  .completed {
+    position: relative;
+    margin-top: 3vw;
+    height: 400px;
+    @include center();
+    .van-button--info {
+      height: 8vh;
+      width: 75vw;
+      background-color: #638ee4;
+      border: 1px solid #638ee4;
+    }
+  }
+  .button {
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 15vw;
+    width: 75vw;
+    height: 14vw;
+    margin: auto;
 
-		.van-button--info {
-			background-color: #638ee4;
-			border: 1px solid #638ee4;
-		}
-	}
+    .van-button--info {
+      background-color: #638ee4;
+      border: 1px solid #638ee4;
+    }
+  }
 }
 </style>

From 26f5095a19ef711e0533ec7dfc147174b5a1ceb7 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 18 Jan 2024 16:47:05 +0800
Subject: [PATCH 08/14] =?UTF-8?q?fix=20-=20c1=E5=90=8E=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=80=97=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=20=20=20=20-=20=E4=BF=AE=E5=A4=8D=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=97=B6=E9=97=B4=E6=88=B3=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   9 +-
 src/config/models.js                          |   2 +-
 .../gps-card-frontend/device-power/index.vue  | 711 ++++++++++--------
 3 files changed, 402 insertions(+), 320 deletions(-)

diff --git a/README.md b/README.md
index ff1a7a3..c9098d1 100644
--- a/README.md
+++ b/README.md
@@ -896,4 +896,11 @@ update
 `2024.1.3`
 fix
 - 心理监测详情
-    - 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题
\ No newline at end of file
+    - 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题
+
+
+## v1.0.115
+`2024.1.4`
+fix
+- c1后台设备功耗查看页面
+    - 修复 设备状态时间戳转换错误的问题
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index b71455e..a46e2a4 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.115F'; //版本号
+export const VERSION_MODEL = '1.0.116F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/gps-card-frontend/device-power/index.vue b/src/views/gps-card-frontend/device-power/index.vue
index 268ee75..174a3ca 100644
--- a/src/views/gps-card-frontend/device-power/index.vue
+++ b/src/views/gps-card-frontend/device-power/index.vue
@@ -6,362 +6,437 @@
  * @description:
 -->
 <template>
-    <div class="device-power">
-        <van-nav-bar :left-arrow="true" @click-left="onNavBack">
-            <template #left>
-                <van-icon name="arrow-left" size="24" style="padding: 0"/>
-                <span>返回</span>
-            </template>
-        </van-nav-bar>
-        <div class="top">
-            <p>查看数据</p>
-        </div>
-        <div class="action">
-            <div class="left">
-                <van-dropdown-menu>
-                    <van-dropdown-item style="min-width: 150px" v-model="dayValue" :options="dayOption" @change="onChange" />
-                </van-dropdown-menu>
-            </div>
-            <div class="right">
-                <div class="btn-container">
-                    <van-button :class="['btn', {active: btnActive === item.index }]" @click="onClickBtn(item.index)" v-for="(item, index) in btnList" :key="index">{{ item.text }}</van-button>
-                </div>
-            </div>
-        </div>
-        <div class="details-container" v-if="btnActive === 0 && data.length > 0 || tableData.length > 0 && btnActive === 1">
-            <p class="last-time" v-show="btnActive === 0 && params.title === 'Offline'">最近一次离线时间：{{ lastTime }}</p>
-            <Echart :option="chartOption" v-show="btnActive === 0"/>
-            <Table :columns="titleList" :data="tableData" v-show="btnActive === 1"/>
-        </div>
-        <div class="details-container no-data" v-else>
-            <van-empty image="error" description="暂无数据" />
+  <div class="device-power">
+    <van-nav-bar :left-arrow="true" @click-left="onNavBack">
+      <template #left>
+        <van-icon name="arrow-left" size="24" style="padding: 0" />
+        <span>返回</span>
+      </template>
+    </van-nav-bar>
+    <div class="top">
+      <p>查看数据</p>
+    </div>
+    <div class="action">
+      <div class="left">
+        <van-dropdown-menu>
+          <van-dropdown-item
+            style="min-width: 150px"
+            v-model="dayValue"
+            :options="dayOption"
+            @change="onChange"
+          />
+        </van-dropdown-menu>
+      </div>
+      <div class="right">
+        <div class="btn-container">
+          <van-button
+            :class="['btn', { active: btnActive === item.index }]"
+            @click="onClickBtn(item.index)"
+            v-for="(item, index) in btnList"
+            :key="index"
+            >{{ item.text }}</van-button
+          >
         </div>
+      </div>
+    </div>
+    <div
+      class="details-container"
+      v-if="
+        (btnActive === 0 && data.length > 0) ||
+        (tableData.length > 0 && btnActive === 1)
+      "
+    >
+      <p
+        class="last-time"
+        v-show="btnActive === 0 && params.title === 'Offline'"
+      >
+        最近一次离线时间：{{ lastTime }}
+      </p>
+      <Echart :option="chartOption" v-show="btnActive === 0" />
+      <Table :columns="titleList" :data="tableData" v-show="btnActive === 1" />
     </div>
+    <div class="details-container no-data" v-else>
+      <van-empty image="error" description="暂无数据" />
+    </div>
+  </div>
 </template>
 
 <script>
-import Echart from '@/components/echarts';
-import Table from '@/components/tables';
-import APIIot from '@/api/iot';
+import Echart from "@/components/echarts";
+import Table from "@/components/tables";
+import APIIot from "@/api/iot";
 import { DEVICE_POWER } from "@/config/models";
-import axios from 'axios';
+import axios from "axios";
 export default {
-  name:'',
-  components: { Echart,Table },
-  data(){
-   return {
-       dayValue: 7,
-       dayOption: [
-           { text: '7天', value: 7 },
-           { text: '30天', value: 30 },
-       ],
-       btnList: [
-           { text: '图表', index: 0 },
-           { text: '表格', index: 1 },
-       ],
-       btnActive: 0,
-       chartOption: {},
-       titleList: [
-           { title: '时间', width: '40%', key: 'time'},
-           { title: '原始值', width: '60%', key: 'value' },
-       ],
-       tableData: [],
-       echarts: {
-           title: '',
-           type: '',
-       },
-       data: [],
-       xAxisData: [],
-       filterData: [],
-       yAxisObject: {},
-       lastTime: '',
-       params: {}
-   }
+  name: "",
+  components: { Echart, Table },
+  data() {
+    return {
+      dayValue: 7,
+      dayOption: [
+        { text: "7天", value: 7 },
+        { text: "30天", value: 30 },
+      ],
+      btnList: [
+        { text: "图表", index: 0 },
+        { text: "表格", index: 1 },
+      ],
+      btnActive: 0,
+      chartOption: {},
+      titleList: [
+        { title: "时间", width: "40%", key: "time" },
+        { title: "原始值", width: "60%", key: "value" },
+      ],
+      tableData: [],
+      echarts: {
+        title: "",
+        type: "",
+      },
+      data: [],
+      xAxisData: [],
+      filterData: [],
+      yAxisObject: {},
+      lastTime: "",
+      params: {},
+    };
   },
   created() {
     this.loadParams();
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     loadParams() {
-        let params = this.$route.query;
-        this.params = {...params};
-        if(params) {
-            this.echarts.title = DEVICE_POWER[params.title].title;
-            this.echarts.type = DEVICE_POWER[params.title].value;
-            // 获取接口数据
-            this.getData();
-        } else {
-            // todo跳转404页面
-        }
+      let params = this.$route.query;
+      this.params = { ...params };
+      if (params) {
+        this.echarts.title = DEVICE_POWER[params.title].title;
+        this.echarts.type = DEVICE_POWER[params.title].value;
+        // 获取接口数据
+        this.getData();
+      } else {
+        // todo跳转404页面
+      }
     },
     getData() {
-        this.$toast.loading();
-        let reqBody = {
-            days: String(this.dayValue),
-            identifier: this.echarts.type,
-            imei: /* '861281060086216' *//* '862838050029479' */this.$store.getters.imei
-        };
-        // 线上地址
-       let baseUrl = process.env.VUE_APP_BASE_API;
-       let reqUrl = `${baseUrl}iotservice/getdeviceinfo`;
-        // 开启代理如下
-       /* let reqUrl = `/api/id/getdeviceinfo`; */
-        axios.post(`${reqUrl}`, reqBody).then(res => {
-            let data = res.data;
-            if(data.code === 200) {
-                if(this.echarts.type === 'BatteryLevel' || this.echarts.type === 'status') {
-                    this.filterData = data[this.echarts.type].data/* .list.propertyInfo */;
-                } else if(this.echarts.type === 'offline') {
-                    this.filterData = data.Offline.data;
-                }
-                if(this.echarts.type === 'status') {
-                    // 信号强度
-                    this.yAxisObject = {
-                        type: "value",
-                        /* max: 4,
+      this.$toast.loading();
+      let reqBody = {
+        days: String(this.dayValue),
+        identifier: this.echarts.type,
+        imei: /* '861281060086216' */ /* '862838050029479' */ this.$store
+          .getters.imei,
+      };
+      // 线上地址
+      let baseUrl = process.env.VUE_APP_BASE_API;
+      let reqUrl = `${baseUrl}iotservice/getdeviceinfo`;
+      // 开启代理如下
+      /* let reqUrl = `/api/id/getdeviceinfo`; */
+      axios
+        .post(`${reqUrl}`, reqBody)
+        .then((res) => {
+          let data = res.data;
+          if (data.code === 200) {
+            if (
+              this.echarts.type === "BatteryLevel" ||
+              this.echarts.type === "status"
+            ) {
+              this.filterData =
+                data[this.echarts.type].data /* .list.propertyInfo */;
+              console.log("this.filterData", this.filterData);
+            } else if (this.echarts.type === "offline") {
+              this.filterData = data.Offline.data;
+            }
+            if (this.echarts.type === "status") {
+              // 信号强度
+              this.yAxisObject = {
+                type: "value",
+                /* max: 4,
                         min: 0,
                         interval: 1,
                         splitNumber : 1,
                         boundaryGap : [ '5%', '5%' ], */
-                    }
-                    this.titleList = [
-                        { title: '时间', width: '40%', key: 'time'},
-                        { title: '原始值', width: '60%', key: 'value' },
-                    ];
-                    let propertyInfo = this.filterData.map(item => {
-                        return item.list.propertyInfo;
-                    });
-                    let result = [];
-                    for (let i = 0; i < propertyInfo.length; i++) {
-                        // 循环对象中的数组
-                        result = [].concat(...propertyInfo)
-                    }
-                    // 表格则要显示全部数据
-                    this.tableData = result.map(item => {
-                        return {
-                            value: item.value,
-                            time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm")
-                        }
-                    }).reverse();
-                    // 图表筛选过滤只显示 rssi <= 2的数据
-                    this.data = result.map(item => {
-                        // 序列化json
-                        let json = JSON.parse(item.value);
-                        return {
-                            value: json.rssi,
-                            time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm"),
-                            type: 'status'
-                        }
-                    }).filter(f => {
-                        return f.value  <=2;
-                    })
-                } else if (this.echarts.type === 'offline') {
-                    // 设备离线次数
-                    this.titleList = [
-                        { title: '时间', width: '40%', key: 'time'},
-                        { title: '最近离线时间', width: '60%', key: 'lastTime' },
-                        { title: '离线次数', width: '40%', key: 'value' },
-                    ],
-                    this.yAxisObject = {
-                        type: "value",
-                      /*   max: 10,
+              };
+              this.titleList = [
+                { title: "时间", width: "40%", key: "time" },
+                { title: "原始值", width: "60%", key: "value" },
+              ];
+              let propertyInfo = this.filterData.map((item) => {
+                return item.list.propertyInfo;
+              });
+              let result = [];
+              for (let i = 0; i < propertyInfo.length; i++) {
+                // 循环对象中的数组
+                result = [].concat(...propertyInfo);
+              }
+              // 表格则要显示全部数据
+              this.tableData = result
+                .map((item) => {
+                  return {
+                    value: item.value,
+                    time: this.$dayjs(this.$dayjs(Number(item.time))).format(
+                      "YYYY/MM/DD HH:mm"
+                    ),
+                  };
+                })
+                .reverse();
+              // 图表筛选过滤只显示 rssi <= 2的数据
+              this.data = result
+                .map((item) => {
+                  // 序列化json
+                  let json = JSON.parse(item.value);
+                  return {
+                    value: json.rssi,
+                    time: this.$dayjs(this.$dayjs(Number(item.time))).format(
+                      "YYYY/MM/DD HH:mm"
+                    ),
+                    type: "status",
+                  };
+                })
+                .filter((f) => {
+                  return f.value <= 2;
+                });
+            } else if (this.echarts.type === "offline") {
+              // 设备离线次数
+              (this.titleList = [
+                { title: "时间", width: "40%", key: "time" },
+                { title: "最近离线时间", width: "60%", key: "lastTime" },
+                { title: "离线次数", width: "40%", key: "value" },
+              ]),
+                (this.yAxisObject = {
+                  type: "value",
+                  /*   max: 10,
                         min: 0,
                         interval: 1,
                         splitNumber : 1,
                         boundaryGap : [ '5%', '5%' ], */
-                    };
-                    
-                    this.data = this.filterData.sort((date1, date2) => {
-                        // 日期升序排序
-                        return date2.time < date1.time ? 1 : -1
-                    }).map(item => {
-                        return {
-                            /* value: item.value, */
-                            time: item.createTime.slice(0,10),
-                            day: item.createTime.slice(0,10),
-                            type: 'offline',
-                            lastTime: item.createTime.replace('T', ' ')
-                        }
-                    }).reduce((accumulator, currentValue) => {
-                        if (accumulator.find(obj => obj.day === currentValue.day)) {
-                            accumulator.find(obj => obj.day === currentValue.day).value++;
-                        } else {
-                            accumulator.push({ day: currentValue.day, time: currentValue.time, value: 1, type: 'offline', lastTime: currentValue.lastTime });
-                        }
-                        return accumulator;
-                    }, []).sort(function(date1, date2) {
-                        // 日期升序排序
-                        return date2.time < date1.time ? 1 : -1
+                });
+
+              this.data = this.filterData
+                .sort((date1, date2) => {
+                  // 日期升序排序
+                  return date2.time < date1.time ? 1 : -1;
+                })
+                .map((item) => {
+                  return {
+                    /* value: item.value, */
+                    time: item.createTime.slice(0, 10),
+                    day: item.createTime.slice(0, 10),
+                    type: "offline",
+                    lastTime: item.createTime.replace("T", " "),
+                  };
+                })
+                .reduce((accumulator, currentValue) => {
+                  if (accumulator.find((obj) => obj.day === currentValue.day)) {
+                    accumulator.find((obj) => obj.day === currentValue.day)
+                      .value++;
+                  } else {
+                    accumulator.push({
+                      day: currentValue.day,
+                      time: currentValue.time,
+                      value: 1,
+                      type: "offline",
+                      lastTime: currentValue.lastTime,
                     });
-                    console.log("data", this.data);
-                    console.log(this.data);
-                    this.lastTime = this.data && this.data[this.data.length  - 1].lastTime || '';
+                  }
+                  return accumulator;
+                }, [])
+                .sort(function (date1, date2) {
+                  // 日期升序排序
+                  return date2.time < date1.time ? 1 : -1;
+                });
+              this.lastTime =
+                (this.data && this.data[this.data.length - 1].lastTime) || "";
 
-                    this.tableData = this.filterData/* .sort((date1, date2) => {
+              this.tableData = this.filterData /* .sort((date1, date2) => {
                         // 日期升序排序
                         return date2.time > date1.time ? 1 : -1
-                    }). */.map(item => {
-                        return {
-                            /* value: item.value, */
-                            time: item.createTime.slice(0,10),
-                            day: item.createTime.slice(0,10),
-                            lastTime: item.createTime.replace('T', ' ')
-                        }
-                    }).reduce((accumulator, currentValue) => {
-                        // 筛选遍历数据，获取相同日期的数据，计算出现的次数后重新累加组合到一个新的数组里面
-                        if (accumulator.find(obj => obj.day === currentValue.day)) {
-                            accumulator.find(obj => obj.day === currentValue.day).value++;
-                        } else {
-                            accumulator.push({ day: currentValue.day, time: currentValue.time, value: 1, lastTime: currentValue.lastTime });
-                        }
-                        return accumulator;
-                    }, []).sort(function(date1, date2) {
-                        // 日期升序排序
-                        return date2.time < date1.time ? 1 : -1
-                    }).reverse();
-                } else {
-                    this.titleList = [
-                        { title: '时间', width: '40%', key: 'time'},
-                        { title: '电量', width: '60%', key: 'value' },
-                    ],
-                    this.yAxisObject = {
-                        type: "value",
-                        max: 100,
-                        min: 0,
-                        interval: 20,
-                        splitNumber : 1,
-                        boundaryGap : [ '5%', '5%' ],
-                    }
-                    let propertyInfo = this.filterData.map(item => {
-                        return item.list.propertyInfo;
-                    });
-                    let result = [];
-                    for (let i = 0; i < propertyInfo.length; i++) {
-                        // 循环对象中的数组
-                        result = [].concat(...propertyInfo)
-                    }
-                    this.data = result.map(item => {
-                        return {
-                            value: item.value,
-                            time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm"),
-                        }
-                    }).sort((date1, date2) => {
-                        // 日期升序排序
-                        return date2.time < date1.time ? 1 : -1
+                    }). */
+                .map((item) => {
+                  return {
+                    /* value: item.value, */
+                    time: item.createTime.slice(0, 10),
+                    day: item.createTime.slice(0, 10),
+                    lastTime: item.createTime.replace("T", " "),
+                  };
+                })
+                .reduce((accumulator, currentValue) => {
+                  // 筛选遍历数据，获取相同日期的数据，计算出现的次数后重新累加组合到一个新的数组里面
+                  if (accumulator.find((obj) => obj.day === currentValue.day)) {
+                    accumulator.find((obj) => obj.day === currentValue.day)
+                      .value++;
+                  } else {
+                    accumulator.push({
+                      day: currentValue.day,
+                      time: currentValue.time,
+                      value: 1,
+                      lastTime: currentValue.lastTime,
                     });
-                    this.tableData = result.map(item => {
-                        return {
-                            value: item.value,
-                            time: this.$dayjs(this.$dayjs(Number(item.time))).format("YYYY/MM/DD hh:mm")
-                        }
-                    }).sort((date1, date2) => {
-                        // 日期升序排序
-                        return date2.time < date1.time ? 1 : -1
-                    }).reverse();
-                }
-                this.xAxisData = this.data.map(item => {
-                    return this.$dayjs(item.time).format("MM/DD");
+                  }
+                  return accumulator;
+                }, [])
+                .sort(function (date1, date2) {
+                  // 日期升序排序
+                  return date2.time < date1.time ? 1 : -1;
+                })
+                .reverse();
+            } else {
+              (this.titleList = [
+                { title: "时间", width: "40%", key: "time" },
+                { title: "电量", width: "60%", key: "value" },
+              ]),
+                (this.yAxisObject = {
+                  type: "value",
+                  max: 100,
+                  min: 0,
+                  interval: 20,
+                  splitNumber: 1,
+                  boundaryGap: ["5%", "5%"],
+                });
+              let propertyInfo = this.filterData.map((item) => {
+                return item.list.propertyInfo;
+              });
+              let result = [];
+              for (let i = 0; i < propertyInfo.length; i++) {
+                // 循环对象中的数组
+                result = [].concat(...propertyInfo);
+              }
+              this.data = result
+                .map((item) => {
+                  return {
+                    value: item.value,
+                    time: this.$dayjs(this.$dayjs(Number(item.time))).format(
+                      "YYYY/MM/DD HH:mm"
+                    ),
+                  };
                 })
-                this.chartOption = {
-                    title: {
-                        text: this.echarts.title,
-                        textStyle: {
-                            fontSize: 16
-                        },
-                    },
-                    xAxis: {
-                        type: "category",
-                        axisLine: {
-                            show: false
-                        },
-                        textStyle: {
-                            fontSize: 10
-                        },
-                        axisTick: {
-                            show: false
-                        },
-                        splitLine: {
-                            show: false,
-                            lineStyle: {
-                                color: "#ddd",
-                                width: 2
-                            }
-                        },
-                        nameLocation: 'center',
-                        axisLabel: {
-                            show: true,
-                            fontSize: 12,
-                            showMinLabel: true, //显示最小值
-                            showMaxLabel: true, //显示最大值
-                        },
-                        data: this.xAxisData
-                    },
-                    yAxis: this.yAxisObject,
-                    series: [
-                        {
-                            type: "line",
-                            data: this.data,
-                            /* areaStyle: {}, */
-                        },
-                    ],
-                    dataZoom: [
-                        {
-                            start: 0,
-                            end: 100,
-                            textStyle: {
-                                color: "#FFF",
-                                fontSize: 14
-                            },
-                            show: true,
-                            height: 20,
-                            bottom: 5,
-                            handleStyle: {
-                                borderWidth: 1,
-                                borderCap: "square"
-                            }
-                        }
-                    ],
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            fontSize: 14,
-                            align: "center"
-                        },
-                        formatter: function(params) {
-                            return `${params[0].marker}${params[0].data.time}</br>
-                            ${ params[0].data.type === 'offline' ? '最近离线时间:' + params[0].data.lastTime : ''}</br>
-                            ${ params[0].data.type === 'offline' ? '离线次数:' + params[0].data.value + '次' :
-                            params[0].data.type === 'status' ? 'rssi值:' +  params[0].data.value :
-                            '电量:' + params[0].data.value}`
-                        }
-                    },
-                }
+                .sort((date1, date2) => {
+                  // 日期升序排序
+                  return date2.time < date1.time ? 1 : -1;
+                });
+              console.log("解析后的数据", this.data);
+              this.tableData = result
+                .map((item) => {
+                  return {
+                    value: item.value,
+                    time: this.$dayjs(this.$dayjs(Number(item.time))).format(
+                      "YYYY/MM/DD HH:mm"
+                    ),
+                  };
+                })
+                .sort((date1, date2) => {
+                  // 日期升序排序
+                  return date2.time < date1.time ? 1 : -1;
+                })
+                .reverse();
             }
-        }).catch(() => {
-
-        }).finally(() => {
-            this.$toast.clear();
+            this.xAxisData = this.data.map((item) => {
+              return this.$dayjs(item.time).format("MM/DD");
+            });
+            this.chartOption = {
+              title: {
+                text: this.echarts.title,
+                textStyle: {
+                  fontSize: 16,
+                },
+              },
+              xAxis: {
+                type: "category",
+                axisLine: {
+                  show: false,
+                },
+                textStyle: {
+                  fontSize: 10,
+                },
+                axisTick: {
+                  show: false,
+                },
+                splitLine: {
+                  show: false,
+                  lineStyle: {
+                    color: "#ddd",
+                    width: 2,
+                  },
+                },
+                nameLocation: "center",
+                axisLabel: {
+                  show: true,
+                  fontSize: 12,
+                  showMinLabel: true, //显示最小值
+                  showMaxLabel: true, //显示最大值
+                },
+                data: this.xAxisData,
+              },
+              yAxis: this.yAxisObject,
+              series: [
+                {
+                  type: "line",
+                  data: this.data,
+                  /* areaStyle: {}, */
+                },
+              ],
+              dataZoom: [
+                {
+                  start: 0,
+                  end: 100,
+                  textStyle: {
+                    color: "#FFF",
+                    fontSize: 14,
+                  },
+                  show: true,
+                  height: 20,
+                  bottom: 5,
+                  handleStyle: {
+                    borderWidth: 1,
+                    borderCap: "square",
+                  },
+                },
+              ],
+              tooltip: {
+                trigger: "axis",
+                textStyle: {
+                  fontSize: 14,
+                  align: "center",
+                },
+                formatter: function (params) {
+                  return `${params[0].marker}${params[0].data.time}</br>
+                            ${
+                              params[0].data.type === "offline"
+                                ? "最近离线时间:" + params[0].data.lastTime
+                                : ""
+                            }</br>
+                            ${
+                              params[0].data.type === "offline"
+                                ? "离线次数:" + params[0].data.value + "次"
+                                : params[0].data.type === "status"
+                                ? "rssi值:" + params[0].data.value
+                                : "电量:" + params[0].data.value
+                            }`;
+                },
+              },
+            };
+          }
         })
+        .catch(() => {})
+        .finally(() => {
+          this.$toast.clear();
+        });
     },
     onClickBtn(value) {
-        this.btnActive = value;
-        this.getData();
+      this.btnActive = value;
+      this.getData();
     },
     onChange(value) {
-        this.dayValue = value;
-        this.getData();
+      this.dayValue = value;
+      this.getData();
     },
     onNavBack() {
-        this.$router.push({
-            name: 'deviceSetting'
-        })
-    }
-  }
-}
+      this.$router.push({
+        name: "deviceSetting",
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-    @import "./index.scss";
+@import "./index.scss";
 </style>

From a7364172312a87792ce76421d647744802cf97bb Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 26 Jan 2024 15:13:22 +0800
Subject: [PATCH 09/14] =?UTF-8?q?update=20-=20=E2=80=98=E7=84=A6=E8=99=91?=
 =?UTF-8?q?=E2=80=99=E6=96=87=E5=AD=97=E6=94=B9=E6=88=90=E2=80=98=E6=8A=91?=
 =?UTF-8?q?=E9=83=81=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                          |  7 ++++++-
 src/config/models.js                               | 14 +++++++-------
 src/views/health/psychological-main/index.vue      |  6 +++---
 src/views/health/psychological/index.vue           |  8 ++++----
 src/views/health/psychological/report/index.vue    |  2 +-
 .../health/psychological/report/report-entry.vue   |  2 +-
 src/views/psychological-modeling/index.vue         |  4 ++--
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index c9098d1..f5df5d9 100644
--- a/README.md
+++ b/README.md
@@ -903,4 +903,9 @@ fix
 `2024.1.4`
 fix
 - c1后台设备功耗查看页面
-    - 修复 设备状态时间戳转换错误的问题
\ No newline at end of file
+    - 修复 设备状态时间戳转换错误的问题
+
+## v1.0.116
+`2024.1.26`
+update
+- ‘焦虑’文字改成‘抑郁’
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index a46e2a4..ae22ece 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -26,15 +26,15 @@ export const BaiduStatisticsModel = {
 };
 // 情绪模型
 export const EmotionModel = {
-    // 焦虑
+    // 抑郁
     depression: {
-        name: '焦虑',
+        name: '抑郁',
         type: 2,
-        title1: '焦虑倾向',
-        article1: `<p>设备所检测的是个体的焦虑倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为焦虑症的患者的相应特征进行对比，判断出个体的焦虑倾向（即焦虑症的可能性）程度。焦虑倾向持续的时间越长、程度越严重，代表患有焦虑症的风险就越大。</p>`,
-        title2: '焦虑倾向算法原理',
-        article2: `<p>1．研究发现，焦虑症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
-        <p>2．焦虑症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
+        title1: '抑郁倾向',
+        article1: `<p>设备所检测的是个体的抑郁倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为抑郁症的患者的相应特征进行对比，判断出个体的抑郁倾向（即抑郁症的可能性）程度。抑郁倾向持续的时间越长、程度越严重，代表患有抑郁症的风险就越大。</p>`,
+        title2: '抑郁倾向算法原理',
+        article2: `<p>1．研究发现，抑郁症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
+        <p>2．抑郁症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
 
     },
     // 压力
diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 2bead6c..3cb8818 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -55,7 +55,7 @@ export default {
   data() {
     return {
       healhtList: [
-        /*  { value: 40, name: '焦虑指数', class: 'depression',result: '无焦虑倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
+        /*  { value: 40, name: '抑郁指数', class: 'depression',result: '无抑郁倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
            { value: 55, name: '压力指数', class: 'stress', result: '轻度压力', time: '17:52', img: require('@/assets/img/regardless.png') },
            { value: 75, name: '疲劳指数', class: 'tiredness', result: '中度疲劳指数', time: '17:52', img: require('@/assets/img/moderate.png') }, */
       ],
@@ -156,10 +156,10 @@ export default {
                 ? this.calcImg(data.StressLevel, "stress")
                 : "",
             },
-            // 焦虑指数
+            // 抑郁指数
             {
               value: data.DepScore,
-              name: "焦虑指数",
+              name: "抑郁指数",
               class: "depression",
               result: data.DepDesc,
               time: data.DepMeasureUpdateTime
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index f10a21f..11d9b75 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -198,7 +198,7 @@
             <div class="friendly-reminder" v-if="emoType === 2">
               <p :style="{ color: currentColor }">友情提示：</p>
               <span
-                >如果您发现焦虑倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现焦虑倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span
+                >如果您发现抑郁倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现抑郁倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span
               >
             </div>
 
@@ -266,7 +266,7 @@
                   </div>
                 </div>
                 <!-- <div class="trend">
-                                    <p>( <span>无焦虑倾向</span><span>5%</span>，<span>轻度焦虑倾向</span> <span>5%</span> )</p>
+                                    <p>( <span>无抑郁倾向</span><span>5%</span>，<span>轻度抑郁倾向</span> <span>5%</span> )</p>
                                 </div>-->
               </div>
             </div>
@@ -288,7 +288,7 @@
         <div class="item science-tips first" v-if="emoType === 2">
           <div class="tips"><h5>小科普</h5></div>
           <p>
-            焦虑症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是焦虑症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有焦虑的风险。
+            抑郁症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。
           </p>
         </div>
         <div class="item">
@@ -323,7 +323,7 @@ export default {
       psyList: [
         { name: "tiredness", text: "疲劳", value: 0 },
         { name: "stress", text: "压力", value: 1 },
-        { name: "depression", text: "焦虑", value: 2 },
+        { name: "depression", text: "抑郁", value: 2 },
       ],
       // 当前情绪下标
       psyCurrent: 0,
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 132ef2c..49aa600 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -673,7 +673,7 @@ export default {
           title = "压力";
           break;
         case 2:
-          title = "焦虑";
+          title = "抑郁";
           break;
         case 3:
           title = "疲劳";
diff --git a/src/views/health/psychological/report/report-entry.vue b/src/views/health/psychological/report/report-entry.vue
index 7fefbbb..be5d399 100644
--- a/src/views/health/psychological/report/report-entry.vue
+++ b/src/views/health/psychological/report/report-entry.vue
@@ -41,7 +41,7 @@
                   </div>
                 </div>
                 <!-- <div class="trend">
-                                    <p>( <span>无焦虑倾向</span><span>5%</span>，<span>轻度焦虑倾向</span> <span>5%</span> )</p>
+                                    <p>( <span>无抑郁倾向</span><span>5%</span>，<span>轻度抑郁倾向</span> <span>5%</span> )</p>
                                 </div>-->
               </div>
             </div>
diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue
index 9377d8e..56eddaf 100644
--- a/src/views/psychological-modeling/index.vue
+++ b/src/views/psychological-modeling/index.vue
@@ -108,8 +108,8 @@ export default {
     },
     tips() {
       return this.info.isFirstModeling === 1
-        ? "首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算焦虑、压力、疲劳分值。"
-        : "由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算焦虑、压力、疲劳的分值。";
+        ? "首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算抑郁、压力、疲劳分值。"
+        : "由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算抑郁、压力、疲劳的分值。";
     },
   },
   mounted() {

From 68140634d146b07e510f22d01a1c49738b654b65 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Fri, 26 Jan 2024 15:21:35 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B7=98=E5=AE=9D?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup_development.sh | 2 +-
 setup_production.sh  | 2 +-
 setup_test.sh        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup_development.sh b/setup_development.sh
index d43b908..5f1276d 100644
--- a/setup_development.sh
+++ b/setup_development.sh
@@ -7,7 +7,7 @@
  # @description:
 ###
 npm -v
-npm config set registry https://registry.npm.taobao.org
+npm config set registry https://registry.npmmirror.com
 npm install
 npm run build-dev
 image_version=`date +%Y%m%d%H%M`;
diff --git a/setup_production.sh b/setup_production.sh
index 1a9109f..49bb0e8 100644
--- a/setup_production.sh
+++ b/setup_production.sh
@@ -7,7 +7,7 @@
  # @description:
 ###
 npm -v
-npm config set registry https://registry.npm.taobao.org
+npm config set registry https://registry.npmmirror.com
 npm install
 npm run build
 image_version=$version;
diff --git a/setup_test.sh b/setup_test.sh
index c0cae5b..e053b20 100644
--- a/setup_test.sh
+++ b/setup_test.sh
@@ -8,7 +8,7 @@
 ###
 #!/bin/bash
 npm -v
-npm config set registry https://registry.npm.taobao.org
+npm config set registry https://registry.npmmirror.com
 npm install
 npm run build-test
 image_version=$version;

From 2635203dda348dff7ea5e3ce4fc2beee3505dcac Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 21 Mar 2024 11:15:52 +0800
Subject: [PATCH 11/14] =?UTF-8?q?update=20-=20=E2=80=98=E6=8A=91=E9=83=81?=
 =?UTF-8?q?=E2=80=99=E6=96=87=E5=AD=97=20=E9=80=9A=E8=BF=87=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=A0=E8=BF=87=E6=9D=A5=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=20=E6=94=B9=E6=88=90=E2=80=98=E7=84=A6=E8=99=91=E2=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   8 +-
 src/config/models.js                          |  21 ++-
 src/main.js                                   |   4 +-
 src/store/index.js                            |  12 +-
 src/utils/index.js                            |  34 +++-
 src/views/health/psychological-main/index.vue |  32 ++--
 src/views/health/psychological/index.vue      | 163 +++++++-----------
 .../health/psychological/report/index.vue     | 106 +++++-------
 src/views/psychological-modeling/index.vue    |  71 ++++----
 9 files changed, 217 insertions(+), 234 deletions(-)

diff --git a/README.md b/README.md
index f5df5d9..d0a13d4 100644
--- a/README.md
+++ b/README.md
@@ -908,4 +908,10 @@ fix
 ## v1.0.116
 `2024.1.26`
 update
-- ‘焦虑’文字改成‘抑郁’
\ No newline at end of file
+- ‘焦虑’文字改成‘抑郁’
+
+
+## v1.0.117
+`2024.3.21`
+update
+- ‘抑郁’文字 通过页面传过来的参数 改成‘焦虑’，否则不变
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index ae22ece..cf89513 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,10 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.116F'; //版本号
+import store from "@/store";
+// 情绪模型
+const appTypeList = ['1'];
+export const VERSION_MODEL = '1.0.117F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
@@ -24,17 +27,19 @@ export const BaiduStatisticsModel = {
     test:        "https://hm.baidu.com/hm.js?edb76b471e997167b7782c1513382771", // 随手精灵百度流量统计 测试环境
     development: "https://hm.baidu.com/hm.js?edb76b471e997167b7782c1513382771", // 随手精灵百度流量统计 测试环境
 };
-// 情绪模型
+
+// 焦虑文字
+export const anxietyText = appTypeList.indexOf(store.getters.appType) >-1  ? `焦虑`: `抑郁`
 export const EmotionModel = {
     // 抑郁
     depression: {
-        name: '抑郁',
+        name: anxietyText,
         type: 2,
-        title1: '抑郁倾向',
-        article1: `<p>设备所检测的是个体的抑郁倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为抑郁症的患者的相应特征进行对比，判断出个体的抑郁倾向（即抑郁症的可能性）程度。抑郁倾向持续的时间越长、程度越严重，代表患有抑郁症的风险就越大。</p>`,
-        title2: '抑郁倾向算法原理',
-        article2: `<p>1．研究发现，抑郁症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
-        <p>2．抑郁症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
+        title1: `${anxietyText}倾向`,
+        article1: `<p>设备所检测的是个体的${anxietyText}倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为${anxietyText}症的患者的相应特征进行对比，判断出个体的${anxietyText}倾向（即${anxietyText}症的可能性）程度。${anxietyText}倾向持续的时间越长、程度越严重，代表患有${anxietyText}症的风险就越大。</p>`,
+        title2: `${anxietyText}倾向算法原理`,
+        article2: `<p>1．研究发现，${anxietyText}症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
+        <p>2．${anxietyText}症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
 
     },
     // 压力
diff --git a/src/main.js b/src/main.js
index 6a66672..1e17f7e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,9 +14,10 @@ import '@/assets/css/reset.scss';
 import dayjs from 'dayjs';
 // ui库按需引入
 import 'vant/lib/index.css';
+import { replaceAll } from '@/utils';
 // 引入echarts
 import * as echarts from 'echarts';
-import { BaiduStatisticsModel } from '@/config/models';
+import { BaiduStatisticsModel} from '@/config/models';
 import {
     Button,
     Calendar,
@@ -128,6 +129,7 @@ Vue.config.productionTip = false;
 Vue.prototype.$dayjs = dayjs;
 Vue.prototype.$echarts = echarts;
 Vue.prototype.$bus =  new Vue();
+Vue.prototype.$replaceAll = replaceAll;
 router.afterEach((to, from, next) => {
     // 创建百度统计js
    setTimeout(()=>{
diff --git a/src/store/index.js b/src/store/index.js
index fadbe53..04eb52a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -24,6 +24,7 @@ export default new Vuex.Store({
         fromSsjl: '',
         active: null, //点击左边树形图下标
         tabClick: '', //心理监测点击tab
+        appType: '', //应用类型
     },
     mutations: {
         imei(state, imei) {
@@ -70,6 +71,11 @@ export default new Vuex.Store({
             state.tabClick = tabClick;
             window.localStorage[prefix + 'tabClick'] = tabClick;
         },
+        appType(state, appType) {
+            state.appType = appType;
+            window.localStorage[prefix + 'appType'] = appType;
+        },
+        
 
     },
     getters: {
@@ -117,7 +123,11 @@ export default new Vuex.Store({
             if (state.tabClick != '') return state.tabClick;
             return window.localStorage[prefix + 'tabClick'] == null ? '' : window.localStorage[prefix + 'tabClick'];
         },
-
+        appType: state => {
+            if (state.appType != '') return state.appType;
+            return window.localStorage[prefix + 'appType'] == null ? '' : window.localStorage[prefix + 'appType'];
+        },
+        
     },
     actions: {},
     modules: {}
diff --git a/src/utils/index.js b/src/utils/index.js
index db99691..0666ba1 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -5,7 +5,7 @@
  * @FilePath: \AntpayFrontEnd\src\utils\index.js
  * @description: 工具类
  */
-
+import store from "@/store";
 
 /**
  * 判断是否为空
@@ -88,4 +88,34 @@ export function isShowAntpay(array) {
     } else {
         return false;
     }
-}
\ No newline at end of file
+}
+
+// 将传入内容的某个文字全部替换成指定的文字
+/**
+ * 
+ * @param {*} target  目标字符串
+ * @param {*} searchValue 要搜索和替换的子串
+ * @param {*} replacement 替换的新字符串
+ * @returns 
+ */
+export function replaceAll(target, searchValue, replacement) {
+    // 应用类型，目前1 是健康好蕴，其他则不替换
+    const appTypeList = ['1'];
+    const appType = store.getters.appType;
+    if(appTypeList.indexOf(appType) > -1) {
+        if(isNotNull(target) && isNotNull(searchValue)) {
+            if(target.includes(searchValue)) {
+                return target.replace(new RegExp(searchValue, 'g'), replacement);
+            } else {
+                return target
+            }
+            
+        } else {
+            return target
+        }
+        
+    } else {
+        return target
+    }
+    
+  }
\ No newline at end of file
diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 3cb8818..560670e 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -12,12 +12,7 @@
     </van-nav-bar>
     <div class="main">
       <div class="list">
-        <div
-          v-for="(item, index) in healhtList"
-          :key="index"
-          :class="['item', item.class]"
-          @click="onClick(item)"
-        >
+        <div v-for="(item, index) in healhtList" :key="index" :class="['item', item.class]" @click="onClick(item)">
           <p class="health-value" :style="{ color: calcColor(item.value) }">
             {{ item.value || "--" }}
           </p>
@@ -48,12 +43,13 @@
 <script>
 import axios from "axios";
 import { isNotNull } from "@/utils/index";
-import { PsyBaseUrl } from "@/config/models";
+import { PsyBaseUrl, anxietyText } from "@/config/models";
 import APICore from "@/api/core";
 export default {
   name: "psychologicalMain",
   data() {
     return {
+
       healhtList: [
         /*  { value: 40, name: '抑郁指数', class: 'depression',result: '无抑郁倾向', time: '17:52', img: require('@/assets/img/regardless.png') },
            { value: 55, name: '压力指数', class: 'stress', result: '轻度压力', time: '17:52', img: require('@/assets/img/regardless.png') },
@@ -98,6 +94,10 @@ export default {
         this.uid = params.uid;
         this.routeDate = params.date;
         this.params = params;
+
+        if (params.appType) {
+          this.$store.commit("appType", params.appType);
+        }
         if (!params.accessToken) {
           let authToken = await this.getAuth();
           this.$store.commit("ssjlToken", authToken);
@@ -159,9 +159,9 @@ export default {
             // 抑郁指数
             {
               value: data.DepScore,
-              name: "抑郁指数",
+              name: `${anxietyText}指数`,
               class: "depression",
-              result: data.DepDesc,
+              result: this.$replaceAll(data.DepDesc, '抑郁', '焦虑'),
               time: data.DepMeasureUpdateTime
                 ? this.$dayjs(data.DepMeasureUpdateTime).format("HH:mm")
                 : "",
@@ -173,8 +173,8 @@ export default {
           ];
           this.$toast.success("数据加载完成");
         })
-        .catch(() => {})
-        .finally(() => {});
+        .catch(() => { })
+        .finally(() => { });
     },
     onClick(item) {
       this.params.name = item.class;
@@ -190,9 +190,8 @@ export default {
     },
     onNavBack() {
       if (this.isShowLeft) {
-        window.location.href = `${this.$route.query.fromUrl}/#/${
-          this.$route.query.fromMenu || "device"
-        }`;
+        window.location.href = `${this.$route.query.fromUrl}/#/${this.$route.query.fromMenu || "device"
+          }`;
       } else {
         this.$router.go(-1);
       }
@@ -203,9 +202,8 @@ export default {
       /* imgUrl = require(`@/assets/img/psychological/${name}_${level}.png`); */
       let numLevel = Number(level);
       console.log(`@/assets/img/psychological/${name}_${numLevel}.png`);
-      imgUrl = require(`@/assets/img/psychological/${name}_${
-        numLevel + 1
-      }.png`);
+      imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1
+        }.png`);
       /* switch(level) {
             case '0':
                 imgUrl = require(`@/assets/img/psychological/${name}_${numLevel + 1}.png`);
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 11d9b75..05c8dca 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="psychological-container">
-    <van-nav-bar
-      :title="emoName + '监测'"
-      :border="true"
-      :left-arrow="true"
-      @click-left="onNavBack"
-    >
+    <van-nav-bar :title="emoName + '监测'" :border="true" :left-arrow="true" @click-left="onNavBack">
       <template #left>
         <van-icon name="arrow-left" size="24" style="padding: 0" />
         <span>返回</span>
@@ -14,15 +9,10 @@
     <div class="tab-bar">
       <div class="date-tab-con">
         <div class="date-tab-list">
-          <div
-            :class="[
-              'date-tab-item',
-              { active: current === index, notClick: false },
-            ]"
-            @click="onTabClick(item.value, index)"
-            v-for="(item, index) in dateList"
-            :key="index"
-          >
+          <div :class="[
+      'date-tab-item',
+      { active: current === index, notClick: false },
+    ]" @click="onTabClick(item.value, index)" v-for="(item, index) in dateList" :key="index">
             <img :src="tabImgUrl" alt v-if="index == 3" />
             <span>{{ item.text }}</span>
             <img class="more" :src="selectDownImg" alt v-if="index == 3" />
@@ -34,15 +24,10 @@
     <div class="psy-tab-bar">
       <div class="psy-tab-con">
         <div class="psy-tab-list">
-          <div
-            :class="[
-              'psy-tab-item',
-              { active: psyCurrent === index, notClick: false },
-            ]"
-            @click="onPsyTabClick(item.name, index)"
-            v-for="(item, index) in psyList"
-            :key="index"
-          >
+          <div :class="[
+      'psy-tab-item',
+      { active: psyCurrent === index, notClick: false },
+    ]" @click="onPsyTabClick(item.name, index)" v-for="(item, index) in psyList" :key="index">
             <span>{{ item.text }}</span>
           </div>
         </div>
@@ -62,30 +47,13 @@
         </div>
         <!-- 日历 -->
 
-        <van-dialog
-          class="calenddar-dialog"
-          v-model="calendarDialogShow"
-          :show-confirm-button="false"
-          :show-cancle-button="false"
-          :close-on-click-overlay="true"
-          ref="calenddarDialog"
-        >
+        <van-dialog class="calenddar-dialog" v-model="calendarDialogShow" :show-confirm-button="false"
+          :show-cancle-button="false" :close-on-click-overlay="true" ref="calenddarDialog">
           <template #default>
             <div class="calendar" ref="calendarCon">
-              <van-calendar
-                v-model="calendarShow"
-                :min-date="minDate"
-                :max-date="maxDate"
-                :default-date="defaultDate"
-                :round="false"
-                :poppable="false"
-                color="#62BD48"
-                :show-confirm="false"
-                :show-title="false"
-                :show-subtitle="false"
-                :formatter="formatter"
-                @select="onSelect"
-              />
+              <van-calendar v-model="calendarShow" :min-date="minDate" :max-date="maxDate" :default-date="defaultDate"
+                :round="false" :poppable="false" color="#62BD48" :show-confirm="false" :show-title="false"
+                :show-subtitle="false" :formatter="formatter" @select="onSelect" />
             </div>
           </template>
         </van-dialog>
@@ -104,27 +72,20 @@
 
           <div class="pie-chart-right">
             <div class="list">
-              <div
-                class="item"
-                v-for="(item, index) in pieRightList"
-                :key="index"
-              >
+              <div class="item" v-for="(item, index) in pieRightList" :key="index">
                 <div class="item-left">
-                  <div
-                    class="circle"
-                    :style="{ backgroundColor: item.color }"
-                  ></div>
+                  <div class="circle" :style="{ backgroundColor: item.color }"></div>
 
                   <span class="text">{{ item.text || "--" }}</span>
                 </div>
 
                 <div class="item-right">
                   <span :style="{ color: item.color }">{{
-                    item.count ? item.count + "次" : "0次"
-                  }}</span>
+      item.count ? item.count + "次" : "0次"
+    }}</span>
                   <label :style="{ color: item.color }">{{
-                    item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
-                  }}</label>
+      item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
+    }}</label>
                 </div>
               </div>
             </div>
@@ -135,19 +96,15 @@
 
         <div class="statistics">
           <div class="list">
-            <div
-              class="item"
-              v-for="(item, index) in statisticsList"
-              :key="index"
-            >
+            <div class="item" v-for="(item, index) in statisticsList" :key="index">
               <div class="top">
                 <span>{{ item.label || "--" }}</span>
               </div>
 
               <div class="middle">
                 <span :style="{ color: calcColor(item.value) }">{{
-                  item.value || "--"
-                }}</span>
+      item.value || "--"
+    }}</span>
               </div>
 
               <div class="bottom">
@@ -185,21 +142,18 @@
               <span class="title-reminder">结果解读</span>
 
               <p class="title-emo" :style="{ color: currentColor }">
-                {{ result }}
+                {{ this.$replaceAll(result, '抑郁', '焦虑') }}
               </p>
 
-              <span class="font-28"
-                ><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{
-                  advice
-                }}</span
-              >
+              <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{
+      advice
+    }}</span>
             </div>
 
             <div class="friendly-reminder" v-if="emoType === 2">
               <p :style="{ color: currentColor }">友情提示：</p>
-              <span
-                >如果您发现抑郁倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现抑郁倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span
-              >
+              <span>如果您发现{{ anxietyText }}倾向分值升高或处于轻度水平，不需要过度紧张，这可能是由正常的情绪波动或者生活习惯（睡眠时间、运动量等）的改变造成的。如果您发现{{ anxietyText
+                }}倾向分值连续7天及以上处于中度或重度水平，建议您寻求家人朋友或心理咨询师的帮助，及早进行干预。</span>
             </div>
 
             <div class="warm-reminder">
@@ -212,15 +166,11 @@
             <div class="title">
               <span class="title-text">{{ surveyTitle }}</span>
               <div class="mood-list" v-if="emotionList.length > 0">
-                <div
-                  class="item"
-                  v-for="(item, index) in emotionList"
-                  :key="index"
-                >
+                <div class="item" v-for="(item, index) in emotionList" :key="index">
                   <p>
                     <span :style="{ color: item.color }" class="day">{{
-                      item.days
-                    }}</span>
+      item.days
+    }}</span>
                     <span class="day-text">天</span>
                   </p>
 
@@ -244,12 +194,7 @@
     <div class="main report" v-show="current == 3">
       <div class="content">
         <div class="list" v-if="weekList.length > 0">
-          <div
-            class="item"
-            v-for="(item, index) in weekList"
-            :key="index"
-            @click="onClickItem(item.recordId)"
-          >
+          <div class="item" v-for="(item, index) in weekList" :key="index" @click="onClickItem(item.recordId)">
             <div class="left">
               <img :src="weekImg" alt />
               <div class="middle">
@@ -286,9 +231,12 @@
     <van-popup v-model="isPopup">
       <div class="popup">
         <div class="item science-tips first" v-if="emoType === 2">
-          <div class="tips"><h5>小科普</h5></div>
+          <div class="tips">
+            <h5>小科普</h5>
+          </div>
           <p>
-            抑郁症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。
+            {{ anxietyText }}症是一种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是{{ anxietyText
+            }}症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有{{ anxietyText }}的风险。
           </p>
         </div>
         <div class="item">
@@ -306,12 +254,13 @@
 </template>
 
 <script>
-import { EmotionModel, PsyBaseUrl } from "@/config/models";
+import { EmotionModel, PsyBaseUrl, anxietyText } from "@/config/models";
 import axios from "axios";
 export default {
   name: "psychological-monitor",
   data() {
     return {
+      anxietyText,
       // 日期选择标签
       dateList: [
         { name: "today", text: "今天", value: 0 },
@@ -323,7 +272,7 @@ export default {
       psyList: [
         { name: "tiredness", text: "疲劳", value: 0 },
         { name: "stress", text: "压力", value: 1 },
-        { name: "depression", text: "抑郁", value: 2 },
+        { name: "depression", text: anxietyText, value: 2 },
       ],
       // 当前情绪下标
       psyCurrent: 0,
@@ -728,13 +677,12 @@ export default {
       return `${today}${this.emoName}数据图`;
     },
     warmTips() {
-      return `正常连续佩戴腕表，每${
-        this.emoType == 2 ? "一" : "半"
-      }小时计算一个${this.emoName}分值。`;
+      return `正常连续佩戴腕表，每${this.emoType == 2 ? "一" : "半"
+        }小时计算一个${this.emoName}分值。`;
       /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
     },
     title1() {
-      return EmotionModel[this.params.name].title1;
+      return this.params.name ? EmotionModel[this.params.name].title1 : ''
     },
     article1() {
       return EmotionModel[this.params.name].article1;
@@ -802,7 +750,7 @@ export default {
         if (params.date) {
           this.dateList[0].text =
             this.$dayjs(params.date).format("YYYY-MM-DD") ===
-            this.$dayjs(new Date()).format("YYYY-MM-DD")
+              this.$dayjs(new Date()).format("YYYY-MM-DD")
               ? "今天"
               : this.$dayjs(params.date).format("MM-DD");
           this.defaultDate = new Date(
@@ -908,7 +856,7 @@ export default {
       let reqDate = date
         ? this.$dayjs(date).format("YYYY-MM-DD")
         : this.routeDate ||
-          this.$dayjs(this.defaultDate).format("YYYY-MM-DD"); /* "2023-05-23" */
+        this.$dayjs(this.defaultDate).format("YYYY-MM-DD"); /* "2023-05-23" */
       let reqParams = {
         uid: this.uid,
         startDate: startDate || reqDate,
@@ -1180,7 +1128,7 @@ export default {
             message: "登录过期，请重新进入",
           });
         })
-        .finally(() => {});
+        .finally(() => { });
     },
     // 计算百分比
     calcPercentage(value, total) {
@@ -1200,7 +1148,7 @@ export default {
       let text = this.emoName === "depression" ? "趋势" : "";
       let today =
         this.$dayjs(this.defaultDate).format("YYYY-MM-DD") ===
-        this.$dayjs(new Date()).format("YYYY-MM-DD")
+          this.$dayjs(new Date()).format("YYYY-MM-DD")
           ? "今天"
           : "";
       this.result = `无${this.emoName}倾向`;
@@ -1419,7 +1367,7 @@ export default {
       const selectDate = this.$dayjs(value).format("YYYY-MM-DD");
       this.dateList[0].text =
         this.$dayjs(value).format("YYYY-MM-DD") ===
-        this.$dayjs(new Date()).format("YYYY-MM-DD")
+          this.$dayjs(new Date()).format("YYYY-MM-DD")
           ? "今天"
           : this.$dayjs(value).format("MM-DD");
       this.calendarDialogShow = false;
@@ -1503,7 +1451,7 @@ export default {
                   .replace(/-/g, ".")
                   .replace(/~/g, "-"),
                 recordId: item.RecordId,
-                summary: item.Summary,
+                summary: this.$replaceAll(item.Summary, '抑郁', '焦虑'),
                 summaryLevel: item.SummaryLevel,
                 type: this.emoType,
               };
@@ -1535,41 +1483,52 @@ export default {
 .calenddar-dialog {
   overflow: scroll;
 }
+
 .calendar {
   overflow: scroll;
+
   .van-calendar {
     height: 350px;
+
     .van-calendar__header {
       display: none;
     }
+
     .van-calendar__days .van-calendar__day {
       width: 27px;
       height: 27px;
       margin: 5px;
       font-size: 12px;
+
       &.custom-calendar {
         width: 27px;
         height: 27px;
       }
+
       &.highlight-border {
         border: 1px solid #62bd48;
         width: 27px;
         height: 27px;
         border-radius: 50%;
+
         &.none {
           border: 1px solid #62bd48;
         }
+
         &.mild {
           border: 1px solid #ffde00;
         }
+
         &.moderate {
           border: 1px solid #ff8a00;
         }
+
         &.severe {
           border: 1px solid #d70d0d;
         }
       }
     }
+
     .van-calendar__selected-day {
       width: 27px;
       height: 27px;
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 49aa600..77f20ea 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -10,12 +10,7 @@
   <div class="report">
     <van-nav-bar title="心理监测周报" :border="true" @click-left="onNavBack">
       <template #left>
-        <van-icon
-          name="arrow-left"
-          size="24"
-          style="padding: 0"
-          v-show="params.isShowLeft"
-        />
+        <van-icon name="arrow-left" size="24" style="padding: 0" v-show="params.isShowLeft" />
         <span v-show="params.isShowLeft">返回</span>
       </template>
     </van-nav-bar>
@@ -26,18 +21,16 @@
           <p class="space-between">
             <span class="bold">本周总评</span>
             <span class="time">{{
-              resetDate(weekResult.StartDate, weekResult.EndDate) || "--"
-            }}</span>
+      resetDate(weekResult.StartDate, weekResult.EndDate) || "--"
+    }}</span>
           </p>
-          <p
-            class="bold-pro"
-            :style="{ color: calcResultColor(weekResult.SummaryLevel) || '--' }"
-          >
+          <p class="bold-pro" :style="{ color: calcResultColor(weekResult.SummaryLevel) || '--' }">
             {{ weekResult.Summary }}
           </p>
           <p class="normal">监测次数: {{ weekResult.Total || "--" }}次</p>
           <p class="normal">{{ weekResult.Explain || "--" }}</p>
         </div>
+
       </div>
       <div class="line"></div>
       <div class="pie-chart-top">
@@ -55,48 +48,35 @@
 
         <div class="pie-chart-right">
           <div class="list">
-            <div
-              class="item"
-              v-for="(item, index) in pieRightList"
-              :key="index"
-            >
+            <div class="item" v-for="(item, index) in pieRightList" :key="index">
               <div class="item-left">
-                <div
-                  class="circle"
-                  :style="{ backgroundColor: item.color }"
-                ></div>
+                <div class="circle" :style="{ backgroundColor: item.color }"></div>
                 <span class="text">{{ item.text || "--" }}</span>
               </div>
 
               <div class="item-right">
                 <span :style="{ color: item.color }">{{
-                  item.count ? item.count + "次" : "0次"
-                }}</span>
+      item.count ? item.count + "次" : "0次"
+    }}</span>
                 <label :style="{ color: item.color }">{{
-                  item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
-                }}</label>
+      item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
+    }}</label>
               </div>
 
               <div class="status">
-                <img
-                  :src="calcImg(item.percentage, item.lastPercentage)"
-                  alt=""
-                />
-                <span
-                  :style="{
-                    color:
-                      calcImg(item.percentage, item.lastPercentage, true) != 0
-                        ? item.color
-                        : '',
-                  }"
-                  >{{
-                    calcImg(item.percentage, item.lastPercentage, true)
-                      ? Math.abs(
-                          calcImg(item.percentage, item.lastPercentage, true)
-                        ) + "%"
-                      : "持平"
-                  }}</span
-                >
+                <img :src="calcImg(item.percentage, item.lastPercentage)" alt="" />
+                <span :style="{
+      color:
+        calcImg(item.percentage, item.lastPercentage, true) != 0
+          ? item.color
+          : '',
+    }">{{
+      calcImg(item.percentage, item.lastPercentage, true)
+        ? Math.abs(
+          calcImg(item.percentage, item.lastPercentage, true)
+        ) + "%"
+        : "持平"
+    }}</span>
               </div>
             </div>
           </div>
@@ -104,19 +84,15 @@
       </div>
       <div class="statistics">
         <div class="list">
-          <div
-            class="item"
-            v-for="(item, index) in statisticsList"
-            :key="index"
-          >
+          <div class="item" v-for="(item, index) in statisticsList" :key="index">
             <div class="top">
               <span>{{ item.label || "--" }}</span>
             </div>
 
             <div class="middle">
               <span :style="{ color: calcColor(item.value) }">{{
-                item.value || "--"
-              }}</span>
+      item.value || "--"
+    }}</span>
             </div>
 
             <div class="bottom">
@@ -144,20 +120,16 @@
           <div class="title">
             <span class="title-text">{{ surveyTitle }}</span>
             <div class="mood-list">
-              <div
-                class="item"
-                v-for="(item, index) in emotionList"
-                :key="index"
-              >
+              <div class="item" v-for="(item, index) in emotionList" :key="index">
                 <p>
                   <span :style="{ color: item.color }" class="day">{{
-                    item.days
-                  }}</span>
+      item.days
+    }}</span>
                   <span class="day-text">天</span>
                   <img :src="calcWeekImg(item.days, item.lastDay)" alt="" />
                   <span class="day-text status">{{
                     calcWeekImg(item.days, item.lastDay, true)
-                  }}</span>
+                    }}</span>
                 </p>
                 <p>{{ item.text }}</p>
               </div>
@@ -180,7 +152,7 @@
 </template>
 
 <script>
-import { EmotionModel, PsyBaseUrl } from "@/config/models";
+import { EmotionModel, PsyBaseUrl, anxietyText } from "@/config/models";
 import { isNotNull } from "@/utils/index";
 import axios from "axios";
 import APICore from "@/api/core";
@@ -188,6 +160,7 @@ export default {
   name: "",
   data() {
     return {
+      anxietyText,
       pieRightList: [
         /*  {
                     text: "无情绪倾向",
@@ -278,6 +251,7 @@ export default {
       weekResult: {},
       upImg: require("@/assets/img/psychological/up.png"),
       downImg: require("@/assets/img/psychological/down.png"),
+
     };
   },
   created() {
@@ -610,6 +584,9 @@ export default {
       let params = this.$route.query;
       if (params) {
         this.params = params;
+        if (params.appType) {
+          this.$store.commit("appType", params.appType);
+        }
         if (!params.accessToken) {
           let authToken = await this.getAuth();
           this.$store.commit("ssjlToken", authToken);
@@ -673,7 +650,7 @@ export default {
           title = "压力";
           break;
         case 2:
-          title = "抑郁";
+          title = anxietyText;
           break;
         case 3:
           title = "疲劳";
@@ -702,8 +679,8 @@ export default {
           const data = res.data.response;
           let chartData = data.ChartData
             ? JSON.parse(data.ChartData).filter((item) => {
-                return item.Key;
-              })
+              return item.Key;
+            })
             : [];
           if (data) {
             this.monitoringCount = data.Total;
@@ -711,6 +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.emoName = this.calcTitle(data.Type);
           }
           let None = {
diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue
index 56eddaf..f9be892 100644
--- a/src/views/psychological-modeling/index.vue
+++ b/src/views/psychological-modeling/index.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="page" v-if="isSHowPage">
-    <van-nav-bar
-      title=""
-      :border="true"
-      :left-arrow="true"
-      @click-left="onNavBack"
-      v-if="showLeftArrow"
-    >
+    <van-nav-bar title="" :border="true" :left-arrow="true" @click-left="onNavBack" v-if="showLeftArrow">
       <template #left>
         <van-icon name="arrow-left" size="23" style="padding: 0" />返回
       </template>
@@ -29,9 +23,7 @@
         <div class="title">
           <div class="text">情绪初始化评估</div>
           <div class="status success" v-if="info.initScaleState === 1">
-            <span class="icon"
-              ><i class="iconfont icon-caozuochenggong"></i
-            ></span>
+            <span class="icon"><i class="iconfont icon-caozuochenggong"></i></span>
             <span>已完成</span>
           </div>
           <div class="status" v-else>待完成</div>
@@ -40,14 +32,8 @@
           完成一次“情绪初始化评估”，有助于建立您的个人情绪模型。
         </div>
         <div class="step_button">
-          <van-button
-            round
-            type="info"
-            style="width: 100%; height: 100%"
-            v-if="info.initScaleState !== 1"
-            @click="toQuestion"
-            >去完成</van-button
-          >
+          <van-button round type="info" style="width: 100%; height: 100%" v-if="info.initScaleState !== 1"
+            @click="toQuestion">去完成</van-button>
         </div>
       </div>
 
@@ -57,29 +43,20 @@
         <div class="title">
           <div class="text">连续佩戴两小时</div>
           <div class="status success" v-if="info.progress === 1">
-            <span class="icon"
-              ><i class="iconfont icon-caozuochenggong"></i
-            ></span>
+            <span class="icon"><i class="iconfont icon-caozuochenggong"></i></span>
             <span>已完成</span>
           </div>
           <div class="status" v-else>{{ stateText }}</div>
         </div>
         <div class="schedule">
-          <van-progress
-            :percentage="info.progress * 100"
-            stroke-width="10px"
-            color="#638ee4"
-            :show-pivot="true"
-          ></van-progress>
+          <van-progress :percentage="info.progress * 100" stroke-width="10px" color="#638ee4"
+            :show-pivot="true"></van-progress>
         </div>
         <div class="sub_title">
           请连续佩戴不低于2小时,有助于为您输出更加精准的情绪分析指标。
         </div>
       </div>
-      <div
-        class="completed"
-        v-show="info.progress === 1 && info.initScaleState === 1"
-      >
+      <div class="completed" v-show="info.progress === 1 && info.initScaleState === 1">
         <van-button round type="info">建模已完成</van-button>
       </div>
     </div>
@@ -89,6 +66,7 @@
 <script>
 import axios from "axios";
 import APICore from "@/api/core";
+import { anxietyText } from "@/config/models";
 export default {
   name: "PsychologicalModeling",
   data() {
@@ -108,8 +86,8 @@ export default {
     },
     tips() {
       return this.info.isFirstModeling === 1
-        ? "首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算抑郁、压力、疲劳分值。"
-        : "由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算抑郁、压力、疲劳的分值。";
+        ? `首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算${anxietyText}、压力、疲劳分值。`
+        : `由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算${anxietyText}、压力、疲劳的分值。`;
     },
   },
   mounted() {
@@ -122,6 +100,9 @@ export default {
       this.uid = params.uid;
       // 缓存从随手精灵传过来的token
       this.$store.commit("ssjlToken", params.accessToken || "");
+      if (params.appType) {
+        this.$store.commit("appType", params.appType);
+      }
       // 缓存从随手精灵传过来的标识
       this.$store.commit("fromSsjl", params.fromSsjl);
       // 是否显示 返回标签
@@ -156,9 +137,8 @@ export default {
       let fromSsjl = this.$store.getters.fromSsjl === "true";
       if (fromSsjl) {
         let baseUrl = this.fromUrl;
-        window.location.href = `${baseUrl}/#/${
-          this.$route.query.fromMenu || "device"
-        }`;
+        window.location.href = `${baseUrl}/#/${this.$route.query.fromMenu || "device"
+          }`;
       } else {
         this.$router.go(-1);
       }
@@ -197,8 +177,7 @@ export default {
         ) {
           // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面
           this.$router.replace(
-            `/psychologicalMain?uid=${this.uid}&fromUrl=${
-              this.fromUrl || ""
+            `/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ""
             }&fromMenu=${this.showLeftArrow ? "device" : ""}`
           );
         }
@@ -261,7 +240,8 @@ export default {
 
 <style lang="scss" scoped>
 @font-face {
-  font-family: "iconfont"; /* Project id 2652084 */
+  font-family: "iconfont";
+  /* Project id 2652084 */
   src: url("data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAQoAAsAAAAACFQAAAPaAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDBgqEIIQDATYCJAMMCwgABCAFhGcHQRtqBxEVnBvJPhLjmMRz8aCJJho3wfN8ne+5817QmS/XTApqUAGT1kmpHaidloBWXGdzOaZE+Aj1S75l+ek70v5OL82zLE6hFEIiJEbx96dyFkjAnwUAJnXNTcUP1HiBAtaxhhUr2KsXyLuo1/rCrIx6BgFM6tACo12HbjZpk4bPmkIRGksqkFbKpPFjhxOWRnRLpRBGCEKXamQTATDWGo+AjeHn5RdRCYNBQGHt0mtM+1Hc+Zr+1VZ+0gf1Gl+CgIcbQABQQI2NmWVIu7MfKk7WQGHWKTUpDKIRjEkjySSEglIHt/zHM0CCWMoUTFVRGBclugwEvto8VnH9qyAIhIDrIApTOVMVOr2mNDQjKSPHeM4zz6ZrPrYDY3fjR7a4+xTrY15tvZVw5KkZtx/X+HznyRPHnvCeqZskVmTOjMmRnF1girdzz7F4ju3uiB/xc53CoFi1HdXMW9Vu1TonY+gTzqB98OucaHakkW3GjxWJhX9kQXymq/AjJ5sfbS5Hc9nm5+KfvW9ZiYfnRXbG8tzG6nK7+u265yW2Hv38lNG3PmqlJo7Hjv0enTXu0fJ0ouuAIf1WL94ysHiw9aA5vca2mth0ZPGOvtu99JioF7HtiBd95LA4E7Gj3qPSVmO6tC3erV1e54F9yvUsu3Bh2Z7l+lwiLGETNtvRp9ylmtsGlm7eieOF8GLvn+zifT/067/LLFd8TdeujrureHTFyFEf+hbPVft+SK96RrBXE7tqx8rt21XpUO2QwwZswmZvsZsOz8+pN3TsrzXZ143c71m5NwLL+4xyo30jdTbxttGdTvRcMG4rPzrU0SFdrfTjHqXWlOrxuHR1FdK1219m/7yFvU52Hh3x6th9I25U9b0QTS1XvFyq35thACTvqtuqZZiOq5kq9v9/w/jtj8cOTW/2P2xpAN5vbXsP+5NxDcwN4RfjFPjbqkFApFYhULpOcFsQQLEkk4cBmLYJfm81QBZvh6uzweUghMlOwSBEcVCEKYdpqhoEsIhCkDDNwaQ67VdbZPsIzBFdDKjEC4GQwRsM0rgKigw+mKa+ECCPHwTJ4A8mrqy2s6gkZs2oBC3oB9SGBudoJJR7QD92iqtiF+RY4wjkSVbM7HFAHmNGvPpCxIFj6mHHT8OuIwhMDRpJKpFQpqmre0liqJ+sYRCFgFgAzQOgxkAMOB8t+e87gHhGOhQMxC52JlKeyAdyEjIAtlcOoLYb6R254ikQBEdHORiiB9gpO9LZSQII9YMaEIOQUA2IB0pSgnJQZbK8un+5XYCJtaUSQ5Ro0kcqeo5kKhy8J7dhKXWs6skEAAA=");
 }
 
@@ -289,6 +269,7 @@ export default {
   text-align: left;
   background: #f4f4f4;
   padding-bottom: 30vw;
+
   .tip {
     display: flex;
     font-size: 3.3vw;
@@ -309,18 +290,22 @@ export default {
       border-radius: 50%;
       background: #fff5f1;
     }
+
     .info {
       width: calc(100% - 50px);
       line-height: 20px;
       text-align: left;
+
       .titie {
         color: #ff865a;
       }
+
       .content {
         color: gray;
       }
     }
   }
+
   .step {
     margin-top: 3vw;
     padding: 4vw 8vw;
@@ -344,6 +329,7 @@ export default {
         margin-right: 1vw;
       }
     }
+
     .title {
       display: flex;
       justify-content: space-between;
@@ -352,6 +338,7 @@ export default {
       .status {
         color: #ff865a;
       }
+
       .success {
         color: #638ee4;
 
@@ -361,25 +348,30 @@ export default {
         }
       }
     }
+
     .sub_title {
       padding: 3vw 0;
       color: gray;
     }
+
     .step_button {
       height: 14vw;
       width: 60vw;
       margin: auto;
+
       .van-button--info {
         background-color: #638ee4;
         border: 1px solid #638ee4;
       }
     }
   }
+
   .completed {
     position: relative;
     margin-top: 3vw;
     height: 400px;
     @include center();
+
     .van-button--info {
       height: 8vh;
       width: 75vw;
@@ -387,6 +379,7 @@ export default {
       border: 1px solid #638ee4;
     }
   }
+
   .button {
     position: fixed;
     left: 0;

From 2cf29f7aa01b38a6d15c81d5ed078df153b31298 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 21 Mar 2024 11:29:36 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E5=8A=A0=E8=BD=BD=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/health/psychological-main/index.vue | 2 +-
 src/views/health/psychological/index.vue      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 560670e..3364ade 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -159,7 +159,7 @@ export default {
             // 抑郁指数
             {
               value: data.DepScore,
-              name: `${anxietyText}指数`,
+              name: this.$replaceAll(`抑郁指数`, '抑郁', '焦虑'),
               class: "depression",
               result: this.$replaceAll(data.DepDesc, '抑郁', '焦虑'),
               time: data.DepMeasureUpdateTime
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 05c8dca..01886fa 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -685,13 +685,13 @@ export default {
       return this.params.name ? EmotionModel[this.params.name].title1 : ''
     },
     article1() {
-      return EmotionModel[this.params.name].article1;
+      return this.params.name ? EmotionModel[this.params.name].article1 : ''
     },
     title2() {
-      return EmotionModel[this.params.name].title2;
+      return this.params.name ? EmotionModel[this.params.name].title2 : ''
     },
     article2() {
-      return EmotionModel[this.params.name].article2;
+      return this.params.name ? EmotionModel[this.params.name].article2 : ''
     },
     // 当前情绪颜色
     currentColor() {

From f7cd11e34554df8abd7796a87b5a4ad6c14bf0d8 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 21 Mar 2024 14:12:05 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/health/psychological-main/index.vue   | 2 +-
 src/views/health/psychological/index.vue        | 9 ++++++---
 src/views/health/psychological/report/index.vue | 3 +--
 src/views/psychological-modeling/index.vue      | 5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 3364ade..2229cd4 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -43,7 +43,7 @@
 <script>
 import axios from "axios";
 import { isNotNull } from "@/utils/index";
-import { PsyBaseUrl, anxietyText } from "@/config/models";
+import { PsyBaseUrl, } from "@/config/models";
 import APICore from "@/api/core";
 export default {
   name: "psychologicalMain",
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 01886fa..65ac5ab 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -254,13 +254,12 @@
 </template>
 
 <script>
-import { EmotionModel, PsyBaseUrl, anxietyText } from "@/config/models";
+import { EmotionModel, PsyBaseUrl, } from "@/config/models";
 import axios from "axios";
 export default {
   name: "psychological-monitor",
   data() {
     return {
-      anxietyText,
       // 日期选择标签
       dateList: [
         { name: "today", text: "今天", value: 0 },
@@ -272,7 +271,7 @@ export default {
       psyList: [
         { name: "tiredness", text: "疲劳", value: 0 },
         { name: "stress", text: "压力", value: 1 },
-        { name: "depression", text: anxietyText, value: 2 },
+        { name: "depression", text: this.$replaceAll('抑郁', '抑郁', '焦虑'), value: 2 },
       ],
       // 当前情绪下标
       psyCurrent: 0,
@@ -389,6 +388,10 @@ export default {
     };
   },
   computed: {
+    anxietyText() {
+      const appTypeList = ['1'];
+      return appTypeList.indexOf(this.$store.getters.appType) > -1 ? `焦虑` : `抑郁`
+    },
     // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
     defaultOptions() {
       return {
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index 77f20ea..b851f4c 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -152,7 +152,7 @@
 </template>
 
 <script>
-import { EmotionModel, PsyBaseUrl, anxietyText } from "@/config/models";
+import { anxietyText } from "@/config/models";
 import { isNotNull } from "@/utils/index";
 import axios from "axios";
 import APICore from "@/api/core";
@@ -160,7 +160,6 @@ export default {
   name: "",
   data() {
     return {
-      anxietyText,
       pieRightList: [
         /*  {
                     text: "无情绪倾向",
diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue
index f9be892..8c81d75 100644
--- a/src/views/psychological-modeling/index.vue
+++ b/src/views/psychological-modeling/index.vue
@@ -66,7 +66,6 @@
 <script>
 import axios from "axios";
 import APICore from "@/api/core";
-import { anxietyText } from "@/config/models";
 export default {
   name: "PsychologicalModeling",
   data() {
@@ -86,8 +85,8 @@ export default {
     },
     tips() {
       return this.info.isFirstModeling === 1
-        ? `首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算${anxietyText}、压力、疲劳分值。`
-        : `由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算${anxietyText}、压力、疲劳的分值。`;
+        ? `首次佩戴,需完成以下2步,建立情绪模型。完成初始化建模后,将为您计算${this.$replaceAll('抑郁', '抑郁', '焦虑')}、压力、疲劳分值。`
+        : `由于您长时间未佩戴手表，需重新建模，请连续佩戴不低于2小时，佩戴完成后，将为您计算${this.$replaceAll('抑郁', '抑郁', '焦虑')}、压力、疲劳的分值。`;
     },
   },
   mounted() {

From 48dc30fe7d5e6ec15f9531751f241a7f4fae7685 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Thu, 21 Mar 2024 15:59:37 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/models.js                          | 19 ++++++++-----------
 src/views/health/psychological/index.vue      | 10 +++++-----
 .../health/psychological/report/index.vue     |  3 +--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/config/models.js b/src/config/models.js
index dd2765b..4bde4dd 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,8 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-import store from '@/store'
-export const VERSION_MODEL = '1.0.115F'; //版本号
+export const VERSION_MODEL = '1.0.117F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
@@ -26,19 +25,17 @@ export const BaiduStatisticsModel = {
     development: "https://hm.baidu.com/hm.js?edb76b471e997167b7782c1513382771", // 随手精灵百度流量统计 测试环境
 };
 
-const appTypeList = ['1'];
-// 焦虑文字
-export const anxietyText = appTypeList.indexOf(store.getters.appType) >-1  ? `焦虑`: `抑郁`
+// 抑郁文字
 export const EmotionModel = {
     // 抑郁
     depression: {
-        name: anxietyText,
+        name: '抑郁',
         type: 2,
-        title1: `${anxietyText}倾向`,
-        article1: `<p>设备所检测的是个体的${anxietyText}倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为${anxietyText}症的患者的相应特征进行对比，判断出个体的${anxietyText}倾向（即${anxietyText}症的可能性）程度。${anxietyText}倾向持续的时间越长、程度越严重，代表患有${anxietyText}症的风险就越大。</p>`,
-        title2: `${anxietyText}倾向算法原理`,
-        article2: `<p>1．研究发现，${anxietyText}症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
-        <p>2．${anxietyText}症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
+        title1: `抑郁倾向`,
+        article1: `<p>设备所检测的是个体的抑郁倾向。通过将个人的生理特征（脉搏波、心率变异性等）和行为习惯（运动、作息等）与临床诊断为抑郁症的患者的相应特征进行对比，判断出个体的抑郁倾向（即抑郁症的可能性）程度。抑郁倾向持续的时间越长、程度越严重，代表患有抑郁症的风险就越大。</p>`,
+        title2: `抑郁倾向算法原理`,
+        article2: `<p>1．研究发现，抑郁症等情绪障碍可能会引起个体外周生理系统反应的钝化，因此患者可能在面临危险、压力等应激状态下表现出较低的生理反应唤醒水平。这一点能够通过皮肤电、心率变异性等生理特征的周期性变化来判断。</p>
+        <p>2．抑郁症等情绪障碍的患者会出现明显的失眠、运动少、和生物钟紊乱，算法能够有效分析判断出这些异常的行为特征。</p>`
 
     },
     // 压力
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index 65ac5ab..a10a7bb 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -685,16 +685,16 @@ export default {
       /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
     },
     title1() {
-      return this.params.name ? EmotionModel[this.params.name].title1 : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title1, '抑郁', '焦虑') : ''
     },
     article1() {
-      return this.params.name ? EmotionModel[this.params.name].article1 : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].article1, '抑郁', '焦虑') : ''
     },
     title2() {
-      return this.params.name ? EmotionModel[this.params.name].title2 : ''
+      return this.params.name ? this.$replaceAll(EmotionModel[this.params.name].title2, '抑郁', '焦虑') : ''
     },
     article2() {
-      return this.params.name ? 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 = 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;
diff --git a/src/views/health/psychological/report/index.vue b/src/views/health/psychological/report/index.vue
index b851f4c..c908261 100644
--- a/src/views/health/psychological/report/index.vue
+++ b/src/views/health/psychological/report/index.vue
@@ -152,7 +152,6 @@
 </template>
 
 <script>
-import { anxietyText } from "@/config/models";
 import { isNotNull } from "@/utils/index";
 import axios from "axios";
 import APICore from "@/api/core";
@@ -649,7 +648,7 @@ export default {
           title = "压力";
           break;
         case 2:
-          title = anxietyText;
+          title = this.$replaceAll('抑郁', '抑郁', '焦虑')
           break;
         case 3:
           title = "疲劳";