From 4abe4a49ea0b6bb8652a1b42d3428cdcf2fcbedc Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Tue, 30 Jan 2024 16:50:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BB=8A=E6=97=A5?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9B=B8=E5=85=B3=E5=AF=B9=E6=8E=A5=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/health-user.js                    |   60 +-
 src/api/psychological.js                  |   26 +-
 src/assets/today/images/2_39.png          |  Bin 0 -> 7010 bytes
 src/assets/today/images/2_62.png          |  Bin 0 -> 7074 bytes
 src/components/DateSwitch.vue             |   23 +-
 src/components/SubmenuList.vue            |    8 +-
 src/components/TopNavBar.vue              |   36 +-
 src/config/appId.js                       |    2 +-
 src/config/models.js                      |   37 +-
 src/config/request.js                     |    8 +-
 src/router/index.js                       |    8 +-
 src/store/index.js                        |   11 +-
 src/views/development/index.vue           |   10 +-
 src/views/insight/index.vue               |  646 +++++++-
 src/views/insight/monthReport.vue         |   12 +-
 src/views/login/login.vue                 |    6 +-
 src/views/myself/index.vue                |   44 +-
 src/views/today/emotionDetails.vue        |  308 ++--
 src/views/today/index.vue                 | 1010 +++++++++---
 src/views/today/scss/emotion-details.scss |  321 +++-
 src/views/today/scss/index.scss           | 1037 +++++++-----
 src/views/today/signsDetails.vue          | 1731 +++++++++++++--------
 22 files changed, 3948 insertions(+), 1396 deletions(-)
 create mode 100644 src/assets/today/images/2_39.png
 create mode 100644 src/assets/today/images/2_62.png

diff --git a/src/api/health-user.js b/src/api/health-user.js
index a7fda79..4e5dd7f 100644
--- a/src/api/health-user.js
+++ b/src/api/health-user.js
@@ -1,6 +1,13 @@
 import request from '@/config/request';
 export const APIHealthUser = {
-  addPerson //添加人员
+  addPerson, //添加人员
+  personList, //人员列表
+  personInfo, //详情人员信息
+  updatePerson, //修改人员信息
+  deletePerson, // 删除人员信息
+  getHomeData, //今日体征感知
+  getHisData, //体征历史数据
+  getCalendar //体征历史数据日历
 };
 export default APIHealthUser;
 function addPerson(params) {
@@ -10,3 +17,54 @@ function addPerson(params) {
     data: params
   });
 }
+function personList(data) {
+  return request({
+    url: `/api/HealthyUser/PersonList`,
+    method: 'get',
+    params: data
+  });
+}
+function personInfo(data) {
+  return request({
+    url: `/api/HealthyUser/PersonInfo`,
+    method: 'get',
+    params: data
+  });
+}
+function updatePerson(params) {
+  return request({
+    url: `/api/HealthyUser/UpdatePerson`,
+    method: 'post',
+    data: params
+  });
+}
+function deletePerson(data) {
+  return request({
+    url: `/api/HealthyUser/DeletePerson`,
+    method: 'post',
+    params: data
+  });
+}
+
+function getHomeData(data) {
+  return request({
+    url: `/api/HealthyData/GetHomeData`,
+    method: 'post',
+    params: data
+  });
+}
+
+function getHisData(params) {
+  return request({
+    url: `/api/HealthyData/GetHisData`,
+    method: 'post',
+    data: params
+  });
+}
+function getCalendar(data) {
+  return request({
+    url: `/api/HealthyData/GetCalendar`,
+    method: 'post',
+    params: data
+  });
+}
diff --git a/src/api/psychological.js b/src/api/psychological.js
index 8256153..8ab9d9c 100644
--- a/src/api/psychological.js
+++ b/src/api/psychological.js
@@ -11,7 +11,10 @@ service.interceptors.request.use(request => {
   return request;
 });
 export const APIPsy = {
-  getHomeData
+  getHomeData,
+  getCalendarData,
+  getProgress,
+  getComprehensiveEvaluation //当天三大指标综合总评
 };
 export default APIPsy;
 function getHomeData(data) {
@@ -21,3 +24,24 @@ function getHomeData(data) {
     params: data
   });
 }
+function getCalendarData(data) {
+  return service({
+    url: `/api/Data/GetCalendarData`,
+    method: 'get',
+    params: data
+  });
+}
+function getProgress(data) {
+  return service({
+    url: `/api/Question/Progress`,
+    method: 'get',
+    params: data
+  });
+}
+function getComprehensiveEvaluation(data) {
+  return service({
+    url: `/api/Data/GetComprehensiveEvaluation`,
+    method: 'get',
+    params: data
+  });
+}
diff --git a/src/assets/today/images/2_39.png b/src/assets/today/images/2_39.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a58b5346a6f235f4df339bd5cb7e4b01024bb7
GIT binary patch
literal 7010
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
Z|ASJ!7PXk=e-9ffV||nVYIGf<{s%sDc=7-M

literal 0
HcmV?d00001

diff --git a/src/assets/today/images/2_62.png b/src/assets/today/images/2_62.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d71293b7efe99619a88c5517142eb9ae82915a
GIT binary patch
literal 7074
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

literal 0
HcmV?d00001

diff --git a/src/components/DateSwitch.vue b/src/components/DateSwitch.vue
index 8d4ea11..dbc7925 100644
--- a/src/components/DateSwitch.vue
+++ b/src/components/DateSwitch.vue
@@ -34,7 +34,8 @@ export default {
       // 当前月份，从 0（一月）开始
       currentMonth: new Date().getMonth(),
       // 当前年份
-      currentYear: new Date().getFullYear()
+      currentYear: new Date().getFullYear(),
+      weekObj: {}
     };
   },
   watch: {
@@ -70,12 +71,13 @@ export default {
           break;
         case 'week':
           this.checkDate(dateType, this.$own.getNowFormatDate(this.count));
+          this.$emit('updateDate', this.weekObj);
           break;
         case 'month':
           this.date = this.checkDate(dateType, this.date);
+          this.$emit('updateDate', this.formatDate(this.date));
           break;
       }
-      this.$emit('updateDate', this.formatDate(this.date));
     },
     onPrevious() {},
     onNext() {},
@@ -182,18 +184,30 @@ export default {
       this.setDate(this.addDate(this.currentFirstDate, -7));
       this.date = this.timeStamp[0] + '~' + this.timeStamp[6];
       this.weekDate = this.timeStamp[0];
+      this.weekObj = {
+        start: this.timeStamp[0],
+        end: this.timeStamp[6]
+      };
     },
     // 下一周
     nextWeek() {
       this.setDate(this.addDate(this.currentFirstDate, 7));
       this.date = this.timeStamp[0] + '~' + this.timeStamp[6];
       this.weekDate = this.timeStamp[0];
+      this.weekObj = {
+        start: this.timeStamp[0],
+        end: this.timeStamp[6]
+      };
     },
     // 这周
     currentWeek(date) {
       this.setDate(this.addDate(new Date(), -1));
       this.date = this.timeStamp[0] + '~' + this.timeStamp[6];
       this.weekDate = new Date(date).Format('yyyy-MM-dd');
+      this.weekObj = {
+        start: this.timeStamp[0],
+        end: this.timeStamp[6]
+      };
     },
     // 上一月
     preMonth() {
@@ -274,12 +288,13 @@ export default {
         if (this.dateType === 'week') {
           // 如果是周报，则不用返回
           this.checkDate(this.dateType, this.$own.getNowFormatDate(this.count), 'add');
+          this.$emit('updateDate', this.weekObj);
         } else {
           this.nextMonth();
+          this.$emit('updateDate', this.formatDate(this.date));
           /* this.date = this.checkDate(this.dateType, this.$own.getNowFormatDate(this.count)); */
         }
         this.isPreClick = true;
-        this.$emit('updateDate', this.formatDate(this.date));
       } else {
         // 上一个
         if (this.clickFlag && this.isPreClick) {
@@ -287,7 +302,7 @@ export default {
           if (this.dateType === 'week') {
             // 如果是周报，则不用返回
             this.checkDate(this.dateType, this.$own.getNowFormatDate(this.count), 'pre');
-            this.$emit('updateDate', this.formatDate(this.date));
+            this.$emit('updateDate', this.weekObj);
           } else if (this.dateType === 'month') {
             this.preMonth();
             if (this.count <= -12) {
diff --git a/src/components/SubmenuList.vue b/src/components/SubmenuList.vue
index bd35044..491a82a 100644
--- a/src/components/SubmenuList.vue
+++ b/src/components/SubmenuList.vue
@@ -11,7 +11,7 @@
       <div class="list">
         <div class="item" v-for="(item, index) in list" :key="index" @click="onItemClick(item)">
           <div class="img-icon-con" :style="{ borderRadius: rounded ? '50%' : '', backgroundColor: '#fff' }">
-            <img :src="item.imgPath" alt="" />
+            <img :src="item.imgPath" alt="" :style="{ borderRadius: rounded ? '50%' : '', backgroundColor: '#fff' }" />
           </div>
           <div class="text">
             <span>{{ item.text }}</span>
@@ -107,13 +107,13 @@ export default {
               break;
           }
         }
-      } else {
+      } /* else {
         this.$dialog.confirm({
           title: '提示',
           message: `功能开发中`,
           showCancelButton: false
         });
-      }
+      } */
     },
     onClick(model) {
       let val = null;
@@ -180,7 +180,7 @@ export default {
       padding-left: 20px;
       display: grid;
       grid-template-columns: repeat(4, auto);
-      grid-gap: 20px;
+      grid-gap: 50px;
       .item {
         position: relative;
         /* height: 140px; */
diff --git a/src/components/TopNavBar.vue b/src/components/TopNavBar.vue
index 69a8f0d..36ae2f7 100644
--- a/src/components/TopNavBar.vue
+++ b/src/components/TopNavBar.vue
@@ -1,9 +1,15 @@
 <!--  -->
 <template>
   <div class="nav-bar">
-    <van-nav-bar :title="title" :fixed="true" z-index="998" @click-left="onClickLeft" @click-right="onClickRight">
+    <van-nav-bar
+      :title="currentPerson ? currentPerson.nickName || '' + 'LV' + currentPerson.level || '' : ''"
+      :fixed="true"
+      z-index="998"
+      @click-left="onClickLeft"
+      @click-right="onClickRight"
+    >
       <template #left>
-        <van-icon :name="LeftIcon" size="36" />
+        <img class="left-img" :src="currentPerson ? currentPerson.avatar : LeftIcon" alt="" />
       </template>
       <template #right>
         <van-icon :name="RightIcon" dot size="28" />
@@ -15,6 +21,7 @@
 <script>
 import LeftIcon from '@/assets/icons/1_75.png';
 import RightIcon from '@/assets/icons/1_30.png';
+import APIHealthUser from '@/api/health-user';
 export default {
   components: {},
   name: 'NavBar',
@@ -27,17 +34,33 @@ export default {
   data() {
     return {
       LeftIcon,
-      RightIcon
+      RightIcon,
+      currentPerson: {}
     };
   },
   created() {},
-  mounted() {},
+  mounted() {
+    this.getPersonInfo();
+  },
   methods: {
     onClickLeft(value) {
       this.$emit('on-click-left', value);
     },
     onClickRight(value) {
       this.$emit('on-click-right', value);
+    },
+    // 根据用户id获取用户信息
+    getPersonInfo() {
+      let reqParams = {
+        personId: this.$store.getters.personId
+      };
+      APIHealthUser.personInfo(reqParams).then(res => {
+        const data = res.data.data;
+        if (data) {
+          this.currentPerson = { ...data };
+          console.log('this.currentPerson', this.currentPerson);
+        }
+      });
     }
   }
 };
@@ -50,6 +73,11 @@ export default {
   height: 100px;
   width: 100%;
 }
+.left-img {
+  height: 70px;
+  width: 70px;
+  border-radius: 50%;
+}
 
 /* @import url(); 引入css类 */
 </style>
diff --git a/src/config/appId.js b/src/config/appId.js
index 3543f08..d2829fb 100644
--- a/src/config/appId.js
+++ b/src/config/appId.js
@@ -1,3 +1,3 @@
 // 微信公众号AppId
-const AppId = process.env.NODE_ENV === 'production' ? 'wx23f697736154110b' : 'wx5e26f0813859e5f6';
+const AppId = process.env.NODE_ENV === 'production' ? 'wx96730d5b434f80d9' : 'wxab7b8b9509e1d137';
 export default AppId;
diff --git a/src/config/models.js b/src/config/models.js
index 7daa88b..28bf482 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -125,7 +125,42 @@ export const EmotionModel = {
     article2: `<p>设备的疲劳值是生理疲劳和心理疲劳的综合值，主要通过个体日常生活中的心率，心率变异性的变化及运动体力的变化情况来进行科学计算而来。</p>`
   }
 };
-
+// 体征模型
+export const Signsmodel = {
+  // 体温
+  temperature: {
+    name: '体温',
+    type: 1,
+    unit: '℃',
+    progressTextList: [
+      /*  { color: "#2ea7e0", text: "偏低", state: "low" }, */
+      { color: '#189b3b', text: '正常', state: 'normal' },
+      { color: '#ff5f8b', text: '偏高', state: 'hight' }
+    ]
+  },
+  // 心率
+  heartrate: {
+    name: '心率',
+    type: 0,
+    unit: 'bmp',
+    progressTextList: [
+      { color: '#2ea7e0', text: '偏低', state: 'low' },
+      { color: '#189b3b', text: '正常', state: 'normal' },
+      { color: '#ff5f8b', text: '偏高', state: 'hight' }
+    ]
+  },
+  // 步数,少于3000偏少，3000~10000正常，10000以上偏高
+  step: {
+    name: '步数',
+    type: 2,
+    unit: '步',
+    progressTextList: [
+      { color: '#2ea7e0', text: '偏低', state: 'low' },
+      { color: '#189b3b', text: '正常', state: 'normal' },
+      { color: '#ff5f8b', text: '偏高', state: 'hight' }
+    ]
+  }
+};
 //心理健康相关接口地址
 export const PsyBaseUrl =
   process.env.NODE_ENV === 'production' ? 'https://dbmq.rzliot.com/auth_heart' : 'https://dbmq.rzliot.com/heart';
diff --git a/src/config/request.js b/src/config/request.js
index 066c1f2..3177ca4 100644
--- a/src/config/request.js
+++ b/src/config/request.js
@@ -8,6 +8,7 @@
  */
 import axios from 'axios';
 import router from '@/router';
+import store from '@/store';
 import { baseApi } from '@/config';
 import prefix from '@/store/prefix';
 const httpProxyPrefix = baseApi;
@@ -80,15 +81,18 @@ service.interceptors.request.use(request => {
     return request;
   }
   // 全局请求统一增加一个 sourcetype: 1的参数跟区分新旧接口
+  // 全局请求统一增加一个 sourcetype: 1的参 数跟区分新旧接口
   if (request.method == 'get') {
     request.params = {
       ...request.params,
-      sourcetype: 1
+      sourcetype: 1,
+      personId: Number(store.getters.personId) || 26
     };
   } else if (request.method == 'post') {
     request.data = {
       ...request.data,
-      sourcetype: 1
+      sourcetype: 1,
+      personId: Number(store.getters.personId) || 26
     };
   }
 
diff --git a/src/router/index.js b/src/router/index.js
index 86bbe14..2c64fd4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import Router from 'vue-router';
-import store from '@/store/index';
-import prefix from '@/store/prefix';
+/* import store from '@/store/index';
+import prefix from '@/store/prefix'; */
 import { constantRouterMap } from './router.config.js';
 
 // hack router push callback
@@ -29,7 +29,7 @@ export function resetRouter() {
   router.matcher = newRouter.matcher; // reset router
 }
 // TODO 增加路由拦截
-router.beforeEach((to, from, next) => {
+/* router.beforeEach((to, from, next) => {
   store.commit('fromRuoter', from.name);
   if (to.path == '/login') {
     next();
@@ -41,5 +41,5 @@ router.beforeEach((to, from, next) => {
       next();
     }
   }
-});
+}); */
 export default router;
diff --git a/src/store/index.js b/src/store/index.js
index 46e1453..2ff8f97 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -50,7 +50,8 @@ export default new Vuex.Store({
     fromRuoter: null,
     deviceVersion: '', //设备版本号
     ssjlToken: '', //b端接口token
-    tabClick: '' //心理监测点击tab
+    tabClick: '', //心理监测点击tab
+    personId: '' //设备列表的personId
   },
   mutations: {
     authToken(state, token) {
@@ -178,6 +179,10 @@ export default new Vuex.Store({
     tabClick(state, tabClick) {
       state.tabClick = tabClick;
       window.localStorage[prefix + 'tabClick'] = tabClick;
+    },
+    personId(state, personId) {
+      state.personId = personId;
+      window.localStorage[prefix + 'personId'] = personId;
     }
   },
   getters: {
@@ -321,6 +326,10 @@ export default new Vuex.Store({
     tabClick: state => {
       if (state.tabClick != '') return state.tabClick;
       return window.localStorage[prefix + 'tabClick'] == null ? '' : window.localStorage[prefix + 'tabClick'];
+    },
+    personId: state => {
+      if (state.personId != '') return state.personId;
+      return window.localStorage[prefix + 'personId'] == null ? '' : window.localStorage[prefix + 'personId'];
     }
   },
   actions: {},
diff --git a/src/views/development/index.vue b/src/views/development/index.vue
index 7d14bb1..d98ba5c 100644
--- a/src/views/development/index.vue
+++ b/src/views/development/index.vue
@@ -112,7 +112,15 @@ export default {
       levels: []
     };
   },
-  created() {},
+  created() {
+    // 写死一个用户Id
+    this.$store.commit(
+      'authToken',
+      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJVc2VySW5mbyI6eyJJZCI6NCwiU291cmNlVHlwZSI6MSwiVXNlcklkIjoiNWE2OThlOTQtOGM0MS00ZWM1LWJiM2MtNGFiYWIyZjM3Y2QxIiwiTG9naW5OYW1lIjoiMTg2NjQyNzI3NDMiLCJMb2dpblR5cGUiOjF9LCJFeHAiOjE3MTQ0NjAxNDY5NTkuMH0.KV1AQ1fDcbds9QvqxyMe3gRzEN83eMJKd9YF_jPnY8w'
+    );
+    this.$store.commit('userId', '5a698e94-8c41-4ec5-bb3c-4abab2f37cd1');
+    this.$store.commit('personId', 26);
+  },
   mounted() {
     this.initData();
   },
diff --git a/src/views/insight/index.vue b/src/views/insight/index.vue
index bd84124..66e72a9 100644
--- a/src/views/insight/index.vue
+++ b/src/views/insight/index.vue
@@ -25,31 +25,32 @@
       <div
         class="periodItem minPeriodItem"
         :class="{ active: emotionActive == index }"
-        v-for="(item, index) in emotionList"
+        v-for="(item, index) in psyList"
         :key="index"
-        @click="onEmotionClick(index)"
+        @click="onEmotionClick(item, index)"
       >
         <span>{{ item.name }}</span>
       </div>
     </div>
-    <div class="ChatBox">
-      <div class="legendBox">
-        <div class="legend">
-          <div class="legendItem" :class="item.type" v-for="(item, index) in degreeList" :key="index">
-            <span>{{ item.name }}{{ emotionList[emotionActive].name }}倾向</span>
-            <span class="number">{{ 8 }}次({{ 1 }}%)</span>
-          </div>
-        </div>
+    <div class="echart-container">
+      <div class="echart">
+        <EchartBox
+          echartId="emotionChart"
+          :outTitle="emoLegend.outTitle"
+          height="200"
+          width="200"
+          :legend="emoLegend"
+          :options="defaultOptions"
+        ></EchartBox>
       </div>
-      <div class="Chat emotionChat" id="emotionChart"></div>
     </div>
     <div class="grid">
-      <div class="gridItem" :style="`background:${item.color};`" v-for="(item, index) in degreeList" :key="index">
+      <div class="gridItem" :style="`background:${item.color};`" v-for="(item, index) in emotionList" :key="index">
         <div class="time">
-          <span class="number">5</span>
+          <span class="number">{{ item.days }}</span>
           <span>天</span>
         </div>
-        <div class="title">{{ item.name }}{{ emotionList[emotionActive].name }}倾向</div>
+        <div class="title">{{ item.text }}</div>
       </div>
     </div>
     <div class="label">
@@ -153,9 +154,14 @@
 <script>
 import DateSwitch from '@/components/DateSwitch.vue';
 import { format, startOfMonth, endOfMonth } from 'date-fns';
+import ToastService from '@/services/toast-service';
+import { /* EmotionModel, */ PsyBaseUrl } from '@/config/models';
+import axios from 'axios';
+import EchartBox from '@/components/EchartBox';
 export default {
   components: {
-    DateSwitch
+    DateSwitch,
+    EchartBox
   },
   data() {
     return {
@@ -166,15 +172,18 @@ export default {
       signChart: null,
       stepChart: null,
       calorieChart: null,
-      emotionList: [
+      psyList: [
         {
-          name: '疲劳'
+          name: '疲劳',
+          type: 3
         },
         {
-          name: '压力'
+          name: '压力',
+          type: 1
         },
         {
-          name: '焦虑'
+          name: '抑郁',
+          type: 2
         }
       ],
       degreeList: [
@@ -251,33 +260,56 @@ export default {
       upImg: require('@/assets/today/icons/up.png'),
       downImg: require('@/assets/today/icons/down.png'),
       date: '',
-      monthDate: {}
+      monthDate: {},
+      dateList: [],
+      emotionData: [],
+      xAxisData: [], //图表x轴展示的数据
+      echarts: null,
+      signCurrent: 0,
+      emoName: '',
+      result: '',
+      // 需要高亮的日期数组
+      highlightDates: [],
+      // 日历 默认最小可选择日期，默认为当前时间
+      maxDate: new Date(this.$dayjs().hour(0).minute(0).second(0).format()),
+      // 默认日历日期时间
+      defaultDate: new Date(this.$dayjs().hour(0).minute(0).second(0).format()),
+      uid: '2024010809384143241',
+      // 7天和30天最大数据列表
+      weekAndMonData: [],
+      weekList: [],
+      startDate: '', //接口需要的开始时间
+      endDate: '', //接口需要的结束时间
+      currentEmoName: '', //当前情绪名称
+      emotionList: [],
+      weekAndMonthSeries: null,
+      emoType: '1'
     };
   },
-  created() {},
+  created() {
+    this.emoName = this.psyList[this.emotionActive].name;
+    this.initEchartText();
+    /* this.getPsychologiclData('', '2023-11-21', '2023-12-21'); */
+  },
   mounted() {
     this.initData();
   },
   watch: {
-    active(val) {
+    /*  active(val) {
       console.log(val);
-      this.$nextTick(() => {
-        this.initData();
-        this.initEmotionChart();
-        this.initSignChart();
-      });
-    },
+      let currentDate = new Date();
+    }, */
     emotionActive(val) {
       console.log(val);
-      this.$nextTick(() => {
+      /* this.$nextTick(() => {
         this.initEmotionChart();
-      });
+      }); */
     },
     signActive(val) {
       console.log(val);
-      this.$nextTick(() => {
+      /*  this.$nextTick(() => {
         this.initSignChart();
-      });
+      }); */
     }
   },
   computed: {
@@ -311,18 +343,540 @@ export default {
         }
       }
       return list;
+    },
+    defaultOptions() {
+      return {
+        time: {
+          useUTC: false
+        },
+        grid: {
+          show: true,
+          borderWidth: 0,
+          top: '3%',
+          left: '1%',
+          right: '3%',
+          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: 20,
+            bottom: 4,
+            handleStyle: {
+              borderWidth: 1,
+              borderCap: 'square'
+            }
+          }
+        ],
+        tooltip: {
+          trigger: 'axis',
+          textStyle: {
+            fontSize: 14,
+            align: 'center'
+          },
+          formatter: function (params) {
+            return params[0].marker + params[0].name + '</br>' + params[0].value;
+          }
+        },
+        yAxis: {
+          type: 'value',
+          max: 100,
+          min: 0,
+          interval: 20,
+          splitNumber: 1,
+          boundaryGap: ['5%', '5%'],
+          nameTextStyle: {
+            fontSize: 13
+          },
+          alignTicks: false,
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            fontSize: 13
+          },
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: '#ddd',
+              width: 1
+            }
+          }
+        },
+        series: [
+          {
+            name: `无${this.emoName}倾向`,
+            type: 'line',
+            padding: 5,
+            smooth: true,
+            data: this.emotionData,
+            symbol: 'circle',
+            symbolSize: 10,
+            itemStyle: {
+              color: '#fff',
+              borderWidth: 2
+            },
+            lineStyle: {
+              width: 6,
+              type: 'solid',
+              color: '#189b3b'
+            }
+          },
+          {
+            name: `轻度${this.emoName}倾向`,
+            type: 'line',
+            data: ''
+          },
+          {
+            name: `中度${this.emoName}倾向`,
+            type: 'line',
+            data: ''
+          },
+          {
+            name: `重度${this.emoName}倾向`,
+            type: 'line',
+            data: ''
+          }
+        ]
+      };
+    },
+    emoLegend() {
+      return {
+        title: '',
+        outTitle: `${this.emoName}数据图`,
+        list: [
+          { name: `无${this.emoName}倾向`, color: '#179b3b' },
+          { name: `轻度${this.emoName}倾向`, color: '#8dc21f' },
+          { name: `中度${this.emoName}倾向`, color: '#2ea7e0' },
+          { name: `重度${this.emoName}倾向`, color: '#ff5f8b' }
+        ]
+      };
     }
   },
   methods: {
+    initEchartText() {
+      this.result = `无${this.emoName}倾向`;
+      this.defaultSeries = [
+        {
+          name: ``,
+          type: 'line',
+          padding: 5,
+          data: this.emotionData,
+          symbol: 'circle',
+          symbolSize: 12, // 拐点圆的大小
+          areaStyle: {}
+        },
+        {
+          name: `轻度${this.emoName}倾向`,
+          type: 'line',
+          padding: 10,
+          data: '',
+          symbol: 'circle',
+          symbolSize: 12 // 拐点圆的大小
+        },
+        {
+          name: `中度${this.emoName}倾向`,
+          type: 'line',
+          data: ''
+        },
+        {
+          name: `重度${this.emoName}倾向`,
+          type: 'line',
+          data: ''
+        }
+      ];
+    },
+    // 获取情绪数据
+    getPsychologiclData(date, startDate, endDate) {
+      ToastService.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: '#179b3b'
+            };
+            let Mild = {
+              count: data.Mild,
+              percentage: this.calcPercentage(data.Mild, data.Count),
+              text: `轻度${this.emoName}倾向`,
+              color: '#8dc21f'
+            };
+            let Moderate = {
+              count: data.Moderate,
+              percentage: this.calcPercentage(data.Moderate, data.Count),
+              text: `中度${this.emoName}倾向`,
+              color: '#2ea7e0'
+            };
+            let Severe = {
+              count: data.Severe,
+              percentage: this.calcPercentage(data.Severe, data.Count),
+              text: `重度${this.emoName}倾向`,
+              color: '#ff5f8b'
+            };
+            // 饼状图右边数据
+            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')
+                : '',
+              bgColor: '#ff5f8b'
+            };
+            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')
+                : '',
+              bgColor: '#189b3b'
+            };
+            /* 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')
+                : '',
+              bgColor: '#2ea7e0'
+            };
+            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: '#179b3b'
+            };
+            let MildDay = {
+              days: data.MildDay,
+              text: `轻度${this.emoName}倾向`,
+              color: '#8dc21f'
+            };
+            let ModerateDay = {
+              days: data.ModerateDay,
+              text: `中度${this.emoName}倾向`,
+              color: '#2ea7e0'
+            };
+            let SevereDay = {
+              days: data.SevereDay,
+              text: `重度${this.emoName}倾向`,
+              color: '#ff5f8b'
+            };
+            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: {
+                  borderColor: 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 that = this;
+              // 7天和30天变成柱状图
+              this.weekAndMonthSeries = [
+                {
+                  name: '平均值',
+                  type: 'scatter',
+                  symbolSize: 14,
+                  data: this.emotionData
+                },
+                {
+                  name: '',
+                  type: 'custom',
+                  data: this.weekAndMonData,
+                  renderItem: function (params, api) {
+                    let categoryIndex = api.value(0);
+                    let end = api.coord([categoryIndex, api.value(1)]);
+                    let start = api.coord([categoryIndex, api.value(2)]);
+                    let width = 16;
+                    let rectShape = that.$echarts.graphic.clipRectByRect(
+                      {
+                        x: start[0] - width / 2,
+                        y: start[1],
+                        width: 16,
+                        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: 12,
+                  data: ''
+                },
+                {
+                  name: `中度${this.emoName}倾向`,
+                  type: 'scatter',
+                  symbolSize: 12,
+                  data: ''
+                },
+                {
+                  name: `重度${this.emoName}倾向`,
+                  type: 'scatter',
+                  symbolSize: 12,
+                  data: ''
+                },
+                {
+                  name: `无${this.emoName}倾向`,
+                  type: 'scatter',
+                  symbolSize: 12,
+                  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;
+            ToastService.success({
+              message: '数据加载完成'
+            });
+          }
+        })
+        .catch(error => {
+          console.log(error);
+        })
+        .finally(() => {
+          ToastService.clear();
+        });
+    },
+    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;
+    },
     updateDate(value) {
       console.log('组件原始值', value);
-      this.date = this.active == 0 ? value.replace('~', '-') : value;
+      this.date = value;
+      console.log('this.date', this.date);
       if (this.active == 1) {
         this.getMonthStaEnd(this.date);
+        this.getPsychologiclData('', this.monthDate.start, this.monthDate.end);
+      } else {
+        this.getPsychologiclData('', value.start, value.end);
       }
-
       console.log('接口所需要的值', this.date, '如果是月', this.monthDate);
     },
+    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 + '';
+    },
+    // 计算结果采用哪种颜色
+    calcResultColor(value, isCallBackClass) {
+      let color = '';
+      let className = '';
+      switch (Number(value)) {
+        case 0:
+          color = '#179b3b';
+          className = 'none';
+          break;
+        case 1:
+          color = '#8dc21f';
+          className = 'mild';
+          break;
+        case 2:
+          color = '#2ea7e0';
+          className = 'moderate';
+          break;
+        case 3:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+      }
+      return isCallBackClass ? className : 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);
+    },
     getMonthStaEnd(value) {
       const dateObj = {};
       const start = startOfMonth(value);
@@ -333,9 +887,9 @@ export default {
     },
     initData() {
       //初始化图表
-      if (!this.emotionChart) {
+      /* if (!this.emotionChart) {
         this.emotionChart = this.$echarts.init(document.getElementById('emotionChart'));
-      }
+      } */
       if (!this.signChart) {
         this.signChart = this.$echarts.init(document.getElementById('signChart'));
       }
@@ -345,9 +899,8 @@ export default {
       if (!this.calorieChart) {
         this.calorieChart = this.$echarts.init(document.getElementById('calorieChart'));
       }
-
       //渲染图表
-      this.initEmotionChart();
+      /* this.initEmotionChart(); */
       this.initSignChart();
     },
     initEmotionChart() {
@@ -808,8 +1361,16 @@ export default {
 
       return option;
     },
-    onEmotionClick(index) {
+    onEmotionClick(item, index) {
       this.emotionActive = index;
+      this.emoName = item.name;
+      this.emoType = item.type;
+      if (this.active == 1) {
+        this.getMonthStaEnd(this.date);
+        this.getPsychologiclData('', this.monthDate.start, this.monthDate.end);
+      } else {
+        this.getPsychologiclData('', this.date.start, this.date.end);
+      }
       // 情绪选项变化重新渲染图表
     },
     onSignClick(index) {
@@ -904,6 +1465,13 @@ export default {
       font-size: 30px;
     }
   }
+  .echart-container {
+    flex: 1;
+    position: relative;
+    min-height: 600px;
+    background-color: #fff;
+    padding: 0 20px;
+  }
   .ChatBox {
     overflow: hidden;
     width: calc(100vw - 60px);
diff --git a/src/views/insight/monthReport.vue b/src/views/insight/monthReport.vue
index fd120ce..da59364 100644
--- a/src/views/insight/monthReport.vue
+++ b/src/views/insight/monthReport.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="pageContent monthReport">
     <NavBar title="月报" @on-click-left="onNavBack" right-text="历史"> </NavBar>
-    <div class="periodSwitch">
+    <!-- <div class="periodSwitch">
       <div class="arrow arrowLeft">
         <van-icon name="arrow-left"></van-icon>
       </div>
@@ -10,7 +10,7 @@
       <div class="arrow arrowRight">
         <van-icon name="arrow"></van-icon>
       </div>
-    </div>
+    </div> -->
 
     <div class="periodNav">
       <div
@@ -30,12 +30,12 @@
           <span>检测次数：15次</span>
         </div>
       </div>
-      <div class="label history">
+      <!-- <div class="label history">
         <div class="left"></div>
         <div class="right">
           <span>历史监测</span>
         </div>
-      </div>
+      </div> -->
       <div class="pie-chart-con">
         <div class="pie-chart-left">
           <div id="pieChart" ref="pieChart"></div>
@@ -960,7 +960,7 @@ export default {
 <style scoped lang="scss">
 @import './include.scss';
 .monthReport {
-  padding-top: 50px;
+  padding-top: 100px;
 
   .periodNav {
     display: flex;
@@ -1069,7 +1069,7 @@ export default {
     width: 100%;
     justify-content: space-between;
     align-items: center;
-    padding: 40px 0px;
+    /* padding: 50px 0px; */
     padding-bottom: 30px;
 
     .timearea {
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 6323b85..6f6e27e 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -166,7 +166,7 @@ export default {
     onWxAutoLogin() {
       let reqBody = {
         appId: AppId,
-        openId: /* this.$store.getters.openId || */ 'odcaWxCyeDHFpa3xpnQukqIcWvg0'
+        openId: /* this.$store.getters.openId || */ 'o7Z9t0zyOyZxojWy0VwsLNChddzs'
       };
       APIUser.wxAutoLogin(reqBody)
         .then(res => {
@@ -176,7 +176,7 @@ export default {
               this.$store.commit('authToken', item.authToken);
               this.$store.commit('userId', item.userId);
               this.$store.commit('code', '');
-              /* this.$store.commit('openId', item.wxOpenId || ''); */
+              this.$store.commit('openId', item.wxOpenId || '');
               NotifyService.notify({ message: '登录成功！正在为您跳转...', type: 'success' });
               this.$store.commit('isLogin', 'true');
               setTimeout(() => {
@@ -203,7 +203,7 @@ export default {
       let reqBody = {
         loginName: /* this.phone */ '18664272743',
         password: /* this.password */ '123456',
-        loginCode: /* this.$store.getters.openId */ 'odcaWxCyeDHFpa3xpnQukqIcWvg0',
+        loginCode: /* this.$store.getters.openId */ 'ofTDa6FWgxD-HKoeYtJcrr_9StlE',
         appId: AppId
       };
       APIUser.wxLogin(reqBody)
diff --git a/src/views/myself/index.vue b/src/views/myself/index.vue
index 2fddde2..d9ded88 100644
--- a/src/views/myself/index.vue
+++ b/src/views/myself/index.vue
@@ -6,15 +6,15 @@
       <div class="banner">
         <div class="top">
           <div class="avatar">
-            <img src="../../assets/myself/4_62.png" alt="" />
+            <img :src="userInfos.imagePath" alt="" />
           </div>
           <div class="nick-name">
             <span>{{ userInfos.username }}</span>
           </div>
         </div>
-        <div class="bottom">
+        <!-- <div class="bottom">
           <span>已绑定{{ userInfos.deviceNumber }}台设备</span>
-        </div>
+        </div> -->
       </div>
       <div class="submenu device-manage">
         <SubmenuList :title="device.title" :list="device.list" rounded>
@@ -63,12 +63,14 @@ import APIUser from '@/api/user';
 import APIDevice from '@/api/device';
 import ToastService from '@/services/toast-service';
 import { isNotNull } from '@/services/utils-service';
+import APIHealthUser from '@/api/health-user';
 export default {
   components: { /* NavBar,  */ SubmenuList },
   data() {
     return {
       userInfos: {},
       listData: [],
+      personList: [],
       family: {
         title: '亲情沟通',
         list: [
@@ -98,9 +100,9 @@ export default {
       device: {
         title: '孩子管理',
         list: [
-          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子1', bgColor: 'green' },
+          /* { imgPath: require('../../assets/myself/4_62.png'), text: '孩子1', bgColor: 'green' },
           { imgPath: require('../../assets/myself/4_62.png'), text: '孩子2', bgColor: 'green' },
-          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子3', bgColor: 'green' }
+          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子3', bgColor: 'green' } */
         ]
       },
       studyHelper: {
@@ -128,7 +130,7 @@ export default {
           },
           {
             imgPath: require('../../assets/myself/4_107.png'),
-            text: '支付密码修改',
+            text: '支付密码',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'changePayPassword'
@@ -222,6 +224,7 @@ export default {
   mounted() {
     this.getUserInfos();
     this.getDeviceList();
+    this.getPersonList();
   },
   methods: {
     getUserInfos() {
@@ -289,6 +292,35 @@ export default {
           ToastService.clear();
         });
     },
+    getPersonList() {
+      APIHealthUser.personList()
+        .then(res => {
+          console.log('人员列表', res);
+          const list = res.data.data;
+          if (list) {
+            // { imgPath: require('../../assets/myself/4_62.png'), text: '孩子1', bgColor: 'green' }
+            this.device.list = list.map(item => {
+              return {
+                imgPath: item.avatar,
+                text: item.nickName,
+                bgColor: 'green',
+                ...item
+              };
+            });
+            let personIdIndex = list.findIndex(item => {
+              return item.id == this.$store.getters.personId;
+            });
+            if (personIdIndex < 0) {
+              this.$store.commit('personId', list[0].id);
+            }
+          }
+          this.getPersonInfo();
+        })
+        .catch(() => {
+          this.showOverlay = false;
+          this.isPageShow = true;
+        });
+    },
     goMap() {
       this.$router.push({
         name: 'location'
diff --git a/src/views/today/emotionDetails.vue b/src/views/today/emotionDetails.vue
index 42c6c81..320b351 100644
--- a/src/views/today/emotionDetails.vue
+++ b/src/views/today/emotionDetails.vue
@@ -1,6 +1,34 @@
 <template>
   <div class="psychological-container">
-    <NavBar title="心理监测" @on-click-left="onNavBack" right-text="历史" @on-click-right="onHistory"> </NavBar>
+    <van-nav-bar
+      title="心理呵护"
+      @click-left="onNavBack"
+      right-text="历史"
+      @click-right="onHistory"
+      left-text="返回"
+      left-arrow
+    >
+    </van-nav-bar>
+    <!-- 建模进度 -->
+    <div class="modeling" v-if="isShowProgress">
+      <div class="modeling-main" @click="onNavModel">
+        <div class="top">
+          <div class="left">
+            <img class="img" src="@/assets/today/icons/2_25.png" />
+          </div>
+          <div class="right">
+            <p><span class="tips">提示：</span>建模中，请保持佩戴，进入查看</p>
+          </div>
+        </div>
+        <div class="bottom">
+          <span class="font-26">建模进度</span>
+          <div class="progress-bar">
+            <div class="progress" :style="{ width: progress * 100 + '%' }"></div>
+          </div>
+          <span class="progress-text">{{ progress * 100 }}%</span>
+        </div>
+      </div>
+    </div>
     <div class="tab-bar">
       <div class="date-tab-con">
         <div class="date-tab-list">
@@ -19,11 +47,14 @@
     </div>
 
     <div class="main" v-show="current !== 3">
-      <div class="tab-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 }]"
+              :class="[
+                'date-tab-item',
+                { active: current === index, notClick: false },
+              ]"
               @click="onTabClick(item.value, index)"
               v-for="(item, index) in dateList"
               :key="index"
@@ -34,15 +65,15 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
       <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> -->
+              <p @click="onHistory">历史监测</p>
+            </div> -->
         </div>
         <!-- 日历 -->
 
@@ -147,7 +178,7 @@
           </div>
         </div>
       </div>
-      <div class="line"></div>
+      <!-- <div class="line"></div> -->
       <!-- 底部 -->
       <div class="bottom">
         <div class="echart-container">
@@ -182,7 +213,9 @@
             <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
@@ -248,12 +281,14 @@
                 <div class="overall">
                   <div class="left">
                     <span>总评</span>
-                    <p :style="{ color: calcResultColor(item.summaryLevel) }">{{ item.summary }}</p>
+                    <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>-->
+                                      <p>( <span>无抑郁倾向</span><span>5%</span>，<span>轻度抑郁倾向</span> <span>5%</span> )</p>
+                                  </div>-->
               </div>
             </div>
 
@@ -274,7 +309,7 @@
         <div class="item science-tips first" v-if="emoType === 2">
           <div class="tips"><h5>小科普</h5></div>
           <p>
-            症是一抑郁种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。
+            抑郁症是一抑郁种心理疾病，严重时可发展为精神障碍。然而当我们体会到了痛苦、悲伤、和郁闷等负面情绪，并不意味着我们就是抑郁症。日常的短时的喜、怒、哀、乐，都是正常的情绪变化，然而长期的低落情绪、兴趣缺失等可能会让我们有抑郁的风险。
           </p>
         </div>
         <div class="item">
@@ -290,21 +325,23 @@
     </van-popup>
   </div>
 </template>
-
-<script>
+  
+  <script>
 import { EmotionModel, PsyBaseUrl } from '@/config/models';
 import EchartBox from '@/components/EchartBox';
-import NavBar from '@/components/NavBar';
 import axios from 'axios';
 import ToastService from '@/services/toast-service';
+import APIPsy from '@/api/psychological';
 export default {
   name: 'psychological-monitor',
   components: {
-    NavBar,
     EchartBox
   },
   data() {
     return {
+      // 进度条
+      progress: 0,
+      isShowProgress: false,
       // 日期选择标签
       dateList: [
         { name: 'today', text: '今天', value: 0 },
@@ -332,42 +369,42 @@ export default {
       //饼状图右边数据,TODO 根据接口数据和 模块 重新封装数组
       pieRightList: [
         /* {
-                    text: "无情绪倾向",
-                    count: 12,
-                    percentage: "80",
-                    color: "#179b3b"
-                },
-                {
-                    text: "轻度情绪倾向",
-                    count: 2,
-                    percentage: "80",
-                    color: "#8dc21f"
-                },
-                {
-                    text: "中度情绪倾向",
-                    count: 1,
-                    percentage: "80",
-                    color: "#2ea7e0"
-                },
-                {
-                    text: "重度情绪倾向",
-                    count: 1,
-                    percentage: "80",
-                    color: "#ff5f8b"
-                } */
+                      text: "无情绪倾向",
+                      count: 12,
+                      percentage: "80",
+                      color: "#179b3b"
+                  },
+                  {
+                      text: "轻度情绪倾向",
+                      count: 2,
+                      percentage: "80",
+                      color: "#8dc21f"
+                  },
+                  {
+                      text: "中度情绪倾向",
+                      count: 1,
+                      percentage: "80",
+                      color: "#2ea7e0"
+                  },
+                  {
+                      text: "重度情绪倾向",
+                      count: 1,
+                      percentage: "80",
+                      color: "#ff5f8b"
+                  } */
       ],
       // 情绪状态列表
       statisticsList: [
         /*  { label: "最大值", value: "75", time: "08:15" },
-                { label: "最小值", value: "40", time: "10:15" },
-                { label: "最近值", value: "50", time: "18:15" } */
+                  { label: "最小值", value: "40", time: "10:15" },
+                  { label: "最近值", value: "50", time: "18:15" } */
       ],
       // 周报-情绪计算
       emotionList: [
         /*  { days: "5", text: "无情绪倾向", color: "#179b3b" },
-                { days: "4", text: "轻度情绪倾向", color: "#8dc21f" },
-                { days: "3", text: "中度情绪倾向", color: "#2ea7e0" },
-                { days: "2", text: "重度情绪倾向", color: "#ACACAC" } */
+                  { days: "4", text: "轻度情绪倾向", color: "#8dc21f" },
+                  { days: "3", text: "中度情绪倾向", color: "#2ea7e0" },
+                  { days: "2", text: "重度情绪倾向", color: "#ACACAC" } */
       ],
       // 弹窗-日历是否显示
       calendarDialogShow: false,
@@ -455,10 +492,10 @@ export default {
         grid: {
           show: true,
           borderWidth: 0,
-          top: '3%',
-          left: '1%',
-          right: '3%',
-          bottom: '15%',
+          top: '10%',
+          left: '2%',
+          right: '6%',
+          bottom: '20%',
           containLabel: true
         },
         xAxis: {
@@ -476,7 +513,7 @@ export default {
             show: false,
             lineStyle: {
               color: '#ddd',
-              width: 2
+              width: 4
             }
           },
           nameLocation: 'center',
@@ -490,10 +527,10 @@ export default {
         },
         dataZoom: [
           /*  {
-                        type: "inside",
-                        start: 0,
-                        end: 100,
-                    }, */
+                          type: "inside",
+                          start: 0,
+                          end: 100,
+                      }, */
           {
             start: 0,
             end: 100,
@@ -503,9 +540,9 @@ export default {
             },
             show: true,
             height: 20,
-            bottom: 4,
+            bottom: 8,
             handleStyle: {
-              borderWidth: 1,
+              borderWidth: 4,
               borderCap: 'square'
             }
           }
@@ -513,7 +550,7 @@ export default {
         tooltip: {
           trigger: 'axis',
           textStyle: {
-            fontSize: 14,
+            fontSize: 16,
             align: 'center'
           },
           formatter: function (params) {
@@ -550,14 +587,14 @@ export default {
           {
             name: `无${this.emoName}倾向`,
             type: 'line',
-            padding: 5,
+            padding: 10,
             smooth: true,
             data: this.emotionData,
             symbol: 'circle',
             symbolSize: 10,
             itemStyle: {
               color: '#fff',
-              borderWidth: 2
+              borderWidth: 4
             },
             lineStyle: {
               width: 6,
@@ -592,7 +629,7 @@ export default {
         tooltip: {
           trigger: 'item',
           textStyle: {
-            fontSize: 14
+            fontSize: 16
           },
           position: 'right'
         },
@@ -608,9 +645,9 @@ export default {
             avoidLabelOverlap: false,
             startAngle: 270, // 设置逆时针渲染
             itemStyle: {
-              borderRadius: 5,
+              borderRadius: 10,
               borderColor: '#fff',
-              borderWidth: 2,
+              borderWidth: 4,
               fontSize: 16
             },
             label: {
@@ -666,16 +703,16 @@ export default {
       /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
     },
     title1() {
-      return EmotionModel[this.params.name].title1;
+      return EmotionModel[this.currentEmoName].title1;
     },
     article1() {
-      return EmotionModel[this.params.name].article1;
+      return EmotionModel[this.currentEmoName].article1;
     },
     title2() {
-      return EmotionModel[this.params.name].title2;
+      return EmotionModel[this.currentEmoName].title2;
     },
     article2() {
-      return EmotionModel[this.params.name].article2;
+      return EmotionModel[this.currentEmoName].article2;
     },
     // 当前情绪颜色
     currentColor() {
@@ -709,16 +746,51 @@ export default {
     this.initEchartText();
     this.getCalendarData();
     this.getPsychologiclData();
-    this.createList();
+    this.getProgress();
     //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); */
+    this.psyCurrent = this.calcPsyTabindex(EmotionModel[this.params.name].type);
   },
   methods: {
+    onNavModel() {
+      this.$router.push({
+        name: 'psychologicalModeling',
+        query: {
+          uid: this.uid
+        }
+      });
+    },
+    getProgress() {
+      let reqParams = {
+        uid: this.uid
+      };
+      APIPsy.getProgress(reqParams)
+        .then(res => {
+          const re = res.data;
+          if (re.success) {
+            if (re.response && re.response.state === -1) {
+              // 异常
+              this.isShowProgress = false;
+            } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1) {
+              // 已完成
+              this.isShowProgress = false;
+            } else {
+              // 未完成
+              this.isShowProgress = true;
+            }
+            this.progress = re.response.progress;
+          } else {
+            this.isShowProgress = false;
+          }
+        })
+        .catch(() => {
+          this.isShowProgress = false;
+        });
+    },
     createList() {
       // 模拟数据
       this.emotionDataNew = [];
@@ -813,11 +885,12 @@ export default {
             let data = res.data.response;
             // const mergedArr = [...new Set([...arr1, ...arr2, ...arr3])];
             /* let name = this.params.name.charAt(0).toUpperCase()+ this.params.name.slice(1); */
-            let currentName = this.params.name;
+            let currentName = this.emoType;
+            console.log('currentName', currentName);
             let list = [];
-            if (currentName === 'stress') {
+            if (currentName === 1) {
               list = data.Stress;
-            } else if (currentName === 'depression') {
+            } else if (currentName === 2) {
               list = data.Depression;
             } else {
               list = data.Tiredness;
@@ -913,7 +986,7 @@ export default {
                   ? this.$dayjs(data.MaxDesc).format('HH:mm')
                   : this.$dayjs(data.MaxDesc).format('MM/DD HH:mm')
                 : '',
-              bgColor: '#ff5f8b'
+              bgColor: this.calcResultColor(data.MaxLevel)
             };
             let Min = {
               label: '最小值',
@@ -923,17 +996,17 @@ export default {
                   ? this.$dayjs(data.MinDesc).format('HH:mm')
                   : this.$dayjs(data.MinDesc).format('MM/DD HH:mm')
                 : '',
-              bgColor: '#189b3b'
+              bgColor: this.calcResultColor(data.MinLevel)
             };
             /* 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')
-                : ''
-            }; */
+                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,
@@ -942,7 +1015,7 @@ export default {
                   ? this.$dayjs(data.CurrentDesc).format('HH:mm')
                   : this.$dayjs(data.CurrentDesc).format('MM/DD HH:mm')
                 : '',
-              bgColor: '#2ea7e0'
+              bgColor: this.calcResultColor(data.CurrentLevel)
             };
             this.statisticsList.push(Max);
             this.statisticsList.push(Min);
@@ -978,7 +1051,9 @@ export default {
               return {
                 value: item.Value,
                 itemStyle: {
-                  borderColor: this.calcResultColor(item.Level)
+                  color: this.calcResultColor(item.Level),
+                  borderColor: this.calcResultColor(item.Level),
+                  borderWidth: 3
                 }
               };
             });
@@ -1031,7 +1106,7 @@ export default {
                       }
                     );
                     if (rectShape) {
-                      rectShape.r = [10];
+                      rectShape.r = [20];
                     }
                     return (
                       rectShape && {
@@ -1077,6 +1152,9 @@ export default {
               // 点击提示此时为空
               this.defaultOptions.tooltip = {
                 trigger: 'axis',
+                textStyle: {
+                  fontSize: 16
+                },
                 formatter: function (params) {
                   return (
                     params[0].marker +
@@ -1130,7 +1208,7 @@ export default {
         {
           name: ``,
           type: 'line',
-          padding: 5,
+          padding: 10,
           data: this.emotionData,
           symbol: 'circle',
           symbolSize: 12, // 拐点圆的大小
@@ -1174,9 +1252,9 @@ export default {
       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) {
+        if (this.highlightDates[h].Date == formatDate) {
           day.className = `highlight-border ${this.calcResultColor(this.highlightDates[h].SummaryLevel, true)}`;
-        } else if (formatDate === currentDate) {
+        } else if (formatDate == currentDate) {
           day.text = '今天';
         }
       }
@@ -1192,12 +1270,12 @@ export default {
     onTabClick(value, index) {
       this.current = index;
       this.currentDays = value;
-      this.$store.commit('tabClick', index);
+      /* this.$store.commit("tabClick", index); */
       let currentDate = new Date();
       this.surveyTitle = value === 7 ? '7天概览' : '30天概览';
       if (value === 7) {
         let dateList = this.getPostDate(currentDate, 6, true);
-        this.getPsychologiclData('', dateList[0] /* '2023-11-15' */ /* dateList[1] */ /* '2023-11-21' */);
+        this.getPsychologiclData('', dateList[0] /* "2023-11-15" */, dateList[1] /* "2023-11-21" */);
         this.startDate = dateList[0] /* '2023-11-15' */;
         this.endDate = dateList[1] /* '2023-11-21' */;
       } else if (value === 0) {
@@ -1208,8 +1286,8 @@ export default {
         this.getPsychologiclData(
           this.selectDate ? this.selectDate : this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */
         );
-        this.startDate = this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
-        this.endDate = this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
+        this.startDate = this.selectDate || this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
+        this.endDate = this.selectDate || this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
       } else if (value === 30) {
         // 30天
         this.defaultOptions.xAxis.data = this.xAxisData;
@@ -1230,13 +1308,13 @@ export default {
       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);
+        this.getPsychologiclData(this.selectDate, this.startDate, this.endDate);
       }
+      this.getCalendarData();
     },
     getCurrentMonthStaAndEnd(currentDate) {
       let list = [];
@@ -1291,10 +1369,10 @@ export default {
     // 初始化折线图表
     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); */
+          this.echarts.dispose();
+        }
+        this.echarts = this.$echarts.init(this.$refs.charts);
+        this.echarts.setOption(this.defaultOptions); */
     },
     // 点击历史监测，打开日历
     onHistory() {
@@ -1309,6 +1387,9 @@ export default {
           : this.$dayjs(value).format('MM-DD');
       this.calendarDialogShow = false;
       this.selectDate = selectDate;
+      this.startDate = selectDate;
+      this.endDate = selectDate;
+      this.current = 0;
       this.getPsychologiclData(selectDate);
     },
     // 计算字体显示的颜色
@@ -1338,11 +1419,11 @@ export default {
           break;
         case 1:
           color = '#8dc21f';
-          className = 'mild';
+          className = 'mid';
           break;
         case 2:
           color = '#2ea7e0';
-          className = 'moderate';
+          className = 'severe';
           break;
         case 3:
           color = '#ff5f8b';
@@ -1404,22 +1485,23 @@ export default {
   }
 };
 </script>
-
+  
 <style lang="scss">
-.van-nav-bar .van-icon {
-  padding-left: 10px;
-}
-
-.calenddar-dialog {
-  overflow: scroll;
-}
 .calendar {
-  overflow: scroll;
+  height: 800px;
+
   .van-calendar {
-    height: 350px;
+    height: 400px;
+    overflow: scroll;
+
     .van-calendar__header {
       display: none;
     }
+    .van-calendar__days {
+      display: grid;
+      grid-template-columns: repeat(7, 1fr);
+    }
+
     .van-calendar__days .van-calendar__day {
       width: 27px;
       height: 27px;
@@ -1428,26 +1510,33 @@ export default {
       &.custom-calendar {
         width: 27px;
         height: 27px;
+        margin-left: 0 !important;
       }
+
       &.highlight-border {
         border: 1px solid #62bd48;
         width: 27px;
         height: 27px;
         border-radius: 50%;
+
         &.none {
           border: 1px solid #62bd48;
         }
+
         &.mild {
           border: 1px solid #8dc21f;
         }
+
         &.moderate {
           border: 1px solid #2ea7e0;
         }
+
         &.severe {
           border: 1px solid #ff5f8b;
         }
       }
     }
+
     .van-calendar__selected-day {
       width: 27px;
       height: 27px;
@@ -1457,6 +1546,7 @@ export default {
   }
 }
 </style>
-<style scoped lang="scss">
+  <style scoped lang="scss">
 @import './scss/emotion-details.scss';
 </style>
+  
\ No newline at end of file
diff --git a/src/views/today/index.vue b/src/views/today/index.vue
index 20e6c44..8c9056b 100644
--- a/src/views/today/index.vue
+++ b/src/views/today/index.vue
@@ -1,255 +1,448 @@
 <!-- 今日 -->
 <template>
   <div class="today">
-    <!-- 今日状态 -->
-    <div class="today-status">
-      <img class="img" src="@/assets/today/images/2_03.png" />
-      <img class="icon" src="@/assets/today/icons/2_12.png" @click="show = true" />
-      <div class="status">
-        <p>状态优秀</p>
-        <ul>
-          <li class="toobad"></li>
-          <li class="ordinary"></li>
-          <li class="sameas"></li>
-          <li class="excellent active"></li>
-        </ul>
+    <div class="devicesSwitch" v-if="false">
+      <!-- <i :class="[{on: isClear},'news']" @click="newsClick" v-show="true"></i> -->
+      <div
+        :class="[
+          'imgArea',
+          {
+            cut: currentPerson.deviceStatus ? currentPerson.deviceStatus.online != 0 : false
+          }
+        ]"
+        @click="imgAreaClick"
+        v-show="personList !== null && personList.length"
+      >
+        <img :src="currentPerson.avatar" />
+        <span style="font-weight: bolder" v-show="currentPerson && currentPerson.nickName">{{
+          currentPerson.nickName
+        }}</span>
+        <span>切换</span>
       </div>
-      <div class="interpret">
-        <p>
-          工作学习要有度，适当摸鱼也很好，不用太卷哟！保持张弛 有度的节奏，是应对压力的有效方法。
-          综合今日的HRV(MSSD)和静息心率情况看，你今天整体状 态优秀，身体压力状态较小，能很好应对今日工作生活中的
-          挑战，请继续保持优秀状态。 相信自己，你一定可以实现你的目标！
-        </p>
-        <hr />
-        <div class="bottom">
-          <p>详细解读</p>
-          <div @click="onScroll">
-            <span>日记</span>
-            <img src="@/assets/today/icons/2_22.png" />
+      <!-- 点击宝贝切换出现 -->
+      <div :class="[{ active: conAreaShow }, 'conArea']" v-if="personList !== null">
+        <div
+          class="list"
+          v-for="(item, index) in personList"
+          :key="`list_index_${index}`"
+          @click="imageListClick(item, index)"
+        >
+          <div
+            :class="[
+              { active: item.id == $store.getters.personId },
+              'imgA',
+              {
+                online: {
+                  online: item.deviceStatus ? item.deviceStatus.online && item.deviceStatus.online == 1 : 'false'
+                }
+              }
+            ]"
+          >
+            <img :src="item.avatar" />
+          </div>
+          <div :class="['Myname', { active: item.id == $store.getters.personId }]">
+            {{ item.nickName }}
           </div>
         </div>
       </div>
     </div>
-    <!-- 今日情绪感知 -->
-    <div class="emotion">
-      <div class="title" @click="onRouterTo('emotionDetails')">
-        <p>今日情绪感知</p>
-        <div>
-          <p>{{ now }}</p>
-          <van-icon name="arrow" size="18" />
+    <div v-show="isPageShow" class="today-con" @click="conAreaShow = false">
+      <!-- 未绑定有设备时或者未添加有用户时 -->
+      <!-- <div class="no-data" v-show="currentPerson.deviceId == null">
+        <img :src="noDataImg" alt="" />
+        <p>暂无设备信息</p>
+      </div> -->
+      <!-- 今日状态 -->
+      <div
+        @click="conAreaShow = false"
+        :style="{
+          paddingBottom: isShowBind ? '40px' : 0
+        }"
+      >
+        <div class="today-status">
+          <img class="img" :src="calcTodayStatus(todayLevel, 'img')" />
+          <!-- <img
+            class="icon"
+            src="@/assets/today/icons/2_12.png"
+            @click="calendarDialogShow = true"
+          /> -->
+          <div class="status">
+            <p>状态{{ calcTodayStatus(todayLevel, 'text') }}</p>
+            <ul>
+              <li
+                v-for="(item, index) in statusList"
+                :key="index"
+                :class="[item.className, { active: item.active }]"
+              ></li>
+              <!-- <li :class="['toobad', { active: false }]"></li>
+              <li :class="['ordinary', { active: todayStatus }]"></li>
+              <li :class="['sameas', { active: false }]"></li>
+              <li :class="['excellent', { active: false }]"></li> -->
+            </ul>
+          </div>
+          <div class="interpret">
+            <div class="no-text" v-if="todayResult.Level === -1">
+              <img :src="noDataImg" alt="" />
+              <p>暂无信息</p>
+            </div>
+            <div v-else>
+              <!-- 工作学习要有度，适当摸鱼也很好，不用太卷哟！保持张弛
+              有度的节奏，是应对压力的有效方法。
+              综合今日的HRV(MSSD)和静息心率情况看，你今天整体状
+              态优秀，身体压力状态较小，能很好应对今日工作生活中的
+              挑战，请继续保持优秀状态。 相信自己，你一定可以实现你的目标！ -->
+
+              <p>{{ todayResult.Describe || '' }}</p>
+              <p>{{ todayResult.TirDesc || '' }}</p>
+              <P>{{ todayResult.StressDesc || '' }}</P>
+              <P>{{ todayResult.DepDesc || '' }}</P>
+              <P>{{ todayResult.EncouragingLanguage || '' }}</P>
+            </div>
+            <!-- <hr /> -->
+            <!-- <div class="bottom">
+              <p>详细解读</p>
+              <div @click="onScroll">
+                <span>日记</span>
+                <img src="@/assets/today/icons/2_22.png" />
+              </div>
+            </div> -->
+          </div>
         </div>
-      </div>
-      <ul>
-        <!-- <li>
-          <h4>40</h4>
-          <p>疲劳倾向</p>
-          <span>无疲劳倾向</span>
-          <time>12:30</time>
-        </li>
-        <li>
-          <h4>55</h4>
-          <p>压力倾向</p>
-          <span>无压力倾向</span>
-          <time>12:30</time>
-        </li>
-        <li>
-          <h4>75</h4>
-          <p>焦虑倾向</p>
-          <span>无焦虑倾向</span>
-          <time>12:30</time>
-        </li> -->
-        <li v-for="(item, index) in psyDataList" :key="index">
-          <h4>{{ item.value || '--' }}</h4>
-          <p>{{ item.name || '--' }}</p>
-          <span>{{ item.result || '--' }}</span>
-          <time>{{ item.time || '--' }}</time>
-        </li>
-      </ul>
-    </div>
-    <!-- 今体征感知 -->
-    <div class="perception">
-      <div class="title" @click="onRouterTo('signsDetails')">
-        <p>今体征感知</p>
-        <div>
-          <p>{{ now }}</p>
-          <van-icon name="arrow" size="18" />
+        <!-- 今日情绪感知 -->
+        <div class="emotion">
+          <div class="title" @click="onRouterTo('emotionDetails', 'tiredness')">
+            <p>今日情绪感知</p>
+            <div>
+              <p>{{ now }}</p>
+              <van-icon name="arrow" size="18" />
+            </div>
+          </div>
+          <ul>
+            <li
+              v-for="(item, index) in psyDataList.length > 0 ? psyDataList : 3"
+              :key="index"
+              :style="{ backgroundColor: item.bgColor }"
+              @click="onRouterTo('emotionDetails', item.class)"
+            >
+              <h4>{{ item.value || '--' }}</h4>
+              <p>{{ item.name || '--' }}</p>
+              <span>{{ item.result || '暂无数据' }}</span>
+              <time>{{ item.time || '--' }}</time>
+            </li>
+          </ul>
         </div>
-      </div>
-      <ul>
-        <li>
-          <h4>36.8</h4>
-          <p>体温</p>
-          <time>12:30</time>
-        </li>
-        <li>
-          <h4>92</h4>
-          <p>心率</p>
-          <time>12:30</time>
-        </li>
-        <li>
-          <h4>6000</h4>
-          <p>步数</p>
-          <time>12:30</time>
-        </li>
-      </ul>
-      <div class="tip">
-        <img class="img" src="@/assets/today/icons/2_25.png" />
-        <p>
-          <span>温馨提示：</span
-          >检测数据仅供参考，<span>不可做医疗诊断和治疗依据</span>，在运动、工作等场景会影响健康检测。
-        </p>
-      </div>
-    </div>
-    <!-- 步数 -->
-    <div class="step" v-if="false">
-      <div class="main">
-        <ul>
-          <li>
-            <p class="specific"><span>10567</span>/6000步</p>
-            <p class="category">步数<span>达标</span></p>
-          </li>
-          <li>
-            <p class="specific"><span>4</span>/5千米</p>
-            <p class="category">行程<span>未达标</span></p>
-          </li>
-          <li>
-            <p class="specific"><span>588</span>/600里卡</p>
-            <p class="category">消耗<span>达标</span></p>
-          </li>
-        </ul>
-        <div class="annular">
-          <van-circle
-            v-model="currentRate1"
-            size="160px"
-            color="#179b3b"
-            layer-color="#F8F8F8"
-            :rate="90"
-            :speed="50"
-            :stroke-width="120"
-          />
-          <van-circle
-            v-model="currentRate2"
-            size="129px"
-            color="#ff5f8b"
-            layer-color="#F8F8F8"
-            :rate="80"
-            :speed="50"
-            :stroke-width="140"
-          />
-          <p>多走4567步</p>
+        <!-- 日历 -->
+
+        <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="calendarDialogShow"
+                :min-date="minDate"
+                :max-date="maxDate"
+                :default-date="defaultDate"
+                :round="false"
+                :poppable="false"
+                color="#179b3b"
+                :show-confirm="false"
+                :show-title="true"
+                :show-subtitle="false"
+                :formatter="formatterDay"
+                @select="onSelect"
+              />
+            </div>
+          </template>
+        </van-dialog>
+        <!-- 今体征感知 todo 待需求开放-->
+        <div class="perception" v-if="true">
+          <div class="title" @click="onRouterTo('signsDetails', 'temperature')">
+            <p>今日体征感知</p>
+            <div>
+              <p>{{ now }}</p>
+              <van-icon name="arrow" size="18" />
+            </div>
+          </div>
+          <ul>
+            <li
+              v-for="(item, index) in signDataList.length > 0 ? signDataList : 3"
+              :key="index"
+              :style="{ backgroundColor: item.bgColor }"
+              @click="onRouterTo('signsDetails', item.class)"
+            >
+              <h4>{{ item.value || '--' }}</h4>
+              <p>{{ item.name || '暂无数据' }}</p>
+              <time>{{ item.time || '--' }}</time>
+            </li>
+          </ul>
+          <div class="tip">
+            <img class="img" src="@/assets/today/icons/2_25.png" />
+            <p>
+              <span>温馨提示：</span
+              >检测数据仅供参考，<span>不可做医疗诊断和治疗依据</span>，在运动、工作等场景会影响健康检测。
+            </p>
+          </div>
         </div>
-      </div>
-    </div>
-    <!-- 情绪日记 -->
-    <div class="diary">
-      <div class="title">
-        <p>情绪日记</p>
-        <div>
-          <div>
-            <p>保存</p>
-            <van-icon name="arrow" size="18" />
+        <div class="diary">
+          <div class="title">
+            <p>情绪日记</p>
+            <div>
+              <div>
+                <p>保存</p>
+                <van-icon name="arrow" size="18" />
+              </div>
+            </div>
+          </div>
+          <div class="main">
+            <van-checkbox-group v-model="result">
+              <van-checkbox name="a" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_72.png" />
+              </van-checkbox>
+              <van-checkbox name="b" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_59.png" />
+              </van-checkbox>
+              <van-checkbox name="c" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_54.png" />
+              </van-checkbox>
+              <van-checkbox name="d" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_67.png" />
+              </van-checkbox>
+              <van-checkbox name="e" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_72.png" />
+              </van-checkbox>
+              <van-checkbox name="f" shape="square" checked-color="#179b3b">
+                <img src="@/assets/today/icons/2_70.png" />
+              </van-checkbox>
+            </van-checkbox-group>
+            <div class="textarea">
+              <textarea placeholder="我要写亲密日记" rows="5"></textarea>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="main">
-        <van-checkbox-group v-model="result">
-          <van-checkbox name="a" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_72.png" />
-          </van-checkbox>
-          <van-checkbox name="b" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_59.png" />
-          </van-checkbox>
-          <van-checkbox name="c" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_54.png" />
-          </van-checkbox>
-          <van-checkbox name="d" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_67.png" />
-          </van-checkbox>
-          <van-checkbox name="e" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_72.png" />
-          </van-checkbox>
-          <van-checkbox name="f" shape="square" checked-color="#179b3b">
-            <img src="@/assets/today/icons/2_70.png" />
-          </van-checkbox>
-        </van-checkbox-group>
-        <div class="textarea">
-          <textarea placeholder="我要写亲密日记" rows="5"></textarea>
+        <!-- 情绪知识库 -->
+        <div class="knowledge">
+          <div class="title">
+            <p>情绪知识库</p>
+          </div>
+          <div class="main">
+            <ul>
+              <li>
+                <p>健康同学 测量的 什么压力？ 测量原理是什么？</p>
+                <img src="@/assets/today/images/2_42.png" />
+              </li>
+              <li>
+                <p>健康同学 测量的 什么压力？ 测量原理是什么？</p>
+                <img src="@/assets/today/images/2_48.png" />
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
-    <!-- 情绪知识库 -->
-    <div class="knowledge">
-      <div class="title">
-        <p>情绪知识库</p>
-      </div>
-      <div class="main">
-        <ul>
-          <li>
-            <p>健康同学 测量的 什么压力？ 测量原理是什么？</p>
-            <img src="@/assets/today/images/2_42.png" />
-          </li>
-          <li>
-            <p>健康同学 测量的 什么压力？ 测量原理是什么？</p>
-            <img src="@/assets/today/images/2_48.png" />
-          </li>
-        </ul>
+    <!-- 绑定或者添加用户提示 -->
+    <div class="bind-tips" @click="onToBind(tipsText)" v-show="isPageShow">
+      <div class="con" v-show="isShowBind">
+        <p>点击绑定{{ tipsText }}</p>
       </div>
     </div>
-    <!-- 底部导航 -->
-    <TabBar />
-    <!-- 日期选择 -->
-    <van-calendar v-model="show" :show-confirm="false" @confirm="onConfirm" :min-date="minDate" :max-date="maxDate" />
+    <!-- <overlay-loading :showOverlay="showOverlay"></overlay-loading> -->
   </div>
 </template>
-
-<script>
-import TabBar from '@/components/TabBar';
-import { Calendar, Circle, Checkbox, CheckboxGroup } from 'vant';
-import APICore from '@/api/core';
+  
+  <script>
+import APIAlarm from '@/api/core';
 import APIPsy from '@/api/psychological';
+import APIHealthUser from '@/api/health-user';
+/* import overlayLoading from '@/components/overlay-loading/overlay-loading'; */
+import ToastService from '../../services/toast-service';
+import DialogService from '../../services/dialog-service';
 export default {
-  components: {
-    TabBar,
-    [Circle.name]: Circle,
-    [Calendar.name]: Calendar,
-    [Checkbox.name]: Checkbox,
-    [CheckboxGroup.name]: CheckboxGroup
-  },
+  /* components: { overlayLoading }, */
   data() {
     return {
+      todayStatus: true,
+      // 0：优秀、1：良好、2：一般、3：糟糕
+      statusList: [
+        { className: 'toobad', active: false, value: 3 },
+        { className: 'ordinary', active: false, value: 2 },
+        { className: 'sameas', active: false, value: 1 },
+        { className: 'excellent', active: false, value: 0 }
+      ],
+      todayResult: {},
+      todayLevel: '',
+      dateList: [
+        { name: 'today', text: '今天', value: 0 },
+        { name: 'week', text: '7天', value: 7 },
+        { name: 'month', text: '30天', value: 30 }
+        /* { name: 'weekReport', text: '周报', value: 49 } */
+      ],
       date: '',
-      show: false,
-      minDate: new Date(2023, 12, 1),
-      maxDate: new Date(2023, 12, 18),
+      calendarDialogShow: false,
+      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()),
       currentRate1: 0,
       currentRate2: 0,
       result: [],
-      uid: '2023101521270090082',
-      psyDataList: []
+      uid: '',
+      psyDataList: [],
+      signDataList: [],
+      devicesList: [
+        {
+          imagePath: '',
+          deviceId: '',
+          deviceStatus: { online: 1 },
+          serialNo: '861281060086216'
+        }
+      ],
+      conAreaShow: false,
+      currentDevice: {
+        // 当前设备对象，用于存储接口返回的list的当前对象
+        deviceId: '',
+        deviceName: '',
+        phoneNumber: '',
+        personName: '',
+        binType: '',
+        nickName: '',
+        imagePath: '',
+        serialNo: '861281060086216',
+        positionTime: '',
+        deviceVersion: '',
+        locationType: '',
+        lat: '',
+        lng: '',
+        deviceStatus: {
+          battery: '',
+          online: '',
+          step: ''
+        },
+        address: '',
+        radius: 0
+      },
+      // 需要高亮的日期数组
+      highlightDates: [],
+      // 人员列表
+      personList: [],
+      // 当前人员信息
+      currentPerson: {},
+      noDataImg: require('@/assets/today/images/no_data_01.png'),
+      showOverlay: true,
+      isPageShow: false,
+      encouragingLanguage: ''
     };
   },
   computed: {
     now() {
       return this.$dayjs(new Date()).format('MM.DD');
+    },
+    tipsText() {
+      // 如果没有添加用户，则提示添加用户，否则提示添加设备
+      return this.personList.length > 0 ? (this.currentPerson.deviceId == null ? '设备' : '') : '用户';
+    },
+    isShowBind() {
+      return this.personList.length > 0 ? (this.currentPerson.deviceId == null ? true : false) : true;
+    },
+    isBinding() {
+      return this.$route.query.isBinding || false;
     }
   },
-  created() {
+  created() {},
+  async mounted() {
+    this.getPersonList();
     this.getAuth();
   },
-  mounted() {
-    this.getHomeData();
-  },
   methods: {
+    getPersonList() {
+      APIHealthUser.personList()
+        .then(res => {
+          console.log('人员列表', res);
+          const list = res.data.data;
+          if (list) {
+            this.personList = list;
+            let personIdIndex = list.findIndex(item => {
+              return item.id == this.$store.getters.personId;
+            });
+            if (personIdIndex < 0) {
+              this.$store.commit('personId', list[0].id);
+            }
+          }
+          this.getPersonInfo();
+        })
+        .catch(() => {
+          this.showOverlay = false;
+          this.isPageShow = true;
+        });
+    },
+    // 获取指定用户信息
+    getPersonInfo(personId, showToast) {
+      if (showToast) {
+        ToastService.loading({
+          message: '切换中'
+        });
+      }
+      let reqParams = {
+        personId: personId || this.$store.getters.personId
+      };
+      APIHealthUser.personInfo(reqParams)
+        .then(res => {
+          const data = res.data.data;
+          if (data) {
+            let deviceStatus = this.personList.filter(item => {
+              return item.id == this.$store.getters.personId;
+            });
+            this.currentPerson = {
+              id: data.personId,
+              avatar: data.avatar,
+              nickName: data.nickName,
+              uid: data.physicUid,
+              deviceId: data.deviceId,
+              deviceStatus: deviceStatus[0] ? deviceStatus[0].deviceStatus : ''
+            };
+            this.$store.commit('deviceId', data.deviceId || '');
+            this.$store.commit('serialNo', data.imei);
+            console.log('this.currentPerson', this.currentPerson);
+            this.getComprehensiveEvaluation();
+            this.getPsychologiclData();
+            this.getHomeData();
+          }
+        })
+        .catch(error => {
+          console.log('error', error);
+          this.showOverlay = false;
+          this.isPageShow = true;
+        })
+        .finally(() => {
+          if (showToast) {
+            ToastService.clear();
+          }
+          this.showOverlay = false;
+          this.isPageShow = true;
+        });
+    },
     // 获取首页情绪数据
-    getHomeData() {
+    getPsychologiclData() {
       let reqParams = {
-        uid: this.uid,
+        uid: this.currentPerson.uid,
         date: this.$dayjs(new Date()).format('YYYY-MM-DD') /* '2023-11-21' */
       };
       APIPsy.getHomeData(reqParams).then(res => {
         const data = res.data.response;
         if (!data) {
-          return this.$toast.fail(res.data.msg);
+          ToastService.fail(res.data.msg);
         }
         this.psyDataList = [
           // 2023.12.5 修改菜单顺序
@@ -260,7 +453,8 @@ export default {
             class: 'tiredness',
             result: data.TirDesc,
             time: data.TirMeasureUpdateTime ? this.$dayjs(data.TirMeasureUpdateTime).format('HH:mm') : '',
-            level: data.TirLevel
+            level: data.TirLevel,
+            bgColor: this.calcResultColor(data.TirLevel)
           },
           // 压力指数
           {
@@ -269,7 +463,8 @@ export default {
             class: 'stress',
             result: data.StressDesc,
             time: data.StressMeasureUpdateTime ? this.$dayjs(data.StressMeasureUpdateTime).format('HH:mm') : '',
-            level: data.StressLevel
+            level: data.StressLevel,
+            bgColor: this.calcResultColor(data.StressLevel)
           },
           // 抑郁
           {
@@ -278,39 +473,244 @@ export default {
             class: 'depression',
             result: data.DepDesc,
             time: data.DepMeasureUpdateTime ? this.$dayjs(data.DepMeasureUpdateTime).format('HH:mm') : '',
-            level: data.DepLevel
+            level: data.DepLevel,
+            bgColor: this.calcResultColor(data.DepLevel)
           }
         ];
       });
     },
+    // 当天三大指标综合总评
+    getComprehensiveEvaluation() {
+      let reqParams = {
+        uid: this.currentPerson.uid,
+        date: this.$dayjs(new Date()).format('YYYY-MM-DD') /* '2023-11-21' */
+      };
+      APIPsy.getComprehensiveEvaluation(reqParams).then(res => {
+        const data = res.data.response;
+        if (!data) {
+          return ToastService.fail(res.data.msg);
+        } else {
+          console.log('三大指标', data);
+          this.todayResult = { ...data };
+          this.todayLevel = data.Level;
+          this.statusList.map(item => {
+            item.active = item.value == data.Level;
+            return item;
+          });
+        }
+      });
+    },
+    calcTodayStatus(level, type) {
+      // @/assets/today/images/2_03.png
+      let text = '';
+      let imgPath = require('@/assets/today/images/2_03.png');
+      if (this.$own.isNull(level) || level === -1) {
+        return type == 'text' ? text : imgPath;
+      }
+      switch (level) {
+        case 0:
+          text = '优秀';
+          imgPath = require('@/assets/today/images/2_03.png');
+          break;
+        case 1:
+          text = '良好';
+          imgPath = require('@/assets/today/images/2_03.png');
+          break;
+        case 2:
+          text = '一般';
+          imgPath = require('@/assets/today/images/2_39.png');
+          break;
+        case 3:
+          text = '糟糕';
+          imgPath = require('@/assets/today/images/2_62.png');
+          break;
+      }
+      return type == 'text' ? text : imgPath;
+    },
+    // 获取首页体征数据
+    getHomeData() {
+      let reqParams = {
+        personId: this.$store.getters.personId
+      };
+      APIHealthUser.getHomeData(reqParams)
+        .then(res => {
+          console.log('体征:', res);
+          let data = res.data.data;
+          this.signDataList = [
+            // 2023.12.5 修改菜单顺序
+            // 疲劳指数
+            {
+              value: data.temperature,
+              name: '体温',
+              class: 'temperature',
+              /* result: data.TirDesc, */
+              time: data.temperatureTime ? this.$dayjs(data.temperatureTime).format('HH:mm') : '',
+              bgColor: this.calcSignResultColor(data.levelTemperature)
+            },
+            // 压力指数
+            {
+              value: data.heartRate,
+              name: '心率',
+              class: 'heartrate',
+              /* result: data.StressDesc, */
+              time: data.heartRateTime ? this.$dayjs(data.heartRateTime).format('HH:mm') : '',
+              bgColor: this.calcSignResultColor(data.levelHeartRate)
+            },
+            // 抑郁
+            {
+              value: data.steps,
+              name: '步数',
+              class: 'step',
+              /* result: data.DepDesc, */
+              time: data.stepsTime ? this.$dayjs(data.stepsTime).format('HH:mm') : '',
+              bgColor: this.calcSignResultColor(data.levelSteps)
+            }
+          ];
+        })
+        .finally(() => {
+          this.showOverlay = false;
+          this.isPageShow = true;
+        });
+    },
     formatDate(date) {
       return `${date.getMonth() + 1}/${date.getDate()}`;
     },
-    onConfirm(date) {
-      this.show = false;
-      console.log(date);
-      console.log(this.formatDate(date));
-    },
-    onRouterTo(name) {
-      if (name) {
+    async onRouterTo(name, query) {
+      console.log('name', name, this.currentPerson.uid);
+      if (name === 'emotionDetails') {
+        // 心理
+        if (this.currentPerson.uid) {
+          // 先根据uid查建模进度，未完成跳建模进度查询页面，完成跳详情
+          const isModelSuccess = await this.getProgress();
+          console.log('isModelSuccess', isModelSuccess);
+          if (!isModelSuccess) {
+            this.$router.push({
+              name: 'psychologicalModeling',
+              query: {
+                uid: this.currentPerson.uid
+              }
+            });
+          }
+          this.$router.push({
+            name: name,
+            query: {
+              // 参数默认传疲劳
+              name: query,
+              uid: this.currentPerson.uid
+            }
+          });
+        } else {
+          DialogService.confirm({
+            message: `uid不存在，请联系管理员`
+          });
+        }
+      } else {
         this.$router.push({
           name: name,
           query: {
-            // 参数默认传疲劳,uid暂时写死，上线通过接口获取
-            name: 'tiredness',
-            uid: '2023101521270090082'
+            // 参数默认传疲劳
+            name: query,
+            uid: this.currentPerson.uid
           }
         });
       }
     },
+    // 计算体征结果采用哪种颜色
+    calcSignResultColor(value, isCallBackClass) {
+      let color = '';
+      let className = '';
+      switch (Number(value)) {
+        case 0:
+          color = '#2ea7e0';
+          className = 'none';
+          break;
+        case 1:
+          color = '#179b3b';
+          className = 'moderate';
+          break;
+        case 2:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+        case 3:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+        default:
+          color = '#179b3b';
+          className = 'none';
+          break;
+      }
+      return isCallBackClass ? className : color;
+    },
+    // 计算情绪结果采用哪种颜色
+    calcResultColor(value, isCallBackClass) {
+      let color = '';
+      let className = '';
+      switch (Number(value)) {
+        case 0:
+          color = '#179b3b';
+          className = 'none';
+          break;
+        case 1:
+          color = '#8dc21f';
+          className = 'mild';
+          break;
+        case 2:
+          color = '#2ea7e0';
+          className = 'moderate';
+          break;
+        case 3:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+        default:
+          color = '#179b3b';
+          className = 'none';
+          break;
+      }
+      return isCallBackClass ? className : color;
+    },
+    getProgress() {
+      let reqParams = {
+        uid: this.currentPerson.uid
+      };
+      return new Promise(resolve => {
+        APIPsy.getProgress(reqParams)
+          .then(res => {
+            const re = res.data;
+            if (re.success) {
+              if (re.response && re.response.state === -1) {
+                resolve(false);
+              } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1) {
+                resolve(true);
+              } else {
+                resolve(false);
+              }
+            } else {
+              resolve(false);
+            }
+          })
+          .catch(() => {
+            resolve(false);
+          });
+      });
+    },
     //   获取b端token
     getAuth() {
       let manufactorId = '5bf13062-a41e-4d00-ba14-1101aad12650';
-      APICore.getAuth({ manufactorId: manufactorId }).then(res => {
-        let data = res.data;
-        if (data.code === 0) {
-          this.$store.commit('ssjlToken', res.data.data);
-        }
+      return new Promise((resove, reject) => {
+        APIAlarm.getAuth({ manufactorId: manufactorId })
+          .then(res => {
+            let data = res.data;
+            if (data.code === 0) {
+              this.$store.commit('ssjlToken', res.data.data);
+              resove(true);
+            }
+          })
+          .catch(() => {
+            reject(false);
+          });
       });
     },
     onScroll() {
@@ -319,10 +719,170 @@ export default {
         left: 0,
         behavior: 'smooth'
       });
+    },
+    imgAreaClick() {
+      this.conAreaShow = !this.conAreaShow;
+    },
+    imageListClick(item) {
+      this.conAreaShow = false;
+      this.$store.commit('personId', item.id);
+      this.currentPerson = {};
+      this.isPageShow = false;
+      this.getPersonInfo(item.id, true);
+    },
+    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 + '';
+    },
+    // 获取指定天数的起始日期
+    /**
+     *
+     * @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;
+    },
+    getCalendarData() {
+      let currentDate = new Date();
+      // 获取最近30天的心情等级日历数据
+      let dateList = this.getPostDate(currentDate, 30, true);
+      let reqParams = {
+        uid: this.currentPerson.uid,
+        startDate: dateList[0],
+        endDate: dateList[1]
+      };
+      APIPsy.getCalendarData(reqParams).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];
+        }
+      });
+    },
+    // 格式化日期显示参数
+    formatterDay(day) {
+      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;
+    },
+    // 选择日历具体某一个日期
+    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.getPsychologiclData(selectDate);
+      this.getComprehensiveEvaluation(selectDate);
+    },
+    onToBind(text) {
+      // text 设备  用户
+      if (text == '设备') {
+        this.$router.push({
+          name: 'deviceBinding',
+          query: {
+            from: 'health'
+          }
+        });
+      } else if (text == '用户') {
+        this.$router.push({
+          name: 'userInfos',
+          query: {
+            from: 'health',
+            showLeft: true
+          }
+        });
+      }
+    },
+    // 根据类型，和数值计算使用什么颜色
+    calcColorByTypeAndValue(type, value) {
+      let color = '';
+      const intValue = Number(value);
+      if (!value) {
+        return (color = '#189b3b');
+      }
+      if (type == 0) {
+        // 心率
+        if (intValue > 120) {
+          color = '#ff5f8b';
+        } else if (intValue < 40) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
+      } else if (type == 1) {
+        // 体温
+        if (intValue >= 37.3) {
+          color = '#ff5f8b';
+        } else if (intValue <= 34) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
+      } else {
+        // 步数 2
+        if (intValue >= 5000) {
+          color = '#ff5f8b';
+        } else if (intValue <= 3000) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
+      }
+      return color;
     }
   }
 };
 </script>
+
 <style scoped lang="scss">
 @import './scss/index.scss';
 </style>
+  
\ No newline at end of file
diff --git a/src/views/today/scss/emotion-details.scss b/src/views/today/scss/emotion-details.scss
index e5a62f1..3d074d7 100644
--- a/src/views/today/scss/emotion-details.scss
+++ b/src/views/today/scss/emotion-details.scss
@@ -1,12 +1,89 @@
 .psychological-container {
-  min-height: 100vh;
+  height: 100vh;
   overflow: hidden;
   background-color: #fff;
+
+
+  .calenddar-dialog {
+    overflow: scroll;
+  }
+
+
+  .modeling {
+    padding: 20px;
+    position: relative;
+
+    .modeling-main {
+      font-size: 32px;
+
+      .top {
+        display: flex;
+        justify-content: flex-start;
+        align-items: flex-start;
+        padding: 0 20px;
+
+        .left {
+          padding-right: 30px;
+        }
+
+        .right {
+          p {
+            font-size: 32px;
+            font-weight: 450;
+          }
+
+          .tips {
+            color: #edb21d;
+          }
+        }
+
+
+      }
+
+      .bottom {
+        padding: 20px 0;
+        padding-left: 80px;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+
+        .font-26 {
+          font-size: 28px;
+          color: #8b8b8b;
+        }
+
+        .progress-bar {
+          width: 370px;
+          height: 30px;
+          background-color: #eeeeee;
+          margin: 0 20px;
+          border-radius: 20px;
+
+          .progress {
+            height: 35px;
+            background-color: #638ee4;
+            border-radius: 20px;
+          }
+
+
+
+
+        }
+
+        .progress-text {
+          color: #638ee4;
+        }
+      }
+
+    }
+  }
+
   .tab-bar {
     padding: 20px;
     position: relative;
+
     .date-tab-con {
-      height: 50px;
+      height: 60px;
       display: flex;
       justify-content: flex-start;
       align-items: center;
@@ -15,6 +92,7 @@
       border-top-right-radius: 40px;
       border-bottom-left-radius: 40px;
       border-bottom-right-radius: 40px;
+
       .date-tab-list {
         display: flex;
         justify-content: space-around;
@@ -22,6 +100,7 @@
         color: #fff;
         flex: 1;
         height: 50px;
+
         .date-tab-item {
           position: relative;
           padding: 0 20px;
@@ -36,39 +115,46 @@
           img {
             height: 50px;
             width: 50px;
-            padding: 0 16px;
+            padding: 0 px2rem(16);
           }
+
           .more {
             width: 20px;
             height: 12px;
           }
+
           &.active {
             color: #fff;
             background-color: $green;
           }
+
           &.notClick {
             background-color: $border_color;
             color: #fff;
             border: 1px solid #fff;
           }
         }
+
         .date-tab-item:nth-child(3) {
           border-right: 1px solid #e0e0e0;
         }
       }
     }
   }
+
   .psy-tab-bar {
-    height: 50px;
+    height: 60px;
     position: relative;
     margin: 20px 0 0 0;
     padding: 0 20px;
+
     .psy-tab-con {
       background-color: #eeeeee;
       border-top-left-radius: 40px;
       border-top-right-radius: 40px;
       border-bottom-left-radius: 40px;
       border-bottom-right-radius: 40px;
+
       .psy-tab-list {
         display: flex;
         justify-content: space-around;
@@ -76,6 +162,7 @@
         color: #fff;
         height: 50px;
         width: 100%;
+
         /* background-color: red; */
         .psy-tab-item {
           position: relative;
@@ -87,6 +174,7 @@
           border-radius: 40px;
           font-weight: bold;
           @include center();
+
           &.active {
             color: #fff;
             background-color: $green;
@@ -95,59 +183,75 @@
       }
     }
   }
+
   .main {
     position: relative;
-    height: calc(100vh - 100px);
+    height: calc(100vh - 150px);
     overflow: scroll;
+
+
+
     .top {
       flex: 1;
+
       .title {
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding: 0px 32px 20px 26px;
         font-size: 36px;
+
         .title-left {
           font-weight: bold;
+          @include center();
+
           .van-icon {
             margin-left: 5px;
             font-size: 18px;
           }
         }
       }
+
       .monitoring-count {
         text-align: left;
         padding: 6px 28px;
         line-height: 40px;
+
         p {
           font-size: 24px;
           color: #8b8b8b;
         }
       }
+
       .pie-chart-con {
         flex: 1;
         padding: 10px 0 20px 0;
         display: flex;
         justify-content: space-between;
         align-items: flex-start;
+
         .pie-chart-left {
           position: relative;
           height: 300px;
           padding-left: 30px;
           width: 35%;
           @include center();
+
           #pieChart {
             height: 212px;
             width: 212px;
           }
         }
+
         .pie-chart-right {
           height: 300px;
           width: 65%;
           padding-right: 40px;
           @include center();
+
           .list {
             flex-direction: column;
+
             .item {
               width: 100%;
               display: flex;
@@ -155,24 +259,29 @@
               align-items: center;
               font-size: 24px;
               padding: 18px 0;
+
               .item-left {
                 display: flex;
                 justify-content: flex-start;
                 align-items: center;
                 padding-right: 20px;
+
                 .circle {
                   height: 24px;
                   width: 24px;
                   margin: 0 8px;
                 }
+
                 span {
                   font-size: 24px;
                 }
+
                 .text {
                   color: #000;
                   font-size: 24px;
                 }
               }
+
               .item-right {
                 display: flex;
                 justify-content: center;
@@ -182,15 +291,118 @@
           }
         }
       }
+
+      .circle-con {
+        flex: 1;
+        padding: 20px 30px 20px 30px;
+        @include center();
+        flex-direction: column;
+
+        .out-circle {
+          position: relative;
+          z-index: 99;
+
+          .van-circle {
+            height: 200px !important;
+            width: 200px !important;
+          }
+
+          .circle-text {
+            height: 100%;
+            @include center();
+            font-size: 48px;
+            color: #333;
+
+            .left {
+              font-size: 76px;
+              padding: 0 10px;
+              font-weight: bold;
+            }
+
+            .right {
+              font-size: 23px;
+            }
+          }
+
+          .circle-white {
+            position: absolute;
+            top: -1.5px;
+            right: 41%;
+            height: 42px;
+            width: 42px;
+            border: 4px solid;
+            border-radius: 50%;
+            background: #fff;
+          }
+        }
+
+        .progress {
+          position: relative;
+          margin-top: 60px;
+          /*  height: px2rem(90); */
+          flex: 1;
+          width: 100%;
+          font-size: 30px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          .progress-circle {
+            position: absolute;
+            top: -10px;
+            left: 0;
+            height: 35px;
+            width: 35px;
+            background-color: #fff;
+            border-radius: 50%;
+            border: 10px solid;
+            z-index: 99;
+          }
+
+          .state-item {
+            width: 100%;
+
+            .state-line {
+              position: relative;
+              height: 30px;
+              font-size: 32px;
+
+              &.low {
+                border-top-left-radius: 10px;
+                border-bottom-left-radius: 10px;
+              }
+
+              &.blue {
+                background-color: $com_blue;
+              }
+
+              &.hight {
+                background-color: $com_red;
+                border-top-right-radius: 10px;
+                border-bottom-right-radius: 10px;
+              }
+            }
+
+            .state-text {
+              padding-top: 21px;
+              @include center();
+            }
+          }
+        }
+
+      }
+
       .statistics {
-        height: 100%;
-        padding: 10px 40px;
+
+        /* padding: 40px 40px; */
         .list {
+          padding: 40px 40px;
           display: grid;
           grid-template-columns: repeat(3, 1fr); //定义了一个 3x3 的网格布
           /* grid-template-rows: repeat(3, 1fr); */
           gap: 40px;
           font-size: 32px;
+
           .item {
             display: flex;
             justify-content: flex-start;
@@ -201,6 +413,7 @@
             border: 1px solid $border_color;
             border-radius: 40px;
             color: #fff;
+
             .top {
               font-size: 24px;
             }
@@ -215,77 +428,118 @@
           }
         }
       }
+
+      .tip {
+        display: flex;
+        justify-content: flex-start;
+        padding: 20px 40px;
+
+        img {
+          width: 29px;
+          height: 47px;
+          object-fit: contain;
+          margin-right: 30px;
+        }
+
+        p {
+          font-size: 24px;
+          color: #434144;
+          line-height: 1.5em;
+
+          span {
+            color: #edb21d;
+          }
+        }
+      }
     }
+
     .line {
       position: relative;
       height: 22px;
       background-color: $lineGray;
     }
+
     .bottom {
       flex: 1;
       overflow: scroll;
+
       .echart-container {
         position: relative;
         min-height: 600px;
         background-color: #fff;
         padding: 0 10px;
+
         .echart {
           height: 200px;
           padding: 0 10px;
         }
       }
+
       .line-gray {
         height: 22px;
         width: 100%;
         background-color: $lineGray;
         margin-top: 20px;
       }
+
       .result {
+        padding-bottom: 40px;
+
         .result-con {
           height: 100%;
           background-color: #fff;
           border-radius: 40px;
           overflow: hidden;
+
           &.reminder {
             padding: 0 32px 40px 32px;
           }
+
           .title {
             display: flex;
             justify-content: flex-start;
             align-items: flex-start;
             flex-direction: column;
-            margin-bottom: 20px;
+            margin-bottom: 60px;
+
             span {
               font-size: 36px;
               font-weight: bold;
             }
+
             .font-28 {
               font-weight: 400;
-              font-size: 26px;
+              font-size: 24px;
               color: #8b8b8b;
               text-align: left;
             }
+
             .title-no-data {
               padding: 68px 0 26px 30px;
             }
+
             p {
               font-size: 24px;
               color: $green;
             }
+
             .title-emo {
               font-size: 48px;
               padding: 28px 0 42px 0;
               text-align: left;
             }
+
             .no-data {
               height: 500px;
               width: 100%;
               @include center();
               flex-direction: column;
+
               img {
                 height: 220px;
                 width: 350px;
               }
+
               p {
                 color: #999;
                 font-size: 24px;
@@ -293,12 +547,15 @@
               }
             }
           }
+
           .title-text {
             padding: 68px 0 26px 30px;
           }
+
           .title-reminder {
             padding: 68px 0 0 0;
           }
+
           .friendly-reminder,
           .warm-reminder {
             display: flex;
@@ -308,53 +565,64 @@
             margin-bottom: 20px;
             background-color: #f2f2f2;
             padding: 40px 38px 38px 28px;
+
             p {
               font-weight: bold;
               text-align: left;
               padding-bottom: 22px;
               font-size: 30px;
             }
+
             span {
               text-align: left;
               font-size: 24px;
             }
           }
+
           .mood-list {
             display: grid;
             grid-template-columns: repeat(2, auto); //定义了一个 2x2 的网格布
             grid-template-rows: repeat(2, 1fr);
             gap: 42px;
             padding: 0 88px 40px 74px;
+
             .item {
               width: 274px;
               height: 220px;
               @include center();
               flex-direction: column;
               border-radius: 40px;
+
               p {
                 font-size: 24px;
                 padding: 0;
                 color: #fff;
+
                 .day {
                   padding: 10px;
                   font-size: 56px;
                 }
+
                 .day-text {
                   font-size: 24px;
                 }
               }
             }
           }
+
           .mood-list-no-data {
             height: 500px;
             width: 100%;
+
             .no-data {
               @include center();
               flex-direction: column;
+
               img {
                 height: 220px;
                 width: 350px;
               }
+
               p {
                 color: #999;
                 font-size: 24px;
@@ -365,13 +633,16 @@
         }
       }
     }
+
     &.report {
       position: relative;
       height: calc(100vh - 300px);
       overflow: scroll;
       background-color: #f5f5f5;
+
       .content {
         position: relative;
+
         .list {
           position: relative;
 
@@ -382,21 +653,26 @@
             padding: 68px 30px;
             background-color: #fff;
             margin-bottom: 22px;
+
             .left {
               display: flex;
               justify-content: flex-start;
               align-items: flex-start;
+
               img {
                 height: 50px;
                 width: 50px;
               }
+
               .middle {
+
                 .title,
                 .overall,
                 .trend {
                   display: flex;
                   justify-content: flex-start;
                   align-items: center;
+
                   /* padding-left: 26px; */
                   span,
                   p {
@@ -407,24 +683,29 @@
                     line-height: 60px;
                   }
                 }
+
                 .title {
                   span {
                     padding-right: 40px;
                   }
+
                   p {
                     color: #282828;
                   }
                 }
+
                 .overall {
                   display: flex;
                   justify-content: space-between;
                   align-items: center;
+
                   .left {
                     p {
                       padding-left: 40px;
                       font-weight: bold;
                     }
                   }
+
                   .right {
                     img {
                       height: 30px;
@@ -432,12 +713,14 @@
                     }
                   }
                 }
+
                 .trend {
                   align-items: flex-start;
                   text-align: left;
                 }
               }
             }
+
             .right {
               img {
                 width: 18px;
@@ -445,15 +728,18 @@
               }
             }
           }
+
           &.no-data {
             height: calc(100vh - 200px);
             width: 100%;
             @include center();
             flex-direction: column;
+
             img {
               height: 220px;
               width: 350px;
             }
+
             p {
               color: #999;
               font-size: 32px;
@@ -468,17 +754,20 @@
   .title {
     font-size: 32px;
   }
+
   .van-popup {
     flex: 1;
-    max-height: 600px;
+    min-height: 600px;
     width: 100%;
     background-color: $background;
   }
+
   .popup {
     /*  height: 100%;
         width: 100%; */
     background-color: $background;
     padding: 40px;
+
     .item {
       flex: 1;
       padding: 20px;
@@ -487,16 +776,20 @@
       font-size: 28px;
       background-color: #fff;
       border-radius: 20px;
+
       p {
         margin: 10px 0;
       }
+
       h5 {
         margin: 10px 0;
         font-size: 32px;
       }
+
       &.first {
         padding-top: 0;
       }
+
       &.science-tips {
         .tips {
           width: 120px;
@@ -510,11 +803,13 @@
         }
       }
     }
+
     .van-button {
-      height: 40px;
+      height: 80px;
       background-color: $green;
       color: #fff;
-      border-radius: 20px;
+      border-radius: 40px;
+      font-size: 32px;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/today/scss/index.scss b/src/views/today/scss/index.scss
index f76470a..0051222 100644
--- a/src/views/today/scss/index.scss
+++ b/src/views/today/scss/index.scss
@@ -1,434 +1,777 @@
 .today {
-    min-height: 100vh;
-    .today-status {
-        display: flex;
-        justify-content: center;
-        flex-direction: column;
-        align-items: center;
-        position: relative;
-        padding:0 40px;
-        .img {
-            width: 40%;
-            object-fit: contain;
-            margin-top: 20px;
-        }
-        .icon{
-            width: 60px;
-            height: 60px;
-            object-fit: contain;
+    /*  z-index: 15; */
+    position: relative;
+    overflow: hidden;
+
+    .devicesSwitch {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 120px;
+        width: 100%;
+        z-index: 20;
+
+        .imgArea {
             position: absolute;
-            top: 40px;
-            right: 40px;
-        }
-        .status {
+            top: 20px;
+            left: 20px;
+            padding: 8px;
             display: flex;
-            flex-wrap: wrap;
+            justify-content: flex-start;
             align-items: center;
-            align-content: space-between;
-            justify-content: space-between;
+            background: #fff;
+            border-radius: 50px;
+            border: 4px solid $border_color;
+            z-index: 18;
+
+            &.cut {
+                border: 2px solid $com_light_green;
+            }
+
+            img {
+                width: 60px !important;
+                height: 60px !important;
+                border-radius: 50%;
+                object-fit: cover;
+            }
+
+            span {
+                padding: 0 12px;
+                @include colorAndFont(#333, 28);
+            }
+        }
+
+        .conArea {
+            position: absolute;
+            left: 0;
+            top: 0;
             width: 100%;
-            margin: 40px 0;
-            p {
-                font-size: 30px;
-                color: #434144;
-                font-weight: bold;
+            padding: 12px 0 12px 20px;
+            background: #fff;
+            box-sizing: border-box;
+            display: flex;
+            transform: translateX(-100%);
+            transition: left .4s ease-in-out;
+            z-index: 667;
+            overflow: scroll;
+            border: 1px solid $com_light_green;
+
+            &.active {
+                transform: translateX(0);
             }
-            ul {
-                display: flex;
-                flex-wrap: wrap;
-                align-items: center;
-                justify-content: flex-start;
-                li {
-                    width: 40px;
-                    height: 20px;
-                    border-radius: 20px;
+
+            .list {
+                @include center();
+                flex-direction: column;
+                @include colorAndFont(#333, 24);
+                margin-right: 20px;
+
+                .Myname {
+                    @include center();
+                    width: 120%;
+
+                    &.active {
+                        text-decoration: underline;
+                        font-weight: bold;
+                    }
+                }
+
+                .imgA {
+                    width: 100px;
+                    height: 100px;
+                    background: #c5c5c5;
+                    border-radius: 50%;
                     position: relative;
-                    & + li {
-                        margin-left: 10px;
+                    @include center();
+                    margin-bottom: 12px;
+                    border: 1px solid;
+
+
+                    &>img {
+                        width: 88px;
+                        height: 88px;
+                        border-radius: 50%;
+                        object-fit: cover;
                     }
-                    &.toobad {
-                        background-color: #ff5f8b;
-                        &:after{
-                            background-color: #ff5f8b;
+
+                    &.active {
+                        width: 105px;
+                        height: 105px;
+                        position: relative;
+                        background: #c5c5c5;
+                        box-shadow: 0 0 10px 4px rgba(185, 185, 185, 0.8);
+
+                        &:after {
+                            content: '';
+                            position: absolute;
+                            bottom: -15px;
+                            width: 0;
+                            height: 0;
+                            border-top: 16px solid #c5c5c5;
+                            border-left: 8px solid transparent;
+                            border-right: 8px solid transparent;
                         }
                     }
-                    &.ordinary {
-                        background-color: #2ea7e0;
-                        &:after{
-                            background-color: #2ea7e0;
+
+                    &.online {
+                        background: #fff;
+
+                        &.active {
+                            position: relative;
+                            background: #fff;
+                            box-shadow: 0 0 10px 4px rgba(95, 204, 14, 0.8);
+
+                            &:after {
+                                content: '';
+                                position: absolute;
+                                bottom: -15px;
+                                width: 0;
+                                height: 0;
+                                border-top: 16px solid #5fcc0e;
+                                border-left: 8px solid transparent;
+                                border-right: 8px solid transparent;
+                            }
                         }
                     }
-                    &.sameas {
-                        background-color: #8dc21f;
-                        &:after{
-                            background-color: #8dc21f;
-                        }
+                }
+
+            }
+        }
+    }
+
+    .today-con,
+    .no-data {
+        position: relative;
+        height: calc(100vh - 150px);
+        overflow: scroll;
+
+        .calendar {
+            height: 800px;
+
+            .van-calendar {
+                height: 400px;
+                overflow: scroll;
+
+                .van-calendar__header {
+                    display: 'inline-block';
+                }
+
+                .van-calendar__days .van-calendar__day {
+                    width: 27px;
+                    height: 27px;
+                    margin: 10px 5px;
+                    font-size: 24px;
+
+                    &.custom-calendar {
+                        width: 27px;
+                        height: 27px;
                     }
-                    &.excellent {
-                        background-color: #179b3b;
-                        &:after{
-                            background-color: #179b3b;
+
+                    &.highlight-border {
+                        border: 1px solid #62bd48;
+                        width: 27px;
+                        height: 27px;
+                        border-radius: 50%;
+
+                        &.none {
+                            border: 1px solid #62bd48;
                         }
-                    }
-                    &.active {
-                        width: 120px;
-                        &:after {
-                            opacity: 1;
+
+                        &.mild {
+                            border: 1px solid #8dc21f;
                         }
-                        &:before {
-                            opacity: 1;
+
+                        &.moderate {
+                            border: 1px solid #2ea7e0;
+                        }
+
+                        &.severe {
+                            border: 1px solid #ff5f8b;
                         }
                     }
-                    &:after {
-                        content: '';
-                        display: block;
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translateX(-50%) translateY(-50%);
-                        width: 40px;
-                        height: 40px;
-                        opacity: 0;
-                        border-radius: 50%;
-                    }
-                    &:before {
-                        content: '';
-                        display: block;
-                        position: absolute;
-                        top: 50%;
-                        left: 50%;
-                        transform: translateX(-50%) translateY(-50%);
-                        width: 25px;
-                        height: 25px;
-                        opacity: 0;
-                        border-radius: 50%;
-                        background-color:#fff;
-                        z-index: 2;
-                    }
+                }
+
+                .van-calendar__selected-day {
+                    width: 27px;
+                    height: 27px;
+                    border-radius: 50%;
+                    font-size: 12px;
                 }
             }
         }
-        .interpret {
-            padding: 50px 60px;
-            border-radius: 40px;
-            border: 1px solid bisque;
-            p{
-                font-size: 28px;
-                color: #434144;
-                white-space: pre-line;
-                line-height: 1.8em;
+
+        .today-status {
+            display: flex;
+            justify-content: center;
+            flex-direction: column;
+            align-items: center;
+            position: relative;
+            padding: 0 40px;
+
+            .img {
+                width: 100%;
+                height: 350px;
+                object-fit: contain;
+                padding-top: 140px;
             }
-            .bottom {
+
+            .icon {
+                width: 70px;
+                height: 70px;
+                object-fit: contain;
+                position: absolute;
+                top: 140px;
+                right: 40px;
+                z-index: 999;
+            }
+
+            .status {
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+                align-content: space-between;
+                justify-content: space-between;
                 width: 100%;
-                position: relative;
+                margin: 40px 0;
+
                 p {
-                    text-align: center;
-                    color: #35a556;
+                    font-size: 30px;
+                    color: #434144;
+                    font-weight: bold;
                 }
-                div{
-                    position: absolute;
-                    top: 50%;
-                    right: 0;
-                    transform: translatey(-50%);
+
+                ul {
                     display: flex;
                     flex-wrap: wrap;
                     align-items: center;
                     justify-content: flex-start;
-                    span{
-                        color: #35a556;
-                        font-size: 24px;
+
+                    li {
+                        width: 40px;
+                        height: 20px;
+                        border-radius: 60px;
+                        position: relative;
+
+                        &+li {
+                            margin-left: 10px;
+                        }
+
+                        &.toobad {
+                            background-color: #ff5f8b;
+
+                            &:after {
+                                background-color: #ff5f8b;
+                            }
+                        }
+
+                        &.ordinary {
+                            background-color: #2ea7e0;
+
+                            &:after {
+                                background-color: #2ea7e0;
+                            }
+                        }
+
+                        &.sameas {
+                            background-color: #8dc21f;
+
+                            &:after {
+                                background-color: #8dc21f;
+                            }
+                        }
+
+                        &.excellent {
+                            background-color: #179b3b;
+
+                            &:after {
+                                background-color: #179b3b;
+                            }
+                        }
+
+                        &.active {
+                            width: 120px;
+
+                            &:after {
+                                opacity: 1;
+                            }
+
+                            &:before {
+                                opacity: 1;
+                            }
+                        }
+
+                        &:after {
+                            content: '';
+                            display: block;
+                            position: absolute;
+                            top: 50%;
+                            left: 50%;
+                            transform: translateX(-50%) translateY(-50%);
+                            width: 40px;
+                            height: 40px;
+                            opacity: 0;
+                            border-radius: 50%;
+                        }
+
+                        &:before {
+                            content: '';
+                            display: block;
+                            position: absolute;
+                            top: 50%;
+                            left: 50%;
+                            transform: translateX(-50%) translateY(-50%);
+                            width: 25px;
+                            height: 25px;
+                            opacity: 0;
+                            border-radius: 50%;
+                            background-color: #fff;
+                            z-index: 2;
+                        }
                     }
+                }
+            }
+
+            .interpret {
+                padding: 50px 20px;
+                border-radius: 40px;
+                border: 1px solid $com_light_green;
+                width: calc(100% - 40px);
+
+                .no-text {
+                    position: relative;
+                    width: 100%;
+                    @include center();
+                    flex-direction: column;
+
                     img {
-                        width: 40px;
-                        height: 40px;
-                        object-fit: contain;
-                        margin-left: 10px;
+                        height: 220px;
+                        width: 350px;
+                    }
+
+                    p {
+                        @include colorAndFont(#999, 28);
+                    }
+                }
+
+                p {
+                    font-size: 28px;
+                    color: #434144;
+                    white-space: pre-line;
+                    padding: 10px 0;
+                }
+
+                .bottom {
+                    width: 100%;
+                    position: relative;
+
+                    p {
+                        text-align: center;
+                        color: $com_light_green;
+                    }
+
+                    div {
+                        position: absolute;
+                        top: 50%;
+                        right: 0;
+                        transform: translatey(-50%);
+                        display: flex;
+                        flex-wrap: wrap;
+                        align-items: center;
+                        justify-content: flex-start;
+
+                        span {
+                            color: $com_light_green;
+                            font-size: 24px;
+                        }
+
+                        img {
+                            width: 40px;
+                            height: 40px;
+                            object-fit: contain;
+                            margin-left: 10px;
+                        }
                     }
                 }
             }
         }
-    }
-    .title {
-        display: flex;
-        flex-wrap: wrap;
-        align-items: center;
-        align-content: space-between;
-        justify-content: space-between;
-        p {
-            font-size: 30px;
-            color: #434144;
-            font-weight: bold;
-        }
-        >div {
+
+        .title {
             display: flex;
             flex-wrap: wrap;
             align-items: center;
-            justify-content: flex-start;
+            align-content: space-between;
+            justify-content: space-between;
+
             p {
-                margin-right: 10px;
+                font-size: 30px;
+                color: #434144;
+                font-weight: bold;
             }
+
             >div {
                 display: flex;
                 flex-wrap: wrap;
                 align-items: center;
                 justify-content: flex-start;
+
                 p {
-                    font-size: 26px;
-                    color: #fff;
-                    background-color: #179b3b;
-                    border-radius: 20px;
-                    padding: 8px 20px;
                     margin-right: 10px;
-                    font-weight: normal;
-                }
-            }
-        }
-    }
-    .emotion {
-        padding:0 40px;
-        margin-top: 60px;
-        ul {
-            display: flex;
-            flex-wrap: wrap;
-            align-items: center;
-            align-content: space-between;
-            justify-content: space-between;
-            margin-top: 30px;
-            li {
-                width: 25%;
-                border-radius: 40px;
-                padding: 20px;
-                &:nth-of-type(1) {
-                    background-color: #179b3b;
-                }
-                &:nth-of-type(2) {
-                    background-color: #ff5f8b;
-                }
-                &:nth-of-type(3) {
-                    background-color: #8dc21f;
-                }
-                h4 {
-                    color: #fff;
-                    font-size: 50px;
-                    font-weight: normal;
-                }
-                p {
-                    color: #fff;
-                    font-size: 32px;
-                    margin-top: 0px;
-                }
-                span {
-                    color: #fff;
-                    font-size: 24px;
-                    border-top: 1px solid #fff;
-                    padding-top: 12px;
-                }
-                time {
-                    color: #fff;
-                    font-size: 24px;
-                    display: block;
-                }
-            }
-        }
-    }
-    .perception {
-        padding:0 40px;
-        margin-top: 60px;
-        ul {
-            display: flex;
-            flex-wrap: wrap;
-            align-items: center;
-            align-content: space-between;
-            justify-content: space-between;
-            margin-top: 30px;
-            li {
-                width: 25%;
-                border-radius: 40px;
-                padding: 20px;
-                padding-bottom: 80px;
-                &:nth-of-type(1) {
-                    background-color: #179b3b;
                 }
-                &:nth-of-type(2) {
-                    background-color: #ff5f8b;
-                }
-                &:nth-of-type(3) {
-                    background-color: #8dc21f;
-                }
-                h4 {
-                    color: #fff;
-                    font-size: 46px;
-                    font-weight: normal;
-                }
-                p {
-                    color: #fff;
-                    font-size: 30px;
-                    margin-top: 0px;
-                }
-                time {
-                    color: #fff;
-                    font-size: 24px;
-                    display: block;
+
+                >div {
+                    display: flex;
+                    flex-wrap: wrap;
+                    align-items: center;
+                    justify-content: flex-start;
+
+                    p {
+                        font-size: 26px;
+                        color: #fff;
+                        background-color: #179b3b;
+                        border-radius: 20px;
+                        padding: 8px 20px;
+                        margin-right: 10px;
+                        font-weight: normal;
+                    }
                 }
             }
         }
-        .tip {
-            margin-top: 30px;
-            display: flex;
-            justify-content: flex-start;
-            border-bottom: 1px solid #dfdfdf;
-            padding-bottom: 40px;
-            img {
-                width: 29px;
-                height: 47px;
-                object-fit: contain;
-                margin-right: 30px;
-            }
-            p {
-                font-size: 28px;
-                color: #434144;
-                line-height: 1.5em;
-                span {
-                    color: #edb21d;
+
+        .emotion {
+            padding: 0 40px;
+            margin-top: 60px;
+            margin-bottom: 40px;
+
+            ul {
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+                align-content: space-between;
+                justify-content: space-between;
+                margin-top: 30px;
+
+                li {
+                    width: 25%;
+                    border-radius: 40px;
+                    padding: 20px;
+
+                    &:nth-of-type(1) {
+                        background-color: #179b3b;
+                    }
+
+                    &:nth-of-type(2) {
+                        background-color: #ff5f8b;
+                    }
+
+                    &:nth-of-type(3) {
+                        background-color: #8dc21f;
+                    }
+
+                    h4 {
+                        color: #fff;
+                        font-size: 50px;
+                        font-weight: normal;
+                    }
+
+                    p {
+                        color: #fff;
+                        font-size: 32px;
+                        margin-top: 0px;
+                    }
+
+                    span {
+                        color: #fff;
+                        font-size: 24px;
+                        border-top: 1px solid #fff;
+                        padding-top: 12px;
+                    }
+
+                    time {
+                        color: #fff;
+                        font-size: 24px;
+                        display: block;
+                    }
                 }
             }
         }
-    }
-    .step {
-        padding:0 40px;
-        margin-top: 50px;
-        .main {
-            border-radius: 30px;
-            border: 1px solid #179b3b;
-            padding: 40px 30px;
-            display: flex;
-            align-items: center;
-            align-content: space-between;
-            justify-content: space-between;
+
+        .perception {
+            padding: 0 40px;
+            margin-top: 60px;
+
             ul {
+                display: flex;
+                flex-wrap: wrap;
+                align-items: center;
+                align-content: space-between;
+                justify-content: space-between;
+                margin-top: 30px;
+
                 li {
-                    .specific {
-                        font-size: 40px;
-                        color: #434144;
-                        span {
-                            font-weight: bold;
-                        }
+                    width: 25%;
+                    border-radius: 40px;
+                    padding: 50px 20px;
+                    /*  padding-bottom: px2rem(80); */
+                    display: flex;
+                    align-items: flex-start;
+                    justify-content: center;
+                    flex-direction: column;
+
+                    &:nth-of-type(1) {
+                        background-color: #179b3b;
                     }
-                    .category {
-                        font-size: 28px;
-                        color: #434144;
-                        font-weight: bold;
-                        margin-top: 6px;
-                        span {
-                            font-weight: normal;
-                            padding: 5px 15px;
-                            background-color: #434144;
-                            color: #fff;
-                            font-size: 24px;
-                            border-radius: 20px;
-                            margin-left: 10px;
-                        }
+
+                    &:nth-of-type(2) {
+                        background-color: #ff5f8b;
                     }
-                    & + li {
-                        margin-top: 40px;
+
+                    &:nth-of-type(3) {
+                        background-color: #8dc21f;
+                    }
+
+                    h4 {
+                        color: #fff;
+                        font-size: 46px;
+                        font-weight: normal;
+                    }
+
+                    p {
+                        color: #fff;
+                        font-size: 30px;
+                        margin-top: 0px;
+                    }
+
+                    time {
+                        color: #fff;
+                        font-size: 24px;
+                        display: block;
                     }
                 }
             }
-            .annular {
-                width: 50%;
-                position: relative;
-                transform: rotate(180deg);
-                .van-circle {
-                    position: absolute;
-                    top: 50%;
-                    left: 50%;
-                    transform: translateX(-50%) translateY(-50%);
+
+            .tip {
+                margin-top: 30px;
+                display: flex;
+                justify-content: flex-start;
+                border-bottom: 1px solid #dfdfdf;
+                padding-bottom: 40px;
+
+                img {
+                    width: 29px;
+                    height: 47px;
+                    object-fit: contain;
+                    margin-right: 30px;
                 }
+
                 p {
-                    position: absolute;
-                    top: 50%;
-                    left: 50%;
-                    transform: translateX(-50%) translateY(-50%) rotate(180deg);
                     font-size: 28px;
                     color: #434144;
-                    font-weight: bold;
+                    line-height: 1.5em;
+
+                    span {
+                        color: #edb21d;
+                    }
                 }
             }
         }
-    }
-    .diary {
-        padding:0 40px;
-        margin: 50px 0;
-        .main {
-            width: 100%;
-            .van-checkbox-group {
-                width: 100%;
-                margin-top: 50px;
+
+        .step {
+            padding: 0 40px;
+            margin-top: 50px;
+
+            .main {
+                border-radius: 30px;
+                border: 1px solid #179b3b;
+                padding: 40px 30px;
                 display: flex;
-                flex-wrap: wrap;
                 align-items: center;
                 align-content: space-between;
                 justify-content: space-between;
-            }
-            .van-checkbox {
-                width: 26%;
-                min-width: 88px;
-                &:nth-of-type(n+4) {
-                    margin-top: 40px;
-                }
-                .van-checkbox__label img {
-                    width: 30px;
+
+                ul {
+                    li {
+                        .specific {
+                            font-size: 40px;
+                            color: #434144;
+
+                            span {
+                                font-weight: bold;
+                            }
+                        }
+
+                        .category {
+                            font-size: 28px;
+                            color: #434144;
+                            font-weight: bold;
+                            margin-top: 6px;
+
+                            span {
+                                font-weight: normal;
+                                padding: 5px 15px;
+                                background-color: #434144;
+                                color: #fff;
+                                font-size: 24px;
+                                border-radius: 20px;
+                                margin-left: 10px;
+                            }
+                        }
+
+                        &+li {
+                            margin-top: 40px;
+                        }
+                    }
                 }
-            }
-            .textarea {
-                border-radius: 40px;
-                border: 1px solid #179b3b;
-                margin-top: 30px;
-                overflow: hidden;
-                textarea {
-                    width: 100%;
-                    padding: 30px;
-                    font-size: 28px;
+
+                .annular {
+                    width: 50%;
+                    position: relative;
+                    transform: rotate(180deg);
+
+                    .van-circle {
+                        position: absolute;
+                        top: 50%;
+                        left: 50%;
+                        transform: translateX(-50%) translateY(-50%);
+                    }
+
+                    p {
+                        position: absolute;
+                        top: 50%;
+                        left: 50%;
+                        transform: translateX(-50%) translateY(-50%) rotate(180deg);
+                        font-size: 28px;
+                        color: #434144;
+                        font-weight: bold;
+                    }
                 }
             }
         }
-    }
-    .knowledge {
-        padding: 0 0 40px 40px;
-        .main {
-            width: 100%;
-            overflow-x: scroll;
-            ul {
-                width: max-content;
-                margin-top: 30px;
-                display: flex;
-                flex-wrap: wrap;
-                align-items: center;
-                justify-content: flex-start;
-                li {
-                    width: 480px;
-                    background-color: #179b3b;
-                    padding: 40px;
-                    border-radius: 50px;
+
+        .diary {
+            padding: 0 40px;
+            margin: 50px 0;
+
+            .main {
+                width: 100%;
+
+                .van-checkbox-group {
+                    width: 100%;
+                    margin-top: 50px;
                     display: flex;
+                    flex-wrap: wrap;
                     align-items: center;
                     align-content: space-between;
                     justify-content: space-between;
-                    & + li {
-                        margin-left: 30px;
+                }
+
+                .van-checkbox {
+                    width: 26%;
+                    min-width: 88px;
+
+                    &:nth-of-type(n+4) {
+                        margin-top: 40px;
                     }
-                    p {
-                        width: 55%;
+
+                    .van-checkbox__label img {
+                        width: 30px;
+                    }
+                }
+
+                .textarea {
+                    border-radius: 40px;
+                    border: 1px solid #179b3b;
+                    margin-top: 30px;
+                    overflow: hidden;
+
+                    textarea {
+                        width: 100%;
+                        padding: 30px;
                         font-size: 28px;
-                        color: #fff;
-                        white-space: pre-line;
                     }
-                    img {
-                        height: 140px;
-                        object-fit: contain;
+                }
+            }
+        }
+
+        .knowledge {
+            padding: 0 0 40px 40px;
+
+            .main {
+                width: 100%;
+                overflow-x: scroll;
+
+                ul {
+                    width: max-content;
+                    margin-top: 30px;
+                    display: flex;
+                    flex-wrap: wrap;
+                    align-items: center;
+                    justify-content: flex-start;
+
+                    li {
+                        width: 480px;
+                        background-color: #179b3b;
+                        padding: 40px;
+                        border-radius: 50px;
+                        display: flex;
+                        align-items: center;
+                        align-content: space-between;
+                        justify-content: space-between;
+
+                        &+li {
+                            margin-left: 30px;
+                        }
+
+                        p {
+                            width: 55%;
+                            font-size: 28px;
+                            color: #fff;
+                            white-space: pre-line;
+                        }
+
+                        img {
+                            height: 40px;
+                            object-fit: contain;
+                        }
                     }
                 }
             }
         }
     }
-}
+
+    .bind-tips {
+        position: fixed;
+        bottom: 100px;
+        left: 0;
+        width: 100%;
+        overflow: hidden;
+
+        .con {
+            width: 100%;
+            padding: 15px 0;
+            @include center();
+            background-color: $next;
+        }
+
+        p {
+            font-size: 32px;
+            color: #fff;
+        }
+    }
+
+    .no-data {
+        @include center();
+        flex-direction: column;
+
+        img {
+            height: 220px;
+            width: 350px;
+        }
+
+        p {
+            @include colorAndFont(#999, 28);
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src/views/today/signsDetails.vue b/src/views/today/signsDetails.vue
index d4998f5..056ad02 100644
--- a/src/views/today/signsDetails.vue
+++ b/src/views/today/signsDetails.vue
@@ -1,35 +1,61 @@
-<!--  -->
 <template>
-  <div class="signs">
-    <NavBar title="心率监测" @on-click-left="onNavBack" right-text="历史"> </NavBar>
-    <div class="main">
-      <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 timeList"
-              :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>
-            <!-- <img :src="dateImg" alt="" /> -->
+  <div class="psychological-container">
+    <van-nav-bar
+      title="体征监测"
+      @click-left="onNavBack"
+      right-text="历史"
+      @click-right="onHistory"
+      left-text="返回"
+      left-arrow
+    >
+    </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>
+
+    <div class="main" v-show="current !== 3">
+      <!-- <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> -->
       <div class="top">
         <!-- 日期选择 -->
         <!-- 标题 -->
         <div class="title">
-          <div class="title-left">
-            {{ titleLeft }}
-          </div>
-          <!-- <div class="title-right" v-show="currentDays === 0">
-            <p @click="onHistory">历史监测</p>
+          <!-- <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>
         <!-- 日历 -->
 
@@ -62,13 +88,13 @@
         </van-dialog>
 
         <!-- 监测次数 -->
-        <div class="monitoring-count">
-          <p>监测次数：{{ monitoringCount || '0' }}次</p>
+        <div class="monitoring-count" v-show="current === 0">
+          <p>{{ currentDesc || '--' }}</p>
         </div>
 
         <!-- 折线图-非日报 -->
 
-        <div class="pie-chart-con">
+        <div class="pie-chart-con" v-show="current !== 0">
           <div class="pie-chart-left">
             <div id="pieChart" ref="pieChart"></div>
           </div>
@@ -77,195 +103,333 @@
             <div class="list">
               <div class="item" v-for="(item, index) in pieRightList" :key="index">
                 <div class="item-left">
-                  <div class="item-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>
-                  <label :style="{ color: item.color }">{{
-                    item.percentage ? '(' + item.percentage + '%' + ')' : '(0%)'
-                  }}</label>
+                  <span :style="{ color: item.color }">{{ item.count ? item.count + unit : `0${unit}` }}</span>
+                  <label :style="{ color: item.color }">{{ '(' + item.percentage + ')' }}</label>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="week-month" v-show="true"></div>
-      <div class="statistics">
-        <div class="list">
-          <div
-            class="item"
-            v-for="(item, index) in statisticsList"
-            :key="index"
-            :style="{ backgroundColor: item.bgColor }"
-          >
-            <div class="middle">
-              <span :style="{ color: '#fff' }">{{ item.value || '--' }}</span>
-            </div>
-            <div class="top">
-              <span>{{ item.label || '--' }}</span>
-            </div>
-            <div class="line"></div>
-            <div class="bottom">
-              <span>{{ item.time || '--' }}</span>
+
+        <!-- 非7天30天显示 -->
+        <div class="circle-con" v-show="current === 0">
+          <div class="out-circle">
+            <van-circle
+              v-model="currentCircle"
+              layer-color="#f1f0ff"
+              :rate="circleRate"
+              :speed="100"
+              clockwise
+              :color="calcColorByTypeAndValue(this.healthyType, this.resultLevel, 2)"
+              stroke-linecap="butt"
+              stroke-width="120"
+            >
+              <template #default>
+                <div class="circle-text">
+                  <p class="left">{{ todayValue || '--' }}</p>
+                  <p class="right">{{ signUnit }}</p>
+                </div>
+              </template>
+            </van-circle>
+
+            <div
+              class="circle-white"
+              :style="{
+                borderColor: calcColorByTypeAndValue(this.healthyType, this.resultLevel, 2)
+              }"
+            ></div>
+          </div>
+          <div class="progress">
+            <div
+              class="progress-circle"
+              :style="{
+                borderColor: calcColorByTypeAndValue(this.healthyType, this.resultLevel, 2),
+                left: this.progressCircle
+              }"
+              v-show="todayValue != ''"
+            ></div>
+            <div class="state-item" v-for="(item, index) in statesList" :key="index">
+              <div :class="['state-line', item.state]" :style="{ backgroundColor: item.color }"></div>
+              <div class="state-text">
+                <span :style="{ color: item.color }"> {{ item.text }} </span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="warn-tips">
-        <div class="left">
-          <img :src="warnImg" alt="" />
+        <!-- 统计 -->
+
+        <div class="statistics" v-show="psyCurrent !== 2">
+          <div class="list">
+            <div
+              class="item"
+              v-for="(item, index) in statisticsList"
+              :key="index"
+              :style="{ backgroundColor: item.bgColor }"
+            >
+              <div class="top">
+                <span>{{ item.label || '--' }}</span>
+              </div>
+
+              <div class="middle">
+                <span>{{ item.value || '--' }}</span>
+              </div>
+
+              <div class="bottom">
+                <span>{{ item.time || '--' }}</span>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="right">
+        <div class="tip">
+          <img class="img" src="@/assets/today/icons/2_25.png" />
           <p>
-            <span class="orange">温馨提示: </span>检测数据仅供参考，<span class="orange"
-              >不可做医疗诊断和治疗依据。</span
-            >
+            <span>温馨提示：</span
+            >检测数据仅供参考，<span>不可做医疗诊断和治疗依据</span>，在运动、工作等场景会影响健康检测。
           </p>
         </div>
       </div>
-
-      <div class="tab-bar">
-        <div class="date-tab-con">
-          <div class="date-tab-list">
+      <!-- 分割线 -->
+      <!-- 情绪切换 -->
+      <div class="psy-tab-bar">
+        <div class="psy-tab-con">
+          <div class="psy-tab-list">
             <div
-              :class="['date-tab-item', { active: signCurrent === index, notClick: false }]"
-              @click="onTabClickSign(index)"
-              v-for="(item, index) in signList"
+              :class="['psy-tab-item', { active: psyCurrent === index, notClick: false }]"
+              @click="onPsyTabClick(item, index)"
+              v-for="(item, index) in psyList"
               :key="index"
             >
               <span>{{ item.text }}</span>
             </div>
-            <!-- <img :src="dateImg" alt="" /> -->
           </div>
         </div>
       </div>
-      <div class="echart-container">
-        <div class="echart">
-          <EchartBox
-            echartId="lineChart"
-            :outTitle="emoLegend.outTitle"
-            height="200"
-            width="200"
-            :legend="emoLegend"
-            :options="defaultOptions"
-          ></EchartBox>
-        </div>
-      </div>
+      <!-- <div class="line"></div> -->
+      <!-- 底部 -->
       <div class="bottom">
-        <div class="result">
+        <div class="echart-container">
+          <div class="echart">
+            <EchartBox
+              echartId="charts"
+              :outTitle="emoLegend.outTitle"
+              rightRowType="in-line-block"
+              height="200"
+              width="200"
+              :legend="emoLegend"
+              :options="defaultOptions"
+            ></EchartBox>
+          </div>
+        </div>
+
+        <div class="line-gray"></div>
+
+        <div class="result" v-show="false">
           <div class="result-con">
             <div class="title">
               <span class="title-no-data">结果解读</span>
+              <div class="no-data">
+                <img :src="noDataImg" alt />
+                <p>暂无数据</p>
+              </div>
             </div>
-            <div class="status">
-              <p>心率正常</p>
-              <ul>
-                <li class="ordinary"></li>
-                <li class="excellent active"></li>
-                <li class="toobad"></li>
-              </ul>
+          </div>
+        </div>
+
+        <div class="result">
+          <div class="result-con reminder" v-show="current === 0 && result != ''">
+            <div class="title">
+              <span class="title-reminder">结果解读</span>
+
+              <p class="title-emo" :style="{ color: currentColor }">
+                {{ result }}
+              </p>
+
+              <span class="font-28"
+                ><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{ advice }}</span
+              >
             </div>
-            <div class="tips">
-              <span>您的心率属于正常水平值，请继续保持注意合理膳食，少吃太甜太 咸的东西，少吃高热量食物。</span>
+
+            <!--  <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="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"
+                  :style="{ backgroundColor: item.color }"
+                >
+                  <p>
+                    <span 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="noDataImg" alt />
+                  <p>暂无数据</p>
+                </div>
+              </div>
             </div>
           </div>
         </div>
-        <div class="wran-tips">
-          <p class="tips-title">温馨提示：</p>
-          <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 NavBar from '@/components/NavBar';
-import { EmotionModel, PsyBaseUrl } from '@/config/models';
-import axios from 'axios';
+    
+    <script>
+import { Signsmodel } from '@/config/models';
 import EchartBox from '@/components/EchartBox';
 import ToastService from '@/services/toast-service';
+/* import DialogService from "../../services/dialog-service"; */
+import APIHealthUser from '@/api/health-user';
+/* import { isNull } from "@/services/utils-service"; */
 export default {
+  name: 'psychological-monitor',
   components: {
-    NavBar,
     EchartBox
   },
   data() {
     return {
-      currentRateOut: 100,
-      systolicRate: 50,
-      monitoringCount: '', //监测次数
-      circleBpm: require('@/assets/today/icons/2_33.png'),
-      // 状态条
-      statesList: [
-        { color: '#2ea7e0', text: '偏低', state: 'low' },
-        { color: '#189b3b', text: '正常', state: 'normal' },
-        { color: '#ff5f8b', text: '偏高', state: 'hight' }
-      ],
-      // 情绪状态列表
-      statisticsList: [
-        /* { label: '最低心率', value: '75', time: '08:15', bgColor: '#2ea7e0' },
-        { label: '最高心率', value: '148', time: '10:15', bgColor: '#189b3b' },
-        { label: '平均心率', value: '50', time: '18:15', bgColor: '#ff5f8b' } */
-      ],
-      warnImg: require('@/assets/today/icons/2_25.png'),
-      timeList: [
+      currentCircle: 0, //外圈圆的进度值
+      // 日期选择标签
+      dateList: [
         { name: 'today', text: '今天', value: 0 },
-        { name: 'week', text: '7天', value: 7 },
-        { name: 'month', text: '30天', value: 30 }
+        { name: 'week', text: '7天', value: 1 },
+        { name: 'month', text: '30天', value: 2 }
+        /* { name: 'weekReport', text: '周报', value: 49 } */
       ],
-      // 日期选择标签
-      dateList: [],
-      tabImgUrl: require('@/assets/today/icons/statistical_form.png'),
-      selectDownImg: require('@/assets/today/icons/select_down.png'),
-      dateImg: require('@/assets/today/icons/2_12.png'),
+      // 情绪tab
+      psyList: [
+        { name: 'temperature', text: '体温', value: 1 },
+        { name: 'heartrate', text: '心率', value: 0 },
+        { name: 'step', text: '步数', value: 2 }
+      ],
+      // 当前情绪下标
+      psyCurrent: 0,
       current: 0, // 日期选择标签-当前选中的标签
       currentDays: 0, //日期选择标签-日期参数
-      emotionData: [],
+      emotionData: [], //情绪数据，TODO 接口对接
+      echarts: null, //折线图
+      itemHeight: Number(((document.body.clientWidth / 750) * 95).toFixed()), // 日历组件item高度
       xAxisData: [], //图表x轴展示的数据
-      echarts: null,
-      signCurrent: 0,
-      calendarDialogShow: false,
+      monitoringCount: '', //监测次数
+      pieEcharts: null, //饼状图
+      pieData: [], //饼状图数据
       //饼状图右边数据,TODO 根据接口数据和 模块 重新封装数组
       pieRightList: [
         /* {
-          text: '无情绪倾向',
-          count: 12,
-          percentage: '80',
-          color: '#179b3b'
-        },
-        {
-          text: '轻度情绪倾向',
-          count: 2,
-          percentage: '80',
-          color: '#8dc21f'
-        },
-        {
-          text: '中度情绪倾向',
-          count: 1,
-          percentage: '80',
-          color: '#2ea7e0'
-        },
-        {
-          text: '重度情绪倾向',
-          count: 1,
-          percentage: '80',
-          color: '#ff5f8b'
-        } */
+                        text: "无情绪倾向",
+                        count: 12,
+                        percentage: "80",
+                        color: "#179b3b"
+                    },
+                    {
+                        text: "轻度情绪倾向",
+                        count: 2,
+                        percentage: "80",
+                        color: "#8dc21f"
+                    },
+                    {
+                        text: "中度情绪倾向",
+                        count: 1,
+                        percentage: "80",
+                        color: "#2ea7e0"
+                    },
+                    {
+                        text: "重度情绪倾向",
+                        count: 1,
+                        percentage: "80",
+                        color: "#ff5f8b"
+                    } */
       ],
-      params: {},
-      emoName: '',
-      result: '',
-      // 需要高亮的日期数组
-      highlightDates: [],
+      // 情绪状态列表
+      statisticsList: [
+        /*  { label: "最大值", value: "75", time: "08:15" },
+                    { label: "最小值", value: "40", time: "10:15" },
+                    { label: "最近值", value: "50", time: "18:15" } */
+      ],
+      // 周报-情绪计算
+      emotionList: [
+        /*  { days: "5", text: "无情绪倾向", color: "#179b3b" },
+                    { days: "4", text: "轻度情绪倾向", color: "#8dc21f" },
+                    { days: "3", text: "中度情绪倾向", color: "#2ea7e0" },
+                    { 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: '',
@@ -276,6 +440,7 @@ export default {
       // 路由中的日期
       routeDate: '',
       // 路由参数
+      params: {},
       // 是否显示帮助
       isPopup: false,
       // 结果等级
@@ -288,118 +453,82 @@ export default {
       moderateColor: '#ff5f8b',
       // 7天和30天最大数据列表
       weekAndMonData: [],
+      tabImgUrl: require('@/assets/today/icons/statistical_form.png'),
+      selectDownImg: require('@/assets/today/icons/select_down.png'),
+      weekImg: require('@/assets/today/icons/week_report.png'),
+      moreImg: require('@/assets/today/icons/more.png'),
       noDataImg: require('@/assets/today/images/no_data_01.png'),
       weekList: [],
-      startDate: '', //接口需要的开始时间
-      endDate: '', //接口需要的结束时间
-      currentEmoName: '', //当前情绪名称
-      pieEcharts: null,
-      emotionList: [],
-      weekAndMonthSeries: null,
-      emoType: '',
-      pieData: []
+      //接口需要的开始时间
+      startDate: '',
+      //接口需要的结束时间
+      endDate: '',
+      //当前情绪名称
+      currentEmoName: '',
+      emotionDataNew: [],
+      todayValue: '',
+      currentDesc: '',
+      healthyType: 0
     };
   },
-  watch: {
-    /* emotionData: {
-      handler() {
-        this.initEchart();
-      },
-      deep: true
-    }, */
-    pieData: {
-      handler() {
-        this.initPieEchart();
-      },
-      deep: true
-    }
-  },
   computed: {
-    emoLegend() {
-      return {
-        title: '',
-        outTitle: `${this.emoName}数据图`,
-        list: [
-          { name: `无${this.emoName}倾向`, color: '#179b3b' },
-          { name: `轻度${this.emoName}倾向`, color: '#8dc21f' },
-          { name: `中度${this.emoName}倾向`, color: '#2ea7e0' },
-          { name: `重度${this.emoName}倾向`, color: '#ff5f8b' }
-        ]
-      };
+    unit() {
+      return this.healthyType === 2 ? '天' : '次';
     },
-    // 饼状图配置
-    pieOption() {
-      return {
-        tooltip: {
-          trigger: 'item',
-          textStyle: {
-            fontSize: 14
-          },
-          position: 'right'
-        },
-        legend: {
-          top: '5%',
-          left: 'center',
-          show: false
-        },
-        series: [
-          {
-            type: 'pie',
-            radius: ['40%', '90%'],
-            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 = '';
+    circleRate() {
+      if (this.healthyType == 0) {
+        // 心率
+        return this.calcPercentage(Number(this.todayValue), 180);
+      } else if (this.healthyType == 1) {
+        // 体温
+        return this.calcPercentage(Number(this.todayValue), 43);
+      } else if (this.healthyType == 2) {
+        // 步数
+        return this.calcPercentage(Number(this.todayValue), 20000);
       } else {
-        today =
-          this.$dayjs(this.selectDate || this.defaultDate).format('YYYY-MM-DD') ===
-          this.$dayjs(new Date()).format('YYYY-MM-DD')
-            ? '今天'
-            : '';
+        return 40;
       }
-      /*  return `${today}${this.emoName}倾向${text}`; */
-      return `${today}心率趋势`;
-    },
-    signList() {
-      return [
-        { name: 'heartRate', text: '心率' /* value: 0 */ },
-        { name: 'temperature', text: '体温' /* value: 7  */ },
-        { name: 'step', text: '运动' /* value: 30 */ }
-      ];
     },
-
-    echartsTitle() {
-      return '心率数据图';
+    progressCircle() {
+      return this.calcColorByTypeAndValue(this.healthyType, this.resultLevel, 1);
+    },
+    // 状态条
+    statesList() {
+      return Signsmodel[this.currentEmoName].progressTextList;
     },
+    emoLegend() {
+      if (this.healthyType === 0) {
+        return {
+          title: '',
+          outTitle: `${this.emoName}数据图`,
+          list: [
+            { name: `${this.emoName}偏低`, color: '#2ea7e0' },
+            { name: `${this.emoName}正常`, color: '#179b3b' },
+            { name: `${this.emoName}偏高`, color: '#ff5f8b' }
+          ]
+        };
+      } else if (this.healthyType === 1) {
+        return {
+          title: '',
+          outTitle: `${this.emoName}数据图`,
+          list: [
+            { name: `${this.emoName}正常`, color: '#179b3b' },
+            { name: `${this.emoName}偏高`, color: '#ff5f8b' }
+          ]
+        };
+      } else {
+        return {
+          title: '',
+          outTitle: `${this.emoName}数据图`,
+          list: [
+            { name: `${this.emoName}偏低`, color: '#2ea7e0' },
+            { name: `${this.emoName}正常`, color: '#179b3b' },
+            { name: `${this.emoName}偏高`, color: '#ff5f8b' }
+          ]
+        };
+      }
+    },
+    // 默认折线图配置，echarts 具体配置 见 https://echarts.apache.org/zh/option.html#title
     defaultOptions() {
       return {
         time: {
@@ -408,10 +537,10 @@ export default {
         grid: {
           show: true,
           borderWidth: 0,
-          top: '3%',
-          left: '1%',
-          right: '3%',
-          bottom: '15%',
+          top: '10%',
+          left: '5%',
+          right: '10%',
+          bottom: '20%',
           containLabel: true
         },
         xAxis: {
@@ -429,7 +558,7 @@ export default {
             show: false,
             lineStyle: {
               color: '#ddd',
-              width: 2
+              width: 4
             }
           },
           nameLocation: 'center',
@@ -437,16 +566,17 @@ export default {
             show: true,
             fontSize: 12,
             showMinLabel: true, //显示最小值
-            showMaxLabel: true //显示最大值
+            showMaxLabel: true, //显示最大值
+            marginBottom: 10 // 调整标签与轴线的距离
           },
           data: this.xAxisData
         },
         dataZoom: [
           /*  {
-                        type: "inside",
-                        start: 0,
-                        end: 100,
-                    }, */
+                            type: "inside",
+                            start: 0,
+                            end: 100,
+                        }, */
           {
             start: 0,
             end: 100,
@@ -456,9 +586,9 @@ export default {
             },
             show: true,
             height: 20,
-            bottom: 4,
+            bottom: 8,
             handleStyle: {
-              borderWidth: 1,
+              borderWidth: 4,
               borderCap: 'square'
             }
           }
@@ -466,7 +596,7 @@ export default {
         tooltip: {
           trigger: 'axis',
           textStyle: {
-            fontSize: 14,
+            fontSize: 16,
             align: 'center'
           },
           formatter: function (params) {
@@ -475,9 +605,9 @@ export default {
         },
         yAxis: {
           type: 'value',
-          max: 100,
+          /*  max: 100,
           min: 0,
-          interval: 20,
+          interval: 20, */
           splitNumber: 1,
           boundaryGap: ['5%', '5%'],
           nameTextStyle: {
@@ -503,14 +633,14 @@ export default {
           {
             name: `无${this.emoName}倾向`,
             type: 'line',
-            padding: 5,
+            padding: 10,
             smooth: true,
             data: this.emotionData,
             symbol: 'circle',
             symbolSize: 10,
             itemStyle: {
               color: '#fff',
-              borderWidth: 2
+              borderWidth: 4
             },
             lineStyle: {
               width: 6,
@@ -535,26 +665,149 @@ export default {
           }
         ]
       };
+    },
+    imei() {
+      return this.$store.getters.serialNo;
+    },
+    // 饼状图配置
+    pieOption() {
+      return {
+        tooltip: {
+          trigger: 'item',
+          textStyle: {
+            fontSize: 16
+          },
+          position: 'right'
+        },
+        legend: {
+          top: '5%',
+          left: 'center',
+          show: false
+        },
+        series: [
+          {
+            type: 'pie',
+            radius: ['40%', '90%'],
+            avoidLabelOverlap: false,
+            startAngle: 270, // 设置逆时针渲染
+            itemStyle: {
+              borderRadius: 10,
+              borderColor: '#fff',
+              borderWidth: 4,
+              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 = '';
+      } 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}分值，睡眠期间不进行计算。` */
+    },
+    title1() {
+      return Signsmodel[this.currentEmoName].title1;
+    },
+    article1() {
+      return Signsmodel[this.currentEmoName].article1;
+    },
+    title2() {
+      return Signsmodel[this.currentEmoName].title2;
+    },
+    article2() {
+      return Signsmodel[this.currentEmoName].article2;
+    },
+    signUnit() {
+      return Signsmodel[this.currentEmoName].unit;
+    },
+    // 当前情绪颜色
+    currentColor() {
+      return this.calcResultColor(this.resultLevel) || '#179b3b';
+    }
+  },
+  watch: {
+    // 监听数据发生变化 初始化各项图表
+    emotionData: {
+      handler() {
+        this.initEchart();
+      },
+      deep: true
+    },
+    xAxisData: {
+      handler() {
+        this.initEchart();
+      },
+      deep: true
+    },
+    pieData: {
+      handler() {
+        this.$nextTick(() => {
+          this.initPieEchart();
+        });
+      },
+      deep: true
     }
   },
   created() {
+    // 读取路由传过来的参数，根据路由传过来的参数判断是哪种情绪
     this.loadParams();
     this.initEchartText();
-    this.getPsychologiclData();
-    /* this.createList(); */
-    /* this.getPieData(); */
   },
   mounted() {
-    /*  this.initEchart(); */
-    this.initPieEchart();
+    this.psyCurrent = this.calcPsyTabindex(Signsmodel[this.params.name].type);
+    this.healthyType = Signsmodel[this.params.name].type;
+    this.getSignsData();
+    this.getCalendar();
   },
   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.emoName = Signsmodel[params.name].name;
+        /*  this.emoType = Signsmodel[params.name].type; */
         this.params = params;
         this.currentEmoName = params.name;
         if (params.date) {
@@ -576,12 +829,11 @@ export default {
     },
     // 初始化图表的文字内容
     initEchartText() {
-      this.result = `无${this.emoName}倾向`;
       this.defaultSeries = [
         {
           name: ``,
           type: 'line',
-          padding: 5,
+          padding: 10,
           data: this.emotionData,
           symbol: 'circle',
           symbolSize: 12, // 拐点圆的大小
@@ -606,395 +858,626 @@ export default {
           data: ''
         }
       ];
-      this.pieRightList = this.pieRightList.map(item => {
-        item.text = item.text.replace('情绪', this.emoName);
+      /*  this.pieRightList = this.pieRightList.map((item) => {
+        item.text = item.text.replace("情绪", this.emoName);
         return item;
-      });
+      }); */
     },
-    // 获取饼状图数据，TODO 对接接口数据
-    getPieData() {
-      this.pieData = [
-        { value: 12, name: '', itemStyle: { color: '#179b3b' } },
-        { value: 2, name: '', itemStyle: { color: '#8dc21f' } },
-        { value: 1, name: '', itemStyle: { color: '#2ea7e0' } },
-        { value: 1, name: '', itemStyle: { color: '#ff5f8b' } }
-      ];
+    calcPsyTabindex(type) {
+      let psyIndex = '';
+      switch (type) {
+        case 0:
+          psyIndex = 1;
+          break;
+        case 1:
+          psyIndex = 0;
+          break;
+        case 2:
+          psyIndex = 2;
+          break;
+        default:
+          break;
+      }
+      return psyIndex;
+    },
+    getCalendar() {
+      let reqParams = {
+        personId: this.$store.getters.personId
+      };
+      APIHealthUser.getCalendar(reqParams).then(res => {
+        console.log('当前健康类型是', this.healthyType);
+        console.log('日历数据', res);
+        let list = [];
+        let data = res.data.data;
+        if (this.healthyType === 0) {
+          list = data.heartRate;
+        } else if (this.healthyType === 1) {
+          list = data.temperature;
+        } else {
+          list = data.steps;
+        }
+        list = list.map(item => {
+          item.date = this.$dayjs(item.date.replace(/-/g, '/')).format('YYYY/MM/DD');
+          return item;
+        });
+        this.highlightDates = [...list];
+      });
     },
-    // 获取情绪数据
-    getPsychologiclData(date, startDate, endDate) {
+    getSignsData(date) {
       ToastService.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
+      this.pieRightList = [];
+      this.statisticsList = [];
+      this.emotionList = [];
+      this.emotionData = [];
+      this.xAxisData = [];
+      let reqBody = {
+        dateType: this.currentDays,
+        healthyType: this.healthyType,
+        startTime: date,
+        endTime: date
       };
-      console.log('请求参数', reqParams);
-      let reqUrl = `${PsyBaseUrl}/api/Data/GetHisData`;
-      axios
-        .get(reqUrl, {
-          params: { ...reqParams },
-          headers: { AccessToken: this.$store.getters.ssjlToken }
-        })
+      APIHealthUser.getHisData(reqBody)
         .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: '#179b3b'
-            };
-            let Mild = {
-              count: data.Mild,
-              percentage: this.calcPercentage(data.Mild, data.Count),
-              text: `轻度${this.emoName}倾向`,
-              color: '#8dc21f'
-            };
-            let Moderate = {
-              count: data.Moderate,
-              percentage: this.calcPercentage(data.Moderate, data.Count),
-              text: `中度${this.emoName}倾向`,
-              color: '#2ea7e0'
-            };
-            let Severe = {
-              count: data.Severe,
-              percentage: this.calcPercentage(data.Severe, data.Count),
-              text: `重度${this.emoName}倾向`,
-              color: '#ff5f8b'
-            };
-            // 饼状图右边数据
+          console.log('体征数据', res);
+          const data = res.data.data;
+          this.todayValue = data.value || '';
+          (this.currentDesc = data.valueTime
+            ? this.currentDays === 0
+              ? this.$dayjs(data.valueTime).format('YYYY-MM-DD HH:mm')
+              : this.$dayjs(data.valueTime).format('YYYY-MM-DD HH:mm')
+            : ''),
+            (this.monitoringCount = data.checkTotal);
+          this.resultLevel = data.resultLevel;
+          this.result = data.result;
+          this.advice = data.advice;
+
+          // 右边饼状图
+          let None = {
+            count: data.normalTimes,
+            percentage: data.normalPercent,
+            text: `${this.emoName}正常`,
+            color: '#179b3b'
+          };
+          let Moderate = {
+            count: data.lowTimes,
+            percentage: data.lowPercent,
+            text: `${this.emoName}偏低`,
+            color: '#2ea7e0'
+          };
+          let Severe = {
+            count: data.highTimes,
+            percentage: data.highPercent,
+            text: `${this.emoName}偏高`,
+            color: '#ff5f8b'
+          };
+          if (this.healthyType !== 1) {
             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')
-                : '',
-              bgColor: '#ff5f8b'
-            };
-            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')
-                : '',
-              bgColor: '#189b3b'
-            };
-            /* 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')
-                : '',
-              bgColor: '#2ea7e0'
-            };
-            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: '#179b3b'
-            };
-            let MildDay = {
-              days: data.MildDay,
-              text: `轻度${this.emoName}倾向`,
-              color: '#8dc21f'
-            };
-            let ModerateDay = {
-              days: data.ModerateDay,
-              text: `中度${this.emoName}倾向`,
-              color: '#2ea7e0'
-            };
-            let SevereDay = {
-              days: data.SevereDay,
-              text: `重度${this.emoName}倾向`,
-              color: '#ff5f8b'
+          } else {
+            this.pieRightList.push(None);
+            this.pieRightList.push(Severe);
+          }
+
+          this.pieData = this.pieRightList.map(item => {
+            item.value = item.count;
+            item.itemStyle = {
+              color: item.color
             };
+            return item;
+          });
+          console.log('this.pieRightList', this.pieRightList);
+          // 下方最大最小图
+          let Max = {
+            label: '最大值',
+            value: data.valueMax,
+            time: data.valueMaxTime
+              ? this.currentDays === 0
+                ? this.$dayjs(data.valueMaxTime).format('HH:mm')
+                : this.$dayjs(data.valueMaxTime).format('MM/DD HH:mm')
+              : '',
+            bgColor: /* this.calcBGColor(this.healthyType, data.valueMax) */ this.calcResultColor(data.levelMax)
+          };
+          let Min = {
+            label: '最小值',
+            value: data.valueMin,
+            time: data.valueMinTime
+              ? this.currentDays === 0
+                ? this.$dayjs(data.valueMinTime).format('HH:mm')
+                : this.$dayjs(data.valueMinTime).format('MM/DD HH:mm')
+              : '',
+            bgColor: /* this.calcBGColor(this.healthyType, data.valueMin) */ this.calcResultColor(data.levelMin)
+          };
+          let Avg = {
+            label: '平均值',
+            value: data.valueAvg || '--',
+            time: data.valueAvgTime
+              ? this.currentDays === 0
+                ? this.$dayjs(data.valueAvgTime).format('HH:mm')
+                : this.$dayjs(data.valueAvgTime).format('MM/DD HH:mm')
+              : '' || '--',
+            bgColor: /* this.calcBGColor(this.healthyType, data.valueAvg) */ this.calcResultColor(data.levelAvg)
+          };
+          this.statisticsList.push(Max);
+          this.statisticsList.push(Min);
+          this.statisticsList.push(Avg);
+          // 周报月报底部显示数据
+          let NoneDay = {
+            days: data.normalDays,
+            text: `${this.emoName}正常`,
+            color: '#179b3b'
+          };
+          let ModerateDay = {
+            days: data.lowDays,
+            text: `${this.emoName}偏低`,
+            color: '#2ea7e0'
+          };
+          let SevereDay = {
+            days: data.highDays,
+            text: `${this.emoName}偏高`,
+            color: '#ff5f8b'
+          };
+          // 体温不显示偏低
+          if (this.healthyType !== 1) {
             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: {
-                  borderColor: this.calcResultColor(item.Level)
-                }
-              };
+          } else {
+            this.emotionList.push(NoneDay);
+            this.emotionList.push(SevereDay);
+          }
+
+          if (!data.chartDatas) {
+            return;
+          }
+          // 中间折线图
+          this.emotionData = data.chartDatas
+            ? data.chartDatas.map(item => {
+                return {
+                  value: item.value || '--',
+                  itemStyle: {
+                    color: this.currentDays !== 0 && this.healthyType !== 2 ? this.calcResultColor(item.level) : '#fff',
+                    borderColor: this.calcResultColor(item.level),
+                    borderWidth: 3
+                  }
+                };
+              })
+            : [];
+          // 7天 和 30天柱形图显示
+          this.weekAndMonData = data.chartDatas
+            ? data.chartDatas.map((item, index) => {
+                return {
+                  value: [index, item.valueMin || '--', item.valueMax || '--']
+                };
+              })
+            : [];
+          console.log('this.weekAndMonData', this.weekAndMonData);
+          if (this.currentDays === 0) {
+            // 显示今天数据
+            this.xAxisData = data.chartDatas.map(item => {
+              return this.$dayjs(item.key.replace(/-/g, '/')).format('HH:mm');
             });
-            // 7天 和 30天柱形图显示
-            this.weekAndMonData = data.ChartDatas.map((item, index) => {
-              return {
-                value: [index, item.MinValue, item.MaxValue]
+            if (this.healthyType === 1) {
+              this.defaultOptions.yAxis.max = 43;
+              this.defaultOptions.yAxis.min = 34.5;
+              this.defaultOptions.yAxis.interval = 2;
+              // 体温的折线图
+              this.defaultOptions.series[0].markLine = {
+                data: [
+                  {
+                    type: 'average',
+                    name: '体温',
+                    yAxis: 37.2,
+                    label: {
+                      fontSize: 14,
+                      position: 'end'
+                    },
+                    lineStyle: {
+                      type: 'dashed',
+                      width: 5,
+                      color: 'red'
+                    }
+                  }
+                ]
               };
+            } else if (this.healthyType === 2) {
+              this.defaultOptions.yAxis.min = 0;
+            }
+          } else if (this.currentDays !== 0 && this.healthyType === 2) {
+            // 折线图显示，因为步数没有最大最小步数
+            this.xAxisData = data.chartDatas.map(item => {
+              return this.$dayjs(item.key.replace(/-/g, '/')).format('MM/DD');
             });
-            // 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 that = this;
-              // 7天和30天变成柱状图
-              this.weekAndMonthSeries = [
-                {
-                  name: '平均值',
-                  type: 'scatter',
-                  symbolSize: 14,
-                  data: this.emotionData
-                },
-                {
-                  name: '',
-                  type: 'custom',
-                  data: this.weekAndMonData,
-                  renderItem: function (params, api) {
-                    let categoryIndex = api.value(0);
-                    let end = api.coord([categoryIndex, api.value(1)]);
-                    let start = api.coord([categoryIndex, api.value(2)]);
-                    let width = 16;
-                    let rectShape = that.$echarts.graphic.clipRectByRect(
-                      {
-                        x: start[0] - width / 2,
-                        y: start[1],
-                        width: 16,
-                        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];
+            if (this.healthyType === 2) {
+              this.defaultOptions.yAxis.min = 0;
+            }
+          } else {
+            console.log('周月');
+            this.xAxisData = data.chartDatas.map(item => {
+              return this.$dayjs(item.key.replace(/-/g, '/')).format('MM/DD');
+            });
+            let that = this;
+            this.weekAndMonthSeries = [
+              {
+                name: '平均值',
+                type: 'scatter',
+                symbolSize: 14,
+                data: this.emotionData
+              },
+              {
+                name: '',
+                type: 'custom',
+                data: this.weekAndMonData,
+                renderItem: function (params, api) {
+                  let categoryIndex = api.value(0);
+                  console.log('categoryIndex', categoryIndex);
+                  let end = api.coord([categoryIndex, api.value(1)]);
+                  let start = api.coord([categoryIndex, api.value(2)]);
+                  let width = 16;
+                  console.log('end', end, 'start', start);
+                  let rectShape = that.$echarts.graphic.clipRectByRect(
+                    {
+                      x: start[0] - width / 2,
+                      y: start[1],
+                      width: 16,
+                      height: end[1] - start[1]
+                    },
+                    {
+                      x: params.coordSys.x,
+                      y: params.coordSys.y,
+                      width: params.coordSys.width,
+                      height: params.coordSys.height
                     }
-                    return (
-                      rectShape && {
-                        type: 'rect',
-                        shape: rectShape,
-                        style: api.style()
-                      }
-                    );
-                  },
-                  itemStyle: {
-                    opacity: 0.8
-                  },
-                  encode: {
-                    y: [1, 2],
-                    x: 0
+                  );
+                  if (rectShape) {
+                    rectShape.r = [20];
                   }
+                  return (
+                    rectShape && {
+                      type: 'rect',
+                      shape: rectShape,
+                      style: api.style()
+                    }
+                  );
                 },
-                {
-                  name: `轻度${this.emoName}倾向`,
-                  type: 'scatter',
-                  symbolSize: 12,
-                  data: ''
-                },
-                {
-                  name: `中度${this.emoName}倾向`,
-                  type: 'scatter',
-                  symbolSize: 12,
-                  data: ''
+                itemStyle: {
+                  opacity: 0.8
                 },
+                encode: {
+                  y: [1, 2],
+                  x: 0
+                }
+              },
+              {
+                name: `轻度${this.emoName}倾向`,
+                type: 'scatter',
+                symbolSize: 12,
+                data: ''
+              },
+              {
+                name: `中度${this.emoName}倾向`,
+                type: 'scatter',
+                symbolSize: 12,
+                data: ''
+              },
+              {
+                name: `重度${this.emoName}倾向`,
+                type: 'scatter',
+                symbolSize: 12,
+                data: ''
+              },
+              {
+                name: `无${this.emoName}倾向`,
+                type: 'scatter',
+                symbolSize: 12,
+                data: ''
+              }
+            ];
+            if (this.healthyType === 1) {
+              this.defaultOptions.yAxis.max = 43;
+              this.defaultOptions.yAxis.min = 34.5;
+              this.defaultOptions.yAxis.interval = 2;
+              /* this.weekAndMonthSeries[0].markLine = {
+              data: [
                 {
-                  name: `重度${this.emoName}倾向`,
-                  type: 'scatter',
-                  symbolSize: 12,
-                  data: ''
+                  type: "average",
+                  name: "体温",
+                  yAxis: 37.2,
+                  label: {
+                    fontSize: 28,
+                    position: "end",
+                  },
+                  lineStyle: {
+                    type: "dashed",
+                    width: 5,
+                    color: "red",
+                  },
                 },
-                {
-                  name: `无${this.emoName}倾向`,
-                  type: 'scatter',
-                  symbolSize: 12,
-                  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;
+              ],
+            }; */
+            } else if (this.healthyType === 2) {
+              this.defaultOptions.yAxis.min = 0;
             }
-            // 结果解读
-            this.result = data.Result;
-            this.resultLevel = data.ResultLevel;
-            this.advice = data.Advice;
-            ToastService.success({
-              message: '数据加载完成'
-            });
+            // 点击提示此时为空
+            this.defaultOptions.tooltip = {
+              trigger: 'axis',
+              textStyle: {
+                fontSize: 16
+              },
+              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;
           }
         })
-        .catch(error => {
-          console.log(error);
-        })
-        .finally(() => {});
+        .finally(() => {
+          ToastService.success({
+            message: '数据加载完成'
+          });
+        });
     },
-    // 计算结果采用哪种颜色
-    calcResultColor(value, isCallBackClass) {
+    onNavBack() {
+      this.$router.push({
+        name: 'Today'
+      });
+    },
+    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.dateType = 0;
+      this.current = 0;
+      this.currentDays = 0;
+      this.getSignsData(selectDate);
+    },
+    onClose() {},
+    // 点击日期选择
+    onTabClick(value, index) {
+      this.current = index;
+      this.currentDays = value;
+      this.surveyTitle = value > 0 ? (value === 1 ? '7天概览' : '30天概览') : '';
+      /*  this.defaultOptions.series = this.defaultSeries;
+      this.defaultOptions.series[0].data = this.emotionData;
+       */
+      if (this.selectDate && this.current === 0) {
+        this.getSignsData(this.selectDate);
+      } else {
+        this.getSignsData();
+      }
+    },
+    onPsyTabClick(item) {
+      this.healthyType = item.value;
+      this.psyCurrent = this.calcPsyTabindex(Signsmodel[item.name].type);
+      this.emoName = Signsmodel[item.name].name;
+      this.currentEmoName = item.name;
+      console.log('selectDate', this.selectDate);
+      if (this.selectDate && this.current === 0) {
+        this.dateType = 0;
+        this.getSignsData(this.selectDate);
+      } else {
+        this.getSignsData();
+      }
+      this.getCalendar();
+    },
+    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);
+    },
+    // 根据类型，和数值计算使用什么颜色
+    calcColorByTypeAndValue(type, value, callBack) {
+      let offset = '';
       let color = '';
-      let className = '';
-      switch (Number(value)) {
+      const intValue = Number(value);
+      switch (intValue) {
         case 0:
-          color = '#179b3b';
-          className = 'none';
+          offset = '15%';
+          color = '#2ea7e0';
           break;
         case 1:
-          color = '#8dc21f';
-          className = 'mild';
+          offset = type === 1 ? '22%' : '45%';
+          color = '#189b3b';
           break;
         case 2:
-          color = '#2ea7e0';
-          className = 'moderate';
+          color = '#ff5f8b';
+          offset = type === 1 ? '70%' : '75%';
           break;
         case 3:
           color = '#ff5f8b';
-          className = 'severe';
+          offset = type === 1 ? '70%' : '75%';
+          break;
+        default:
+          color = '#f1f0ff';
+          offset = '0%';
           break;
       }
-      return isCallBackClass ? className : color;
-    },
-    // 计算百分比
-    calcPercentage(value, total) {
-      if (typeof value !== 'number' || typeof total !== 'number' || total === 0) {
-        return 0;
+
+      if (callBack == 1) {
+        return offset;
+      } else {
+        return color;
       }
-      let milValue = value * 1000;
-      let milTotal = total * 1000;
-      return Math.round((milValue / milTotal) * 100);
     },
-    onNavBack() {
-      this.$router.push({
-        name: 'Today'
-      });
-    },
-    onTabClick(value, index) {
-      this.current = index;
-      this.currentDays = value;
-      this.$store.commit('tabClick', index);
-      let currentDate = new Date();
-      this.surveyTitle = value === 7 ? '7天概览' : '30天概览';
-      if (value === 7) {
-        let dateList = this.getPostDate(currentDate, 6, true);
-        this.getPsychologiclData('', dateList[0] /* '2023-11-15' */, dateList[1] /* '2023-11-21' */);
-        this.startDate = dateList[0] /* '2023-11-15' */;
-        this.endDate = dateList[1] /* '2023-11-21' */;
-      } 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') /* '2023-11-21' */
-        );
-        this.startDate = this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
-        this.endDate = this.$dayjs(currentDate).format('YYYY-MM-DD') /* '2023-11-21' */;
-      } 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] /* '2023-11-21' */, dateList[1] /* '2023-12-21' */);
-        this.startDate = dateList[0] /* '2023-11-21' */;
-        this.endDate = dateList[1] /* '2023-12-21' */;
+    // 计算背景颜色
+    calcBGColor(type, value) {
+      let color = '';
+      const intValue = Number(value);
+      if (type == 0) {
+        // 心率
+        if (intValue > 120) {
+          color = '#ff5f8b';
+        } else if (intValue < 40) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
+      } else if (type == 1) {
+        // 体温
+        if (intValue >= 37.3) {
+          color = '#ff5f8b';
+        } else if (intValue <= 34) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
+      } else {
+        // 步数 2
+        if (intValue >= 5000) {
+          color = '#ff5f8b';
+        } else if (intValue <= 3000) {
+          color = '#2ea7e0';
+        } else {
+          color = '#189b3b';
+        }
       }
+      return color;
     },
-    onTabClickSign(index) {
-      this.signCurrent = index;
-    },
-    createList() {
-      // 模拟数据
-      this.emotionData = [];
-      const colors = ['#189b3b', '#2ea7e0', '#ff5f8b'];
-      for (let i = 0; i < 10; i++) {
-        let value = Math.floor(Math.random() * 60) + 80;
-        let color = colors[Math.floor(Math.random() * colors.length)];
-        this.emotionData.push({
-          value,
-          itemStyle: {
-            borderColor: color
-          }
-        });
+    calcResultColor(value, isCallBackClass) {
+      let color = '';
+      let className = '';
+      switch (Number(value)) {
+        case 0:
+          color = '#2ea7e0';
+          className = 'moderate';
+          break;
+        case 1:
+          color = '#179b3b';
+          className = 'none';
+          break;
+        case 2:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+        case 3:
+          color = '#ff5f8b';
+          className = 'severe';
+          break;
+        default:
+          color = '#179b3b';
+          className = 'none';
+          break;
       }
+      return isCallBackClass ? className : color;
     },
     initEchart() {
-      if (this.echarts != null && this.echarts != '' && this.echarts != undefined) {
-        this.echarts.dispose();
+      /*  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); */
+    },
+    // 格式化日历日期显示参数
+    formatter(day) {
+      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 = '今天';
+        }
       }
-      this.echarts = this.$echarts.init(this.$refs.lineChart);
-      this.echarts.setOption(this.defaultOptions);
+      return day;
     }
   }
 };
 </script>
-<style scoped lang="scss">
-@import './scss//signs-details.scss';
-/* @import url(); 引入css类 */
+    
+  <style lang="scss">
+.calendar {
+  height: 800px;
+
+  .van-calendar {
+    height: 400px;
+    overflow: scroll;
+
+    .van-calendar__header {
+      display: none;
+    }
+    .van-calendar__days {
+      display: grid;
+      grid-template-columns: repeat(7, 1fr);
+    }
+    .van-calendar__days .van-calendar__day {
+      width: 27px;
+      height: 27px;
+      margin: 10px 5px;
+      font-size: 12px;
+
+      &.custom-calendar {
+        width: 27px;
+        height: 27px;
+        margin-left: 0 !important;
+      }
+
+      &.highlight-border {
+        border: 1px solid #62bd48;
+        width: 27px;
+        height: 27px;
+        border-radius: 50%;
+
+        &.none {
+          border: 1px solid #62bd48;
+        }
+
+        &.mild {
+          border: 1px solid #8dc21f;
+        }
+
+        &.moderate {
+          border: 1px solid #2ea7e0;
+        }
+
+        &.severe {
+          border: 1px solid #ff5f8b;
+        }
+      }
+    }
+
+    .van-calendar__selected-day {
+      width: 27px;
+      height: 27px;
+      border-radius: 50%;
+      font-size: 12px;
+    }
+  }
+}
+</style>
+    <style scoped lang="scss">
+@import './scss/emotion-details.scss';
 </style>
+    
\ No newline at end of file

From 119da56f8dead06ad22ba2003413c46428ae08c4 Mon Sep 17 00:00:00 2001
From: chenJinxu <2183691628@qq.com>
Date: Tue, 30 Jan 2024 17:15:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/optimize/index.vue | 155 ++++++++++++++++++-----------------
 1 file changed, 80 insertions(+), 75 deletions(-)

diff --git a/src/views/optimize/index.vue b/src/views/optimize/index.vue
index 6a3765a..281bb67 100644
--- a/src/views/optimize/index.vue
+++ b/src/views/optimize/index.vue
@@ -4,12 +4,8 @@
     <!-- 专家介绍 -->
     <div class="expert-box">
       <van-swipe indicator-color="white">
-        <van-swipe-item v-for="(item, index) in expertList" :key="index" @click="goExperts(item.id)">
-          <img src="@/assets/optimize/images/3_08_2.png" />
-          <div class="summary">
-            <h4>{{ item.name }}</h4>
-            <p>{{ item.title }}</p>
-          </div>
+        <van-swipe-item v-for="(item, index) in expertImages" :key="index" @click="goExperts(item.id)">
+          <img v-lazy="item.image" />
           <!-- <p>了解详情</p> -->
         </van-swipe-item>
       </van-swipe>
@@ -18,13 +14,23 @@
     <div class="parenting">
       <div class="title">
         <p>养育话题</p>
-        <a href="/">查看更多</a>
+        <a>查看更多</a>
       </div>
       <ul>
-        <li v-for="(item, index) in talkList" :key="index" @click="goTalk(item.id)">
-          <img :src="item.image" :alt="item.name" />
-          <p>{{item.name}}</p>
-          <span>{{item.summary}}</span>
+        <li>
+          <img src="@/assets/optimize/images/3_20.png" alt="拖延症" />
+          <p>拖延症</p>
+          <span>L1入门 12分钟</span>
+        </li>
+        <li>
+          <img src="@/assets/optimize/images/3_22.png" alt="沉迷网络" />
+          <p>沉迷网络</p>
+          <span>L1入门 40分钟</span>
+        </li>
+        <li>
+          <img src="@/assets/optimize/images/3_24.png" alt="不自信" />
+          <p>不自信</p>
+          <span>L1入门 25分钟</span>
         </li>
       </ul>
     </div>
@@ -35,16 +41,27 @@
       </div>
       <div class="main">
         <ul>
-          <li v-for="(item, index) in campList" :key="index" @click="goTrainingcamp(item.id)">
+          <li @click="goTrainingcamp(1)">
             <div class="left">
-              <p>{{item.name}}</p>
-              <span>{{item.summary}}</span>
+              <p>情绪管理控制</p>
+              <span>入门易学</span>
               <div>
-                <h5>会员价 ¥{{item.vipPrice}}</h5>
-                <s>¥{{item.price}}</s>
+                <h5>会员价 ¥998</h5>
+                <s>¥1288</s>
               </div>
             </div>
-            <img :src="item.cover" />
+            <img src="@/assets/today/images/2_42.png" />
+          </li>
+          <li @click="goTrainingcamp(2)">
+            <div class="left">
+              <p>情绪管理控制</p>
+              <span>入门易学</span>
+              <div>
+                <h5>会员价 ¥998</h5>
+                <s>¥1288</s>
+              </div>
+            </div>
+            <img src="@/assets/today/images/2_42.png" />
           </li>
         </ul>
       </div>
@@ -56,29 +73,55 @@
       </div>
       <div class="select">
         <ul>
-          <li v-for="(item, index) in expertList" :key="index" @click="switchPsychology(item.id)">
+          <li>
+            <img src="@/assets/optimize/icons/3_55.png" alt="" />
+          </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_58.png" alt="" />
+          </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_62.png" alt="" />
+          </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_66.png" alt="" />
+          </li>
+          <li>
             <img src="@/assets/optimize/icons/3_55.png" alt="" />
           </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_58.png" alt="" />
+          </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_62.png" alt="" />
+          </li>
+          <li>
+            <img src="@/assets/optimize/icons/3_66.png" alt="" />
+          </li>
         </ul>
       </div>
       <div class="main">
         <div class="top">
-          <p>{{psychologyInfo.name}}</p>
-          <span>{{psychologyInfo.title}}</span>
+          <p>黛建松</p>
+          <span>清华大学心理学教授</span>
           <img src="@/assets/optimize/images/3_48.png" alt="" />
         </div>
         <div class="bottom">
-          <!-- <h4>700人次<span>咨询</span>，<span>从业</span>8年</h4> -->
-          <h4>{{psychologyInfo.seek}}</h4>
+          <h4>700人次<span>咨询</span>，<span>从业</span>8年</h4>
           <ul>
-            <li v-for="(item, index) in psychologyInfo.labels" :key="index">{{item}}</li>
+            <li>焦虑</li>
+            <li>抑郁</li>
+            <li>儿童心理</li>
+            <li>亲子关系</li>
+            <li>青春期心理</li>
+            <li>家庭关系</li>
+            <li>压力管理</li>
           </ul>
           <div>
             <h5>
               <img src="@/assets/optimize/icons/location.png" alt="" />
-              <span>{{psychologyInfo.address}}</span>
+              <span>郴州市苏仙区</span>
             </h5>
-            <p>¥{{psychologyInfo.price}}</p>
+            <p>¥2480</p>
           </div>
         </div>
       </div>
@@ -90,8 +133,8 @@
 
 <script>
 import Vue from 'vue';
-import APIOptimize from '@/api/optimize';
 import TabBar from '@/components/TabBar';
+import expertImage from '@/assets/optimize/images/3_08.png';
 import { Swipe, SwipeItem, Lazyload } from 'vant';
 Vue.use(Lazyload);
 Vue.use(Lazyload, {
@@ -106,45 +149,21 @@ export default {
   },
   data() {
     return {
-      expertList: [],
-      talkList: [],
-      campList: [],
-      psychologyInfo: {}
+      expertImages: [
+        {
+          id: 1,
+          image: expertImage
+        },
+        {
+          id: 2,
+          image: expertImage
+        }
+      ]
     };
   },
-  created() {
-    this.init();
-  },
+  created() {},
   mounted() {},
   methods: {
-    init() {
-      // 专家列表
-      APIOptimize.getExpertList(0)
-        .then(res => {
-          this.expertList = res.data.data
-          this.psychologyInfo = this.expertList[0]
-          this.psychologyInfo.labels = this.psychologyInfo.labels.split('|');
-        })
-        .catch(e => {
-          console.log(e);
-        })
-      // 专家详情
-      APIOptimize.getTalkList(0)
-        .then(res => {
-          this.talkList = res.data.data
-        })
-        .catch(e => {
-          console.log(e);
-        })
-      // 训练营列表
-      APIOptimize.getCampList(0)
-        .then(res => {
-          this.campList = res.data.data
-        })
-        .catch(e => {
-          console.log(e);
-        })
-    },
     goExperts(id) {
       this.$router.push({
         name: 'experts',
@@ -153,14 +172,6 @@ export default {
         }
       });
     },
-    goTalk(id) {
-      this.$router.push({
-        name: 'talk',
-        query: {
-          id: id
-        }
-      });
-    },
     goTrainingcamp(id) {
       this.$router.push({
         name: 'trainingcamp',
@@ -168,12 +179,6 @@ export default {
           id: id
         }
       });
-    },
-    switchPsychology(id) {
-      this.psychologyInfo = this.expertList.find(item => item.id == id);
-      if ( typeof this.psychologyInfo.labels == 'string' ) {
-        this.psychologyInfo.labels = this.psychologyInfo.labels.split('|');
-      }
     }
   }
 };